diff --git a/docker-dev/seed/seed-clusters.sql b/docker-dev/seed/seed-clusters.sql
index 0e12f0a8..37c687ec 100644
--- a/docker-dev/seed/seed-clusters.sql
+++ b/docker-dev/seed/seed-clusters.sql
@@ -123,13 +123,13 @@ COMMIT TRANSACTION;
 -- Summary (logged by sqlcmd output)
 ------------------------------------------------------------------------------
 
+-- v3: the Namespace table is retired; DriverInstance is folder-scoped (RawFolderId) and Tags
+-- are device-scoped (DeviceId + optional TagGroupId). This seed only creates clusters + nodes +
+-- LDAP role mappings, so the summary reflects just those. Raw-tree config (RawFolder/DriverInstance/
+-- Device/TagGroup/Tag) is authored via the AdminUI /raw page in later batches.
 SELECT ClusterId, Name, NodeCount, RedundancyMode FROM dbo.ServerCluster ORDER BY ClusterId;
 SELECT NodeId, ClusterId, Host, OpcUaPort, ApplicationUri, ServiceLevelBase
   FROM dbo.ClusterNode ORDER BY ClusterId, NodeId;
-SELECT NamespaceId, ClusterId, Kind, NamespaceUri FROM dbo.Namespace ORDER BY ClusterId, NamespaceId;
-SELECT DriverInstanceId, ClusterId, DriverType, NamespaceId, Name
-  FROM dbo.DriverInstance ORDER BY ClusterId, DriverInstanceId;
-SELECT TagId, DriverInstanceId, FolderPath, Name, DataType FROM dbo.Tag ORDER BY DriverInstanceId, FolderPath, Name;
 
 ------------------------------------------------------------------------------
 -- LDAP group -> AdminUI role mappings (shared dev GLAuth, 10.100.0.35)
@@ -152,3 +152,24 @@ IF NOT EXISTS (SELECT 1 FROM dbo.LdapGroupRoleMapping WHERE LdapGroup = 'OtOpcUa
   VALUES (NEWID(), 'OtOpcUa-Viewers', 'Viewer', NULL, 1, SYSUTCDATETIME(), N'shared-glauth dev seed');
 
 SELECT LdapGroup, Role, IsSystemWide FROM dbo.LdapGroupRoleMapping ORDER BY LdapGroup;
+
+------------------------------------------------------------------------------
+-- v3 Batch 1 gate: a Modbus driver in cluster MAIN so the docker-dev boot has a
+-- driver to show Connected against the modbus fixture (10.100.0.35:5020). Raw tree:
+-- DriverInstance(RawFolderId NULL) -> Device(endpoint in DeviceConfig) -> Tag(raw).
+-- Idempotent. Address space stays DARK this batch (no variable nodes materialize).
+------------------------------------------------------------------------------
+SET QUOTED_IDENTIFIER ON;
+SET ANSI_NULLS ON;
+IF NOT EXISTS (SELECT 1 FROM dbo.DriverInstance WHERE DriverInstanceId = 'MAIN-modbus')
+  INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+  VALUES ('MAIN-modbus', 'MAIN', NULL, 'pymodbus', 'Modbus',
+          N'{ "TimeoutMs": 2000, "AutoReconnect": true, "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": 0 } }', 1);
+IF NOT EXISTS (SELECT 1 FROM dbo.Device WHERE DeviceId = 'MAIN-modbus-dev')
+  INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+  VALUES ('MAIN-modbus-dev', 'MAIN-modbus', 'plc', 1, N'{ "Host": "10.100.0.35", "Port": 5020, "UnitId": 1 }');
+IF NOT EXISTS (SELECT 1 FROM dbo.Tag WHERE TagId = 'MAIN-modbus-hr200')
+  INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+  VALUES ('MAIN-modbus-hr200', 'MAIN-modbus-dev', NULL, 'HR200', 'UInt16', 'ReadWrite', 1,
+          N'{ "region": "HoldingRegisters", "address": 200, "dataType": "UInt16", "writable": true }');
+SELECT DriverInstanceId, ClusterId, DriverType, Enabled FROM dbo.DriverInstance WHERE ClusterId='MAIN';
diff --git a/docs/Configuration.md b/docs/Configuration.md
index e1fdd181..fdcac78c 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -1,5 +1,16 @@
 # Configuration Reference
 
+> **v3 in progress (Batch 1 landed — schema + RawPath identity).** The config **DB schema** was
+> replaced by the greenfield v3 model: a driver-centric **Raw tree**
+> (`Cluster → RawFolder → DriverInstance → Device → TagGroup → Tag`) plus a reference-only **UNS**
+> projection (`UnsTagReference`). A tag's identity is now its **RawPath**
+> (`<Folder/…>/<Driver>/<Device>/<TagGroup/…>/<Tag>`), not a `TagConfig.FullName` blob; the
+> `Namespace`/`NamespaceKind`/`EquipmentImportBatch` entities are retired, and connection endpoints
+> moved from `DriverConfig` into each `Device`'s `DeviceConfig`. The two OPC UA namespaces (`ns=Raw` /
+> `ns=UNS`) and the `/raw` authoring UI arrive in later v3 batches; **Batch 1 leaves the address space
+> deliberately dark** (drivers connect, but no tag variables materialize yet). The `appsettings*.json`
+> surface below is unchanged. Full design: `docs/plans/2026-07-15-raw-uns-two-subtree-v3-design.md`.
+
 This is the live configuration reference for the OtOpcUa Host (`src/Server/ZB.MOM.WW.OtOpcUa.Host/`). It enumerates the `appsettings*.json` sections, the bound Options classes, and the `OTOPCUA_*` / sim-endpoint environment variables — every entry grounded in source.
 
 Two related concerns get their own dedicated pages and are **only summarised + linked** here, not duplicated:
diff --git a/docs/plans/2026-07-15-v3-batch1-PR.md b/docs/plans/2026-07-15-v3-batch1-PR.md
new file mode 100644
index 00000000..89d6e7ac
--- /dev/null
+++ b/docs/plans/2026-07-15-v3-batch1-PR.md
@@ -0,0 +1,68 @@
+# v3 Batch 1 — greenfield schema + RawPath identity rewiring
+
+**Branch:** `v3/batch1-schema-identity` → `master`
+**Plan:** `docs/plans/2026-07-15-v3-batch1-schema-identity-plan.md` · **Design:** `docs/plans/2026-07-15-raw-uns-two-subtree-v3-design.md`
+
+Greenfield, compatibility-breaking. The config schema and every identity seam now speak **RawPath**
+(`<Folder/…>/<Driver>/<Device>/<TagGroup/…>/<Tag>`). The full solution builds and all macOS-safe
+tests pass; the OPC UA address space is **deliberately dark** (drivers connect, no tag variables
+materialize) until Batch 4.
+
+## What changed
+
+- **Schema (greenfield):** new `RawFolder` / `TagGroup` / `UnsTagReference`; reshaped `DriverInstance`
+  (−`NamespaceId`, +`RawFolderId?`), `Tag` (raw-only: req `DeviceId`, +`TagGroupId?`,
+  −`DriverInstanceId`/`EquipmentId`/`FolderPath`, kept `WriteIdempotent`), `Equipment` (−driver/device
+  binding); `Namespace` / `NamespaceKind` / `EquipmentImportBatch` retired. Single squashed `V3Initial`
+  migration (stored procs audited — the vestigial generation-model procs were rewritten to v3-valid
+  stubs; `sp_ComputeGenerationDiff` diffs the new tables).
+- **Identity:** new `Commons/Types/RawPaths.cs` helper; `TagConfigIntent` sheds `FullName`;
+  `EquipmentTagRefResolver<TDef>` is byName(RawPath)-only (blob-fallback deleted); new
+  `RawTagEntry(RawPath, TagConfig, WriteIdempotent, DeviceName)` delivery record. All 8 drivers
+  re-keyed: the per-driver `*EquipmentTagParser` became `*TagDefinitionFactory.FromTagConfig`, options
+  `Tags` → `RawTags`, `TagConfig` key normalization (`nodeId` / `attributeRef`; `deviceHostAddress`
+  dropped).
+- **Endpoint → DeviceConfig:** new `DriverDeviceConfigMerger` (Commons) merges DriverConfig + per-device
+  DeviceConfig; multi-device drivers reconstruct their `Devices[]` from Device rows; the artifact injects
+  the merged config + `rawTags` at spawn.
+- **Pipeline:** `ConfigComposer` snapshots the new tables; `DeploymentArtifact` flattens per-driver
+  `RawTagEntry` lists keyed by RawPath (via `RawPathResolver`) + emits an empty (dark) equipment-tag
+  plan set; `AddressSpaceComposer`/walker compose folders + VirtualTags + ScriptedAlarms only;
+  `DriverHostActor` maps re-keyed to RawPath; `DraftValidator` gains `RawNameInvalid` /
+  `HistorianTagnameTooLong` / `UnsEffectiveNameCollision`.
+- **AdminUI (compile-only stubs):** Namespace pages → retired banners; driver pages dropped the
+  pre-declared Tags editor + NamespaceId; `UnsTreeService` tag-authoring returns "moved to the Raw tree
+  (/raw) in v3 Batch 2". (Batch 2/3 build the real `/raw` + reference UI.)
+
+## Verification gate (all four items)
+
+1. **Build + test green.** Full solution builds (0 errors). macOS-safe unit suites: Commons 196,
+   Core 260, Core.Abstractions 134, **Configuration 107**, Runtime 355 (42 dark-Batch-4 skips),
+   ControlPlane 78, OpcUaServer 335 (4 skips), AdminUI 507 (3 skips), + all 8 driver unit suites
+   (Modbus 315, S7 264, AbCip 342, AbLegacy 213, TwinCAT 192, FOCAS 272, OpcUaClient 138, Galaxy 313)
+   and the 6 driver IntegrationTests projects compile. Enum-serialization round-trip coverage preserved.
+2. **Fresh-DB migration.** `V3Initial` applies clean to a scratch DB; `SchemaComplianceTests` 8/8.
+3. **docker-dev boot (live).** Volume wiped → `V3Initial` applied → both central nodes reached Akka
+   Up → a seeded Modbus driver **spawned and connected** to the `10.100.0.35:5020` fixture
+   (`DriverInstance MAIN-modbus: connected`), deployment **sealed (acks=2)**; AdminUI HTTP 200 on
+   `/`, `/clusters`, `/uns` with 0 unhandled exceptions.
+4. **Dark address space (Client.CLI browse).** Recursive browse of `opc.tcp://localhost:4840`: the raw
+   tag `HR200` and the driver have **0 occurrences**; the custom namespace `ns=2` holds only the empty
+   `OtOpcUa` root — no authored variables materialize (Batch 4 lights them up).
+
+## AdminUI Batch-1 stubs (Batch 2/3 replace)
+
+Namespace pages (`NamespaceEdit`, `ClusterNamespaces`) → banners; the 8 driver pages' pre-declared Tags
+editors + Namespace bindings removed; `DriverIdentitySection` Namespace dropdown removed;
+`UnsTreeService.CreateTagAsync`/`UpdateTagAsync` return the "moved to /raw" failure; per-equipment tag
+lists empty.
+
+## Deferred (owned by later batches, not regressions)
+
+- `/raw` project tree + reference-picker UI, dual `ns=Raw`/`ns=UNS` namespaces + tag-variable
+  materialization, `{{equip}}` reference-relative resolution — Batches 2–4 (address space intentionally
+  dark now).
+- User-facing docs beyond the `Configuration.md` v3 note (they describe the not-yet-built UI/address
+  space) — updated as Batches 2–4 land.
+- Live driver IntegrationTests + one pre-existing `AbCip_Green_AgainstSim` fixture-probe failure
+  (AB CIP sim handshake — environment/fixture gate, untouched).
diff --git a/scripts/smoke/seed-abcip-smoke.sql b/scripts/smoke/seed-abcip-smoke.sql
index e5526af9..a45c644d 100644
--- a/scripts/smoke/seed-abcip-smoke.sql
+++ b/scripts/smoke/seed-abcip-smoke.sql
@@ -1,128 +1,74 @@
--- AB CIP e2e smoke seed — closes #211 (umbrella #209).
+-- AB CIP (Logix) e2e smoke seed — v3 schema (Raw tree: DriverInstance → Device → Tag; UNS by ref).
 --
--- One-cluster seed pointing at the ab_server ControlLogix fixture
--- (`docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/docker-compose.yml --profile controllogix up -d`).
--- Publishes a single `TestDINT:DInt` tag under NodeId `ns=<N>;s=TestDINT`
--- (ab_server seeds this tag by default).
---
--- Usage:
---   sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
---          -i scripts/smoke/seed-abcip-smoke.sql
---
--- After seeding, point appsettings at this cluster:
---     Node:NodeId    = "abcip-smoke-node"
---     Node:ClusterId = "abcip-smoke"
--- Then start server + run `./scripts/e2e/test-abcip.ps1 -BridgeNodeId "ns=2;s=TestDINT"`.
+-- Idempotent DELETE-and-recreate pointing at the CIP fixture (ab://127.0.0.1:44818/1,0). v3: the
+-- ConfigGeneration/Namespace model + sp_PublishGeneration are gone; the per-device HostAddress moved
+-- from DriverConfig.Devices[] into the Device's DeviceConfig (the deviceHostAddress tag key is dropped
+-- — the tag's DeviceId FK owns placement now).
 
 SET NOCOUNT ON;
 SET XACT_ABORT ON;
 SET QUOTED_IDENTIFIER ON;
 SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
 
 DECLARE @ClusterId nvarchar(64) = 'abcip-smoke';
 DECLARE @NodeId    nvarchar(64) = 'abcip-smoke-node';
 DECLARE @DrvId     nvarchar(64) = 'abcip-smoke-drv';
-DECLARE @NsId      nvarchar(64) = 'abcip-smoke-ns';
+DECLARE @DevId     nvarchar(64) = 'abcip-smoke-dev';
 DECLARE @AreaId    nvarchar(64) = 'abcip-smoke-area';
 DECLARE @LineId    nvarchar(64) = 'abcip-smoke-line';
 DECLARE @EqId      nvarchar(64) = 'abcip-smoke-eq';
-DECLARE @EqUuid    uniqueidentifier = '41BC12E0-41BC-412E-841B-C12E041BC12E';
-DECLARE @TagId     nvarchar(64) = 'abcip-smoke-tag-testdint';
+DECLARE @EqUuid    uniqueidentifier = 'ABC17000-ABC1-45E0-9ABC-17000ABC1700';
+DECLARE @Tag       nvarchar(64) = 'abcip-smoke-tag-dint';
+DECLARE @RefId     nvarchar(64) = 'abcip-smoke-ref-dint';
 
 BEGIN TRAN;
 
-DELETE FROM dbo.Tag                        WHERE TagId IN (@TagId);
-DELETE FROM dbo.Equipment                  WHERE EquipmentId = @EqId;
-DELETE FROM dbo.UnsLine                    WHERE UnsLineId = @LineId;
-DELETE FROM dbo.UnsArea                    WHERE UnsAreaId = @AreaId;
-DELETE FROM dbo.DriverInstance             WHERE DriverInstanceId = @DrvId;
-DELETE FROM dbo.Namespace                  WHERE NamespaceId = @NsId;
-DELETE FROM dbo.ConfigGeneration           WHERE ClusterId = @ClusterId;
-DELETE FROM dbo.ClusterNodeCredential      WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNode                WHERE NodeId = @NodeId;
-DELETE FROM dbo.ServerCluster              WHERE ClusterId = @ClusterId;
-
+DELETE FROM dbo.UnsTagReference       WHERE UnsTagReferenceId = @RefId;
+DELETE FROM dbo.Tag                   WHERE TagId = @Tag;
+DELETE FROM dbo.Equipment             WHERE EquipmentId = @EqId;
+DELETE FROM dbo.UnsLine               WHERE UnsLineId = @LineId;
+DELETE FROM dbo.UnsArea               WHERE UnsAreaId = @AreaId;
+DELETE FROM dbo.Device                WHERE DeviceId = @DevId;
+DELETE FROM dbo.DriverInstance        WHERE DriverInstanceId = @DrvId;
+DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
+DELETE FROM dbo.ClusterNode           WHERE NodeId = @NodeId;
+DELETE FROM dbo.ServerCluster         WHERE ClusterId = @ClusterId;
 DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
 
 INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
-VALUES (@ClusterId, 'AB CIP Smoke', 'zb', 'lab', 1, 'None', 1, 'abcip-smoke');
+VALUES (@ClusterId, 'AbCip Smoke', 'zb', 'lab', 1, 'None', 1, 'abcip-smoke');
 
-INSERT dbo.ClusterNode(NodeId, ClusterId, RedundancyRole, Host, OpcUaPort, DashboardPort,
+INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
                        ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
-VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 15050,
-        'urn:OtOpcUa:abcip-smoke-node', 200, 1, 'abcip-smoke');
+VALUES (@NodeId, @ClusterId, 'localhost', 4840, 15050, 'urn:OtOpcUa:abcip-smoke-node', 200, 1, 'abcip-smoke');
 
 INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
 VALUES (@NodeId, 'SqlLogin', 'sa', 1, 'abcip-smoke');
 
-DECLARE @Gen bigint;
-INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
-VALUES (@ClusterId, 'Draft', 'abcip-smoke');
-SET @Gen = SCOPE_IDENTITY();
-
-INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
-VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:abcip-smoke:eq', 1);
-
-INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
-VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
-
-INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
-VALUES (@Gen, @LineId, @AreaId, 'abcip-line');
-
-INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
-                     Name, MachineCode, Enabled)
-VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 'ab-sim', 'abcip-001', 1);
-
--- AB CIP DriverInstance — single ControlLogix device at the ab_server fixture
--- gateway. DriverConfig shape mirrors AbCipDriverConfigDto.
-INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
-                          Name, DriverType, DriverConfig, Enabled)
-VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'ab-server-smoke', 'AbCip', N'{
-  "TimeoutMs": 2000,
-  "Devices": [
-    {
-      "HostAddress": "ab://127.0.0.1:44818/1,0",
-      "PlcFamily": "ControlLogix",
-      "DeviceName": "ab-server"
-    }
-  ],
-  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000 },
-  "Tags": [
-    {
-      "Name": "TestDINT",
-      "DeviceHostAddress": "ab://127.0.0.1:44818/1,0",
-      "TagPath": "TestDINT",
-      "DataType": "DInt",
-      "Writable": true,
-      "WriteIdempotent": true
-    }
-  ]
+-- DriverConfig keeps protocol/channel settings; the per-device Devices[] list is retired in favor
+-- of Device rows carrying HostAddress in DeviceConfig.
+INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+VALUES (@DrvId, @ClusterId, NULL, 'logix-smoke', 'AbCip', N'{
+  "EnableControllerBrowse": false,
+  "ProbeTimeoutSeconds": 5
 }', 1);
 
-INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
-               AccessLevel, TagConfig, WriteIdempotent)
-VALUES (@Gen, @TagId, @DrvId, @EqId, 'TestDINT', 'Int32', 'ReadWrite',
-        N'{"FullName":"TestDINT","DataType":"DInt"}', 1);
+-- DeviceConfig shape finalized against reworked options in Wave B (WP5).
+INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+VALUES (@DevId, @DrvId, 'plc', 1, N'{ "HostAddress": "ab://127.0.0.1:44818/1,0" }');
 
-EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
-                              @Notes = N'AB CIP smoke — task #211';
+INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+VALUES (@Tag, @DevId, NULL, 'TestDINT', 'DInt', 'ReadWrite', 1,
+        N'{ "address": "TestDINT", "dataType": "DInt" }');
+
+INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name)          VALUES (@AreaId, @ClusterId, 'lab-floor');
+INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name)          VALUES (@LineId, @AreaId, 'abcip-line');
+INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
+VALUES (@EqId, @EqUuid, @LineId, 'logix-sim', 'abcip-001', 1);
+
+INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
+VALUES (@RefId, @EqId, @Tag, 0);
 
 COMMIT;
 
-PRINT '';
-PRINT 'AB CIP smoke seed complete.';
-PRINT '  Cluster:    ' + @ClusterId;
-PRINT '  Node:       ' + @NodeId;
-PRINT '  Generation: ' + CONVERT(nvarchar(20), @Gen);
-PRINT '';
-PRINT 'Next steps:';
-PRINT '  1. Set src/.../Server/appsettings.json Node:NodeId = "abcip-smoke-node"';
-PRINT '                                          Node:ClusterId = "abcip-smoke"';
-PRINT '  2. docker compose -f tests/.../AbCip.IntegrationTests/Docker/docker-compose.yml --profile controllogix up -d';
-PRINT '  3. dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server';
-PRINT '  4. ./scripts/e2e/test-abcip.ps1 -BridgeNodeId "ns=2;s=TestDINT"';
+PRINT 'AbCip smoke seed complete (v3 schema). Cluster: ' + @ClusterId + '  Node: ' + @NodeId;
diff --git a/scripts/smoke/seed-ablegacy-smoke.sql b/scripts/smoke/seed-ablegacy-smoke.sql
index 30867c2a..71395ef8 100644
--- a/scripts/smoke/seed-ablegacy-smoke.sql
+++ b/scripts/smoke/seed-ablegacy-smoke.sql
@@ -1,125 +1,74 @@
--- AB Legacy e2e smoke seed — closes #213 (umbrella #209).
+-- AB Legacy (PCCC / SLC-500, MicroLogix) e2e smoke seed — v3 schema (DriverInstance → Device → Tag).
 --
--- Works against the ab_server PCCC Docker fixture (one of the slc500 /
--- micrologix / plc5 compose profiles) or real SLC 500 / MicroLogix / PLC-5
--- hardware. Default HostAddress below points at the Docker fixture with a
--- `/1,0` cip-path; libplctag's ab_server rejects empty paths before routing
--- to the PCCC dispatcher. Real hardware uses an empty path — change the
--- HostAddress to `ab://<plc-ip>:44818/` (note the trailing slash with nothing
--- after) before running the seed for that setup.
---
--- Usage:
---   docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/docker-compose.yml --profile slc500 up -d
---   sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
---          -i scripts/smoke/seed-ablegacy-smoke.sql
+-- Idempotent DELETE-and-recreate pointing at the fixture (ab://127.0.0.1:44818/1,0). To target real
+-- hardware, edit the Device's DeviceConfig HostAddress to end with /<empty> (trailing slash, no path).
+-- v3: the ConfigGeneration/Namespace model + sp_PublishGeneration are gone; the per-device HostAddress
+-- moved from DriverConfig.Devices[] into the Device's DeviceConfig (the deviceHostAddress tag key is
+-- dropped — the tag's DeviceId FK owns placement now).
 
 SET NOCOUNT ON;
 SET XACT_ABORT ON;
 SET QUOTED_IDENTIFIER ON;
 SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
 
 DECLARE @ClusterId nvarchar(64) = 'ablegacy-smoke';
 DECLARE @NodeId    nvarchar(64) = 'ablegacy-smoke-node';
 DECLARE @DrvId     nvarchar(64) = 'ablegacy-smoke-drv';
-DECLARE @NsId      nvarchar(64) = 'ablegacy-smoke-ns';
+DECLARE @DevId     nvarchar(64) = 'ablegacy-smoke-dev';
 DECLARE @AreaId    nvarchar(64) = 'ablegacy-smoke-area';
 DECLARE @LineId    nvarchar(64) = 'ablegacy-smoke-line';
 DECLARE @EqId      nvarchar(64) = 'ablegacy-smoke-eq';
-DECLARE @EqUuid    uniqueidentifier = '5A1D2030-5A1D-4203-A5A1-D20305A1D203';
-DECLARE @TagId     nvarchar(64) = 'ablegacy-smoke-tag-n7_5';
+DECLARE @EqUuid    uniqueidentifier = 'AB1E9AC0-AB1E-45E0-9AB1-E9AC0AB1E9AC';
+DECLARE @Tag       nvarchar(64) = 'ablegacy-smoke-tag-n7-5';
+DECLARE @RefId     nvarchar(64) = 'ablegacy-smoke-ref-n7-5';
 
 BEGIN TRAN;
 
-DELETE FROM dbo.Tag                        WHERE TagId IN (@TagId);
-DELETE FROM dbo.Equipment                  WHERE EquipmentId = @EqId;
-DELETE FROM dbo.UnsLine                    WHERE UnsLineId = @LineId;
-DELETE FROM dbo.UnsArea                    WHERE UnsAreaId = @AreaId;
-DELETE FROM dbo.DriverInstance             WHERE DriverInstanceId = @DrvId;
-DELETE FROM dbo.Namespace                  WHERE NamespaceId = @NsId;
-DELETE FROM dbo.ConfigGeneration           WHERE ClusterId = @ClusterId;
-DELETE FROM dbo.ClusterNodeCredential      WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNode                WHERE NodeId = @NodeId;
-DELETE FROM dbo.ServerCluster              WHERE ClusterId = @ClusterId;
-
+DELETE FROM dbo.UnsTagReference       WHERE UnsTagReferenceId = @RefId;
+DELETE FROM dbo.Tag                   WHERE TagId = @Tag;
+DELETE FROM dbo.Equipment             WHERE EquipmentId = @EqId;
+DELETE FROM dbo.UnsLine               WHERE UnsLineId = @LineId;
+DELETE FROM dbo.UnsArea               WHERE UnsAreaId = @AreaId;
+DELETE FROM dbo.Device                WHERE DeviceId = @DevId;
+DELETE FROM dbo.DriverInstance        WHERE DriverInstanceId = @DrvId;
+DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
+DELETE FROM dbo.ClusterNode           WHERE NodeId = @NodeId;
+DELETE FROM dbo.ServerCluster         WHERE ClusterId = @ClusterId;
 DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
 
 INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
-VALUES (@ClusterId, 'AB Legacy Smoke', 'zb', 'lab', 1, 'None', 1, 'ablegacy-smoke');
+VALUES (@ClusterId, 'AbLegacy Smoke', 'zb', 'lab', 1, 'None', 1, 'ablegacy-smoke');
 
-INSERT dbo.ClusterNode(NodeId, ClusterId, RedundancyRole, Host, OpcUaPort, DashboardPort,
+INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
                        ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
-VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 15050,
-        'urn:OtOpcUa:ablegacy-smoke-node', 200, 1, 'ablegacy-smoke');
+VALUES (@NodeId, @ClusterId, 'localhost', 4840, 15050, 'urn:OtOpcUa:ablegacy-smoke-node', 200, 1, 'ablegacy-smoke');
 
 INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
 VALUES (@NodeId, 'SqlLogin', 'sa', 1, 'ablegacy-smoke');
 
-DECLARE @Gen bigint;
-INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
-VALUES (@ClusterId, 'Draft', 'ablegacy-smoke');
-SET @Gen = SCOPE_IDENTITY();
-
-INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
-VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:ablegacy-smoke:eq', 1);
-
-INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
-VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
-
-INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
-VALUES (@Gen, @LineId, @AreaId, 'ablegacy-line');
-
-INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
-                     Name, MachineCode, Enabled)
-VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 'slc-sim', 'ablegacy-001', 1);
-
--- AB Legacy DriverInstance — SLC 500 target. Replace the placeholder gateway
--- `192.168.1.10` with the real PLC / RSEmulate host before running.
-INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
-                          Name, DriverType, DriverConfig, Enabled)
-VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'ablegacy-smoke', 'AbLegacy', N'{
-  "TimeoutMs": 2000,
-  "Devices": [
-    {
-      "HostAddress": "ab://127.0.0.1:44818/1,0",
-      "PlcFamily": "Slc500",
-      "DeviceName": "slc-500"
-    }
-  ],
-  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": "S:0" },
-  "Tags": [
-    {
-      "Name": "N7_5",
-      "DeviceHostAddress": "ab://127.0.0.1:44818/1,0",
-      "Address": "N7:5",
-      "DataType": "Int",
-      "Writable": true,
-      "WriteIdempotent": true
-    }
-  ]
+-- DriverConfig keeps protocol/channel settings; per-device HostAddress moves to DeviceConfig.
+INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+VALUES (@DrvId, @ClusterId, NULL, 'slc-smoke', 'AbLegacy', N'{
+  "ProbeTimeoutSeconds": 5,
+  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": "S:0" }
 }', 1);
 
-INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
-               AccessLevel, TagConfig, WriteIdempotent)
-VALUES (@Gen, @TagId, @DrvId, @EqId, 'N7_5', 'Int16', 'ReadWrite',
-        N'{"FullName":"N7_5","Address":"N7:5","DataType":"Int"}', 1);
+-- DeviceConfig shape finalized against reworked options in Wave B (WP5).
+INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+VALUES (@DevId, @DrvId, 'plc', 1, N'{ "HostAddress": "ab://127.0.0.1:44818/1,0" }');
 
-EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
-                              @Notes = N'AB Legacy smoke — task #213';
+INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+VALUES (@Tag, @DevId, NULL, 'N7_5', 'Int', 'ReadWrite', 1,
+        N'{ "address": "N7:5", "dataType": "Int" }');
+
+INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name)          VALUES (@AreaId, @ClusterId, 'lab-floor');
+INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name)          VALUES (@LineId, @AreaId, 'ablegacy-line');
+INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
+VALUES (@EqId, @EqUuid, @LineId, 'slc-sim', 'ablegacy-001', 1);
+
+INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
+VALUES (@RefId, @EqId, @Tag, 0);
 
 COMMIT;
 
-PRINT '';
-PRINT 'AB Legacy smoke seed complete.';
-PRINT '  Cluster:    ' + @ClusterId;
-PRINT '  Node:       ' + @NodeId;
-PRINT '  Generation: ' + CONVERT(nvarchar(20), @Gen);
-PRINT '';
-PRINT 'NOTE: default points at the ab_server slc500 Docker fixture with a /1,0';
-PRINT '      cip-path (required by ab_server). For real SLC/MicroLogix/PLC-5';
-PRINT '      hardware, edit the DriverConfig HostAddress to end with /<empty>';
-PRINT '      e.g. "ab://<plc-ip>:44818/" and re-run this seed.';
+PRINT 'AbLegacy smoke seed complete (v3 schema). Cluster: ' + @ClusterId + '  Node: ' + @NodeId;
diff --git a/scripts/smoke/seed-modbus-smoke.sql b/scripts/smoke/seed-modbus-smoke.sql
index 3ebb4c3f..2eeb3841 100644
--- a/scripts/smoke/seed-modbus-smoke.sql
+++ b/scripts/smoke/seed-modbus-smoke.sql
@@ -1,156 +1,101 @@
--- Modbus e2e smoke seed — closes #210 (umbrella #209).
+-- Modbus e2e smoke seed — v3 schema (Raw tree: DriverInstance → Device → Tag; UNS by reference).
 --
--- Idempotent — DROP-and-recreate of one cluster's worth of Modbus test config:
---   * 1 ServerCluster ('modbus-smoke') + ClusterNode ('modbus-smoke-node')
---   * 1 ConfigGeneration (Draft → Published at the end)
---   * 1 Namespace + UnsArea + UnsLine + Equipment
---   * 1 Modbus DriverInstance pointing at the pymodbus standard fixture
---     (127.0.0.1:5020 per tests/.../Modbus.IntegrationTests/Docker)
---   * 1 Tag at HR[200]:UInt16 (HR[100] is auto-increment in standard.json,
+-- Idempotent — DELETE-and-recreate of one cluster's worth of Modbus test config:
+--   * 1 ServerCluster ('modbus-smoke') + ClusterNode ('modbus-smoke-node') + SqlLogin credential
+--   * 1 Modbus DriverInstance at the cluster root (RawFolderId NULL)
+--   * 1 Device carrying the pymodbus endpoint in DeviceConfig
+--   * 1 Tag at HR[200]:UInt16 under the device (HR[100] is auto-increment in standard.json,
 --     unusable as a write target — the e2e script uses HR[200] for that reason)
+--   * 1 UnsArea/UnsLine/Equipment + a UnsTagReference projecting the raw tag into UNS
+--
+-- v3 changes vs. the pre-v2 original: the ConfigGeneration/GenerationId/Namespace model and the
+-- sp_PublishGeneration publish step are gone (deploy is a C# ControlPlane operation now); the
+-- connection endpoint moved from DriverConfig into the Device's DeviceConfig.
 --
 -- Usage:
---   sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
---          -i scripts/smoke/seed-modbus-smoke.sql
---
--- After seeding, update src/.../Server/appsettings.json:
---     Node:NodeId    = "modbus-smoke-node"
---     Node:ClusterId = "modbus-smoke"
---
--- Then start the simulator + server + run the e2e script:
---   docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/docker-compose.yml --profile standard up -d
---   dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server
---   ./scripts/e2e/test-modbus.ps1 -BridgeNodeId "ns=2;s=HR200"
+--   sqlcmd -S "10.100.0.35,14330" -d <cfgdb> -U sa -P "<pw>" -i scripts/smoke/seed-modbus-smoke.sql
 
 SET NOCOUNT ON;
 SET XACT_ABORT ON;
 SET QUOTED_IDENTIFIER ON;
 SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
 
 DECLARE @ClusterId nvarchar(64) = 'modbus-smoke';
 DECLARE @NodeId    nvarchar(64) = 'modbus-smoke-node';
 DECLARE @DrvId     nvarchar(64) = 'modbus-smoke-drv';
-DECLARE @NsId      nvarchar(64) = 'modbus-smoke-ns';
+DECLARE @DevId     nvarchar(64) = 'modbus-smoke-dev';
 DECLARE @AreaId    nvarchar(64) = 'modbus-smoke-area';
 DECLARE @LineId    nvarchar(64) = 'modbus-smoke-line';
 DECLARE @EqId      nvarchar(64) = 'modbus-smoke-eq';
 DECLARE @EqUuid    uniqueidentifier = '72BD5A10-72BD-45A1-B72B-D5A1072BD5A1';
 DECLARE @TagHr200  nvarchar(64) = 'modbus-smoke-tag-hr200';
+DECLARE @RefId     nvarchar(64) = 'modbus-smoke-ref-hr200';
 
 BEGIN TRAN;
 
 -- Clean prior smoke state (child rows first).
-DELETE FROM dbo.Tag                        WHERE TagId IN (@TagHr200);
-DELETE FROM dbo.Equipment                  WHERE EquipmentId = @EqId;
-DELETE FROM dbo.UnsLine                    WHERE UnsLineId = @LineId;
-DELETE FROM dbo.UnsArea                    WHERE UnsAreaId = @AreaId;
-DELETE FROM dbo.DriverInstance             WHERE DriverInstanceId = @DrvId;
-DELETE FROM dbo.Namespace                  WHERE NamespaceId = @NsId;
-DELETE FROM dbo.ConfigGeneration           WHERE ClusterId = @ClusterId;
-DELETE FROM dbo.ClusterNodeCredential      WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNode                WHERE NodeId = @NodeId;
-DELETE FROM dbo.ServerCluster              WHERE ClusterId = @ClusterId;
+DELETE FROM dbo.UnsTagReference       WHERE UnsTagReferenceId = @RefId;
+DELETE FROM dbo.Tag                   WHERE TagId = @TagHr200;
+DELETE FROM dbo.Equipment             WHERE EquipmentId = @EqId;
+DELETE FROM dbo.UnsLine               WHERE UnsLineId = @LineId;
+DELETE FROM dbo.UnsArea               WHERE UnsAreaId = @AreaId;
+DELETE FROM dbo.Device                WHERE DeviceId = @DevId;
+DELETE FROM dbo.DriverInstance        WHERE DriverInstanceId = @DrvId;
+DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
+DELETE FROM dbo.ClusterNode           WHERE NodeId = @NodeId;
+DELETE FROM dbo.ServerCluster         WHERE ClusterId = @ClusterId;
 
--- `UX_ClusterNodeCredential_Value` is a unique index on (Kind, Value) WHERE
--- Enabled=1, so a `sa` login can only bind to one node at a time. Drop any
--- prior smoke cluster's binding before we claim the login for this one.
+-- `UX_ClusterNodeCredential_Value` is a unique index on (Kind, Value) WHERE Enabled=1, so the
+-- `sa` login can only bind to one node at a time. Drop any prior smoke binding first.
 DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
 
--- 1. Cluster + Node.
+-- 1. Cluster + Node + credential binding.
 INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
 VALUES (@ClusterId, 'Modbus Smoke', 'zb', 'lab', 1, 'None', 1, 'modbus-smoke');
 
--- DashboardPort 15050 rather than 5000 — HttpListener on :5000 requires
--- URL-ACL reservation or admin rights on Windows (HttpListenerException 32).
--- 15000+ ports are unreserved by default. Safe to change back when deploying
--- with a netsh urlacl grant or reverse-proxy fronting :5000.
-INSERT dbo.ClusterNode(NodeId, ClusterId, RedundancyRole, Host, OpcUaPort, DashboardPort,
+INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
                        ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
-VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 15050,
+VALUES (@NodeId, @ClusterId, 'localhost', 4840, 15050,
         'urn:OtOpcUa:modbus-smoke-node', 200, 1, 'modbus-smoke');
 
--- Bind the SQL login this smoke test connects as to the node identity. The
--- sp_GetCurrentGenerationForCluster + sp_UpdateClusterNodeGenerationState
--- sprocs raise RAISERROR('Unauthorized: caller %s is not bound to NodeId %s')
--- when this row is missing. `Kind='SqlLogin'` / `Value='sa'` matches the
--- container's SA user; rotate Value for real deployments using a non-SA login.
 INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
 VALUES (@NodeId, 'SqlLogin', 'sa', 1, 'modbus-smoke');
 
--- 2. Draft generation.
-DECLARE @Gen bigint;
-INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
-VALUES (@ClusterId, 'Draft', 'modbus-smoke');
-SET @Gen = SCOPE_IDENTITY();
-
--- 3. Namespace.
-INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
-VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:modbus-smoke:eq', 1);
-
--- 4. UNS hierarchy.
-INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
-VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
-
-INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
-VALUES (@Gen, @LineId, @AreaId, 'modbus-line');
-
-INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
-                     Name, MachineCode, Enabled)
-VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 'modbus-sim', 'modbus-001', 1);
-
--- 5. Modbus DriverInstance. DriverConfig mirrors ModbusDriverConfigDto
---    (mapped to ModbusDriverOptions by ModbusDriverFactoryExtensions).
-INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
-                          Name, DriverType, DriverConfig, Enabled)
-VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'pymodbus-smoke', 'Modbus', N'{
-  "Host": "127.0.0.1",
-  "Port": 5020,
-  "UnitId": 1,
+-- 2. Modbus DriverInstance at the cluster root (RawFolderId NULL). DriverConfig keeps protocol/
+--    channel settings only — the endpoint (Host/Port/UnitId) now lives in the Device's DeviceConfig.
+INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+VALUES (@DrvId, @ClusterId, NULL, 'pymodbus-smoke', 'Modbus', N'{
   "TimeoutMs": 2000,
   "AutoReconnect": true,
-  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": 0 },
-  "Tags": [
-    {
-      "Name": "HR200",
-      "Region": "HoldingRegisters",
-      "Address": 200,
-      "DataType": "UInt16",
-      "Writable": true,
-      "WriteIdempotent": true
-    }
-  ]
+  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": 0 }
 }', 1);
 
--- 6. Tag row bound to the Equipment. Driver reports the same tag via
---    DiscoverAsync + the walker maps the UnsArea/Line/Equipment/Tag path to the
---    driver's folder/variable (NodeId ends up ns=<driver-ns>;s=HR200 per
---    ModbusDriver.DiscoverAsync using FullName = tag.Name).
-INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
-               AccessLevel, TagConfig, WriteIdempotent)
-VALUES (@Gen, @TagHr200, @DrvId, @EqId, 'HR200', 'UInt16', 'ReadWrite',
-        N'{"FullName":"HR200","DataType":"UInt16"}', 1);
+-- 3. Device — endpoint. DeviceConfig shape finalized against reworked options in Wave B (WP5).
+INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+VALUES (@DevId, @DrvId, 'plc', 1, N'{ "Host": "127.0.0.1", "Port": 5020, "UnitId": 1 }');
 
--- 7. Publish the generation — flips Status Draft → Published, merges
---    ExternalIdReservation, claims cluster write lock.
-EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
-                              @Notes = N'Modbus smoke — task #210';
+-- 4. Raw tag under the device (identity = RawPath; TagConfig carries the driver address only).
+INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+VALUES (@TagHr200, @DevId, NULL, 'HR200', 'UInt16', 'ReadWrite', 1,
+        N'{ "region": "HoldingRegisters", "address": 200, "dataType": "UInt16", "writable": true }');
+
+-- 5. UNS hierarchy + a reference projecting the raw tag into the equipment.
+INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name)          VALUES (@AreaId, @ClusterId, 'lab-floor');
+INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name)          VALUES (@LineId, @AreaId, 'modbus-line');
+INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
+VALUES (@EqId, @EqUuid, @LineId, 'modbus-sim', 'modbus-001', 1);
+
+INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
+VALUES (@RefId, @EqId, @TagHr200, 0);
 
 COMMIT;
 
 PRINT '';
-PRINT 'Modbus smoke seed complete.';
-PRINT '  Cluster:    ' + @ClusterId;
-PRINT '  Node:       ' + @NodeId;
-PRINT '  Generation: ' + CONVERT(nvarchar(20), @Gen);
+PRINT 'Modbus smoke seed complete (v3 schema).';
+PRINT '  Cluster: ' + @ClusterId + '  Node: ' + @NodeId;
 PRINT '';
 PRINT 'Next steps:';
-PRINT '  1. Set src/.../Server/appsettings.json Node:NodeId = "modbus-smoke-node"';
-PRINT '                                          Node:ClusterId = "modbus-smoke"';
+PRINT '  1. Set Server appsettings Node:NodeId = "modbus-smoke-node" / Node:ClusterId = "modbus-smoke"';
 PRINT '  2. docker compose -f tests/.../Modbus.IntegrationTests/Docker/docker-compose.yml --profile standard up -d';
 PRINT '  3. dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server';
-PRINT '  4. ./scripts/e2e/test-modbus.ps1 -BridgeNodeId "ns=2;s=HR200"';
+PRINT '  4. Deploy the config via the AdminUI/ControlPlane, then ./scripts/e2e/test-modbus.ps1';
diff --git a/scripts/smoke/seed-phase-7-smoke.sql b/scripts/smoke/seed-phase-7-smoke.sql
index 707531d6..960d5a89 100644
--- a/scripts/smoke/seed-phase-7-smoke.sql
+++ b/scripts/smoke/seed-phase-7-smoke.sql
@@ -1,186 +1,120 @@
--- Phase 7 live OPC UA E2E smoke seed (task #240).
+-- Phase 7 live OPC UA E2E smoke seed — v3 schema (Raw tree + UNS-by-reference + scripting).
 --
--- Idempotent — DROP-and-recreate of one cluster's worth of test config:
---   * 1 ServerCluster ('p7-smoke')
---   * 1 ClusterNode ('p7-smoke-node')
---   * 1 ConfigGeneration (created Draft, then flipped to Published at the end)
---   * 1 Namespace (Equipment kind)
---   * 1 UnsArea / UnsLine / Equipment / Tag — Tag bound to a real Galaxy attribute
---   * 1 DriverInstance (Galaxy)
---   * 1 Script + 1 VirtualTag using it
---   * 1 Script + 1 ScriptedAlarm using it
+-- Idempotent DELETE-and-recreate of one cluster's worth of test config:
+--   * 1 ServerCluster ('p7-smoke') + ClusterNode + SqlLogin credential
+--   * 1 Galaxy (GalaxyMxGateway) DriverInstance at the cluster root + 1 Device (gateway endpoint)
+--   * 1 raw Tag bound to a Galaxy attribute (identity = RawPath; address in TagConfig.attributeRef)
+--   * 1 UnsArea / UnsLine / Equipment + a UnsTagReference projecting the raw tag into UNS
+--   * 1 Script + 1 VirtualTag using it; 1 Script + 1 ScriptedAlarm using it
 --
--- Drop & re-create deletes ALL rows scoped to the cluster (in dependency order)
--- so re-running this script after a code change starts from a clean state.
--- Table-level CHECK constraints are validated on insert; if a constraint is
--- violated this script aborts with the offending row's column.
---
--- Usage:
---   sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
---          -i scripts/smoke/seed-phase-7-smoke.sql
+-- v3 changes: ConfigGeneration/GenerationId/Namespace model + sp_PublishGeneration are gone (deploy
+-- is a C# ControlPlane operation); Galaxy driver type is 'GalaxyMxGateway'; the gateway endpoint
+-- lives in the Device's DeviceConfig; ctx.GetTag / alarm-message tokens take a RawPath. The exact
+-- Galaxy TagConfig key ('attributeRef') + scripting RawPath contract are finalized in WP2/WP3/WP4.
 
 SET NOCOUNT ON;
 SET XACT_ABORT ON;
 SET QUOTED_IDENTIFIER ON;
 SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
 
 DECLARE @ClusterId nvarchar(64) = 'p7-smoke';
 DECLARE @NodeId    nvarchar(64) = 'p7-smoke-node';
 DECLARE @DrvId     nvarchar(64) = 'p7-smoke-galaxy';
-DECLARE @NsId      nvarchar(64) = 'p7-smoke-ns';
+DECLARE @DevId     nvarchar(64) = 'p7-smoke-dev';
 DECLARE @AreaId    nvarchar(64) = 'p7-smoke-area';
 DECLARE @LineId    nvarchar(64) = 'p7-smoke-line';
 DECLARE @EqId      nvarchar(64) = 'p7-smoke-eq';
 DECLARE @EqUuid    uniqueidentifier = '5B2CF10D-5B2C-4F10-B5B2-CF10D5B2CF10';
 DECLARE @TagId     nvarchar(64) = 'p7-smoke-tag-source';
+DECLARE @RefId     nvarchar(64) = 'p7-smoke-ref-source';
 DECLARE @VtScript  nvarchar(64) = 'p7-smoke-script-vt';
 DECLARE @AlScript  nvarchar(64) = 'p7-smoke-script-al';
 DECLARE @VtId      nvarchar(64) = 'p7-smoke-vt-derived';
 DECLARE @AlId      nvarchar(64) = 'p7-smoke-al-overtemp';
 
+-- RawPath of the source tag: <driver>/<device>/<tag> (cluster root, no folder/group).
+DECLARE @RawPath   nvarchar(256) = N'galaxy-smoke/plc/Source';
+
 BEGIN TRAN;
 
--- Wipe any prior smoke state. Order matters: child rows first.
-DELETE s FROM dbo.ScriptedAlarmState s
-  WHERE s.ScriptedAlarmId = @AlId;
-DELETE FROM dbo.ScriptedAlarm        WHERE ScriptedAlarmId = @AlId;
-DELETE FROM dbo.VirtualTag           WHERE VirtualTagId = @VtId;
-DELETE FROM dbo.Script               WHERE ScriptId IN (@VtScript, @AlScript);
-DELETE FROM dbo.Tag                  WHERE TagId = @TagId;
-DELETE FROM dbo.Equipment            WHERE EquipmentId = @EqId;
-DELETE FROM dbo.UnsLine              WHERE UnsLineId = @LineId;
-DELETE FROM dbo.UnsArea              WHERE UnsAreaId = @AreaId;
-DELETE FROM dbo.DriverInstance       WHERE DriverInstanceId = @DrvId;
-DELETE FROM dbo.Namespace            WHERE NamespaceId = @NsId;
-DELETE FROM dbo.ConfigGeneration     WHERE ClusterId = @ClusterId;
+-- Wipe prior smoke state. Order matters: child rows first.
+DELETE FROM dbo.ScriptedAlarmState    WHERE ScriptedAlarmId = @AlId;
+DELETE FROM dbo.ScriptedAlarm         WHERE ScriptedAlarmId = @AlId;
+DELETE FROM dbo.VirtualTag            WHERE VirtualTagId = @VtId;
+DELETE FROM dbo.Script                WHERE ScriptId IN (@VtScript, @AlScript);
+DELETE FROM dbo.UnsTagReference       WHERE UnsTagReferenceId = @RefId;
+DELETE FROM dbo.Tag                   WHERE TagId = @TagId;
+DELETE FROM dbo.Equipment             WHERE EquipmentId = @EqId;
+DELETE FROM dbo.UnsLine               WHERE UnsLineId = @LineId;
+DELETE FROM dbo.UnsArea               WHERE UnsAreaId = @AreaId;
+DELETE FROM dbo.Device                WHERE DeviceId = @DevId;
+DELETE FROM dbo.DriverInstance        WHERE DriverInstanceId = @DrvId;
 DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNode          WHERE NodeId = @NodeId;
-DELETE FROM dbo.ServerCluster        WHERE ClusterId = @ClusterId;
+DELETE FROM dbo.ClusterNode           WHERE NodeId = @NodeId;
+DELETE FROM dbo.ServerCluster         WHERE ClusterId = @ClusterId;
+DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
 
--- 1. Cluster + Node
+-- 1. Cluster + Node + credential binding.
 INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
 VALUES (@ClusterId, 'P7 Smoke', 'zb', 'lab', 1, 'None', 1, 'p7-smoke');
 
-INSERT dbo.ClusterNode(NodeId, ClusterId, RedundancyRole, Host, OpcUaPort, DashboardPort,
+INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
                        ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
-VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 5000,
-        'urn:OtOpcUa:p7-smoke-node', 200, 1, 'p7-smoke');
+VALUES (@NodeId, @ClusterId, 'localhost', 4840, 5000, 'urn:OtOpcUa:p7-smoke-node', 200, 1, 'p7-smoke');
 
--- sp_GetCurrentGenerationForCluster gates access by SUSER_SNAME() against
--- ClusterNodeCredential; without this binding the Server bootstrap fails with
--- `Unauthorized: caller sa is not bound to NodeId p7-smoke-node`. Dev Docker
--- SQL runs with `sa`; production deploys would rotate to a per-node login.
 INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
 VALUES (@NodeId, N'SqlLogin', N'sa', 1, N'p7-smoke');
 
--- 2. Generation (created Draft, flipped to Published at the end so insert order
---    constraints (one Draft per cluster, etc.) don't fight us).
-DECLARE @Gen bigint;
-INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
-VALUES (@ClusterId, 'Draft', 'p7-smoke');
-SET @Gen = SCOPE_IDENTITY();
-
--- 3. Namespace
-INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
-VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:p7-smoke:eq', 1);
-
--- 4. UNS hierarchy
-INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
-VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
-
-INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
-VALUES (@Gen, @LineId, @AreaId, 'galaxy-line');
-
-INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
-                     Name, MachineCode, Enabled)
-VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 'reactor-1', 'p7-rx-001', 1);
-
--- 5. Driver — Galaxy proxy. DriverConfig JSON tells the proxy how to reach the
---    already-running OtOpcUaGalaxyHost. Secret + pipe name match
---    .local/galaxy-host-secret.txt + the OtOpcUaGalaxyHost service env.
-INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
-                          Name, DriverType, DriverConfig, Enabled)
-VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'galaxy-smoke', 'Galaxy', N'{
-  "DriverInstanceId": "p7-smoke-galaxy",
-  "PipeName": "OtOpcUaGalaxy",
-  "SharedSecret": "4hgDJ4jLcKXmOmD1Ara8xtE8N3R47Q2y1Xf/Eama/Fk=",
+-- 2. Galaxy driver at the cluster root. DriverConfig keeps non-endpoint settings; the mxaccessgw
+--    gateway endpoint lives in the Device's DeviceConfig (shape finalized in Wave B / WP5).
+INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+VALUES (@DrvId, @ClusterId, NULL, 'galaxy-smoke', 'GalaxyMxGateway', N'{
   "ConnectTimeoutMs": 10000
 }', 1);
 
--- 6. One driver-sourced Tag bound to the Equipment. TagConfig is the Galaxy
---    fullRef; the EquipmentNodeWalker reads the JSON's FullName field and
---    hands that string to the Galaxy driver as the MXAccess reference.
---    Default points at TestMachine_001.TestHistoryValue — the live dev-box
---    Galaxy ships it as Int32 + writable (security_classification=Operate)
---    + historized (HistoryExtension primitive), so the E2E script can
---    exercise read + write + subscribe + alarm + history against the
---    same attribute. Swap to any other writable historized attribute on
---    this Galaxy by re-running `gr/queries/attributes_extended.sql` with
---    `WHERE is_historized=1 AND security_classification > 0`.
-INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
-               AccessLevel, TagConfig, WriteIdempotent)
-VALUES (@Gen, @TagId, @DrvId, @EqId, 'Source', 'Int32', 'ReadWrite',
-        N'{"FullName":"TestMachine_001.TestHistoryValue","DataType":"Int32"}', 0);
+INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+VALUES (@DevId, @DrvId, 'plc', 1, N'{ "GatewayAddress": "http://127.0.0.1:5001", "ClientName": "p7-smoke" }');
 
--- 7. Scripts (SourceHash is SHA-256 of SourceCode, computed externally — using
---    a placeholder here; the engine recomputes on first use anyway).
---
---    MachineStatus predicate — the dynamic "is the machine running?" status
---    derived from the raw Source value. Boolean: true when Source > 0. Matches
---    the shape Aveva operators typically want on a machine-status tile (green
---    when above zero, otherwise grey) without needing a separate threshold
---    attribute. Rename + re-threshold here to mirror site semantics.
-INSERT dbo.Script(GenerationId, ScriptId, Name, SourceCode, SourceHash, Language)
+-- 3. Raw tag bound to a Galaxy attribute. Identity is its RawPath; the MXAccess reference lives in
+--    TagConfig.attributeRef (v3 Galaxy address key; finalized in WP2/WP3).
+INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+VALUES (@TagId, @DevId, NULL, 'Source', 'Int32', 'ReadWrite', 0,
+        N'{ "attributeRef": "TestMachine_001.TestHistoryValue", "dataType": "Int32" }');
+
+-- 4. UNS hierarchy + reference into the equipment.
+INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name)          VALUES (@AreaId, @ClusterId, 'lab-floor');
+INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name)          VALUES (@LineId, @AreaId, 'galaxy-line');
+INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
+VALUES (@EqId, @EqUuid, @LineId, 'reactor-1', 'p7-rx-001', 1);
+
+INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
+VALUES (@RefId, @EqId, @TagId, 0);
+
+-- 5. Scripts. ctx.GetTag takes a RawPath in v3 (SourceHash placeholder; the engine recomputes).
+INSERT dbo.Script(ScriptId, Name, SourceCode, SourceHash, Language)
 VALUES
-  (@Gen, @VtScript, 'machine-status-predicate',
-   N'return System.Convert.ToInt32(ctx.GetTag("/lab-floor/galaxy-line/reactor-1/Source").Value) > 0;',
+  (@VtScript, 'machine-status-predicate',
+   N'return System.Convert.ToInt32(ctx.GetTag("' + @RawPath + N'").Value) > 0;',
    '0000000000000000000000000000000000000000000000000000000000000000', 'CSharp'),
-  (@Gen, @AlScript, 'overtemp-predicate',
-   N'return System.Convert.ToInt32(ctx.GetTag("/lab-floor/galaxy-line/reactor-1/Source").Value) > 50;',
+  (@AlScript, 'overtemp-predicate',
+   N'return System.Convert.ToInt32(ctx.GetTag("' + @RawPath + N'").Value) > 50;',
    '0000000000000000000000000000000000000000000000000000000000000000', 'CSharp');
 
--- 8. VirtualTag — MachineStatus boolean computed by Roslyn each time Source
---    changes. Historized so the dashboard can plot a running/idle timeline
---    next to the raw TestHistoryValue trend from Aveva Historian.
-INSERT dbo.VirtualTag(GenerationId, VirtualTagId, EquipmentId, Name, DataType,
+-- 6. VirtualTag — MachineStatus boolean computed on each Source change.
+INSERT dbo.VirtualTag(VirtualTagId, EquipmentId, Name, DataType,
                       ScriptId, ChangeTriggered, TimerIntervalMs, Historize, Enabled)
-VALUES (@Gen, @VtId, @EqId, 'MachineStatus', 'Boolean', @VtScript, 1, NULL, 1, 1);
+VALUES (@VtId, @EqId, 'MachineStatus', 'Boolean', @VtScript, 1, NULL, 1, 1);
 
--- 9. ScriptedAlarm — Active when Source > 50.
-INSERT dbo.ScriptedAlarm(GenerationId, ScriptedAlarmId, EquipmentId, Name, AlarmType,
+-- 7. ScriptedAlarm — Active when Source > 50. {token} is a RawPath in v3.
+INSERT dbo.ScriptedAlarm(ScriptedAlarmId, EquipmentId, Name, AlarmType,
                          Severity, MessageTemplate, PredicateScriptId,
                          HistorizeToAveva, Retain, Enabled)
-VALUES (@Gen, @AlId, @EqId, 'OverTemp', 'LimitAlarm', 800,
-        N'Reactor source value {/lab-floor/galaxy-line/reactor-1/Source} exceeded 50',
+VALUES (@AlId, @EqId, 'OverTemp', 'LimitAlarm', 800,
+        N'Reactor source value {' + @RawPath + N'} exceeded 50',
         @AlScript, 1, 1, 1);
 
--- 10. Publish — flip the generation Status. sp_PublishGeneration takes
---     concurrency locks + does ExternalIdReservation merging; we drive it via
---     EXEC rather than UPDATE so the rest of the publish workflow runs.
-EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
-                              @Notes = N'Phase 7 live smoke — task #240';
-
 COMMIT;
 
 PRINT '';
-PRINT 'Phase 7 smoke seed complete.';
-PRINT '  Cluster:    ' + @ClusterId;
-PRINT '  Node:       ' + @NodeId + ' (set Node:NodeId in appsettings.json)';
-PRINT '  Generation: ' + CONVERT(nvarchar(20), @Gen);
-PRINT '';
-PRINT 'Next steps:';
-PRINT '  1. Edit src/Server/ZB.MOM.WW.OtOpcUa.Server/appsettings.json:';
-PRINT '       Node:NodeId      = "p7-smoke-node"';
-PRINT '       Node:ClusterId   = "p7-smoke"';
-PRINT '  2. Edit the placeholder Galaxy attribute in dbo.Tag.TagConfig above';
-PRINT '       so it points at a real attribute on this Galaxy — replace';
-PRINT '       REPLACE_WITH_REAL_GALAXY_ATTRIBUTE with e.g. "Plant1.Reactor1.Temp".';
-PRINT '  3. Start the Server in a non-elevated shell so the Galaxy.Host pipe ACL';
-PRINT '       accepts the connection:';
-PRINT '       dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server';
-PRINT '  4. Validate via Client.CLI per docs/v2/implementation/phase-7-e2e-smoke.md';
+PRINT 'Phase 7 smoke seed complete (v3 schema). Cluster: ' + @ClusterId + '  Node: ' + @NodeId;
+PRINT 'Next: set Server Node:NodeId/ClusterId, deploy via the ControlPlane, then run the Client.CLI checks.';
diff --git a/scripts/smoke/seed-s7-smoke.sql b/scripts/smoke/seed-s7-smoke.sql
index 8b5c2f31..911a573a 100644
--- a/scripts/smoke/seed-s7-smoke.sql
+++ b/scripts/smoke/seed-s7-smoke.sql
@@ -1,127 +1,74 @@
--- S7 e2e smoke seed — closes #212 (umbrella #209).
+-- S7 e2e smoke seed — v3 schema (Raw tree: DriverInstance → Device → Tag; UNS by reference).
 --
--- One-cluster seed pointing at the python-snap7 fixture
--- (`docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/Docker/docker-compose.yml --profile s7_1500 up -d`).
--- python-snap7 listens on port 1102 (non-priv); real S7 CPUs listen on 102.
--- Publishes one Int16 tag at DB1.DBW0 under `ns=<N>;s=DB1_DBW0` (driver
--- sanitises the dot for browse names — see S7Driver.DiscoverAsync).
+-- Idempotent DELETE-and-recreate of one cluster's worth of S7 test config pointing at the snap7
+-- fixture (127.0.0.1:1102). v3: the ConfigGeneration/Namespace model + sp_PublishGeneration are
+-- gone; the endpoint (Host/Port/Rack/Slot) moved from DriverConfig into the Device's DeviceConfig.
 --
--- Usage:
---   sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
---          -i scripts/smoke/seed-s7-smoke.sql
---
--- After seeding:
---     Node:NodeId    = "s7-smoke-node"
---     Node:ClusterId = "s7-smoke"
--- Then start server + run `./scripts/e2e/test-s7.ps1 -BridgeNodeId "ns=2;s=DB1_DBW0" -S7Host "127.0.0.1:1102"`.
+-- After seeding: set Server appsettings Node:NodeId/ClusterId, deploy via the ControlPlane, then
+-- `./scripts/e2e/test-s7.ps1 -BridgeNodeId "ns=2;s=DB1_DBW0" -S7Host "127.0.0.1:1102"`.
 
 SET NOCOUNT ON;
 SET XACT_ABORT ON;
 SET QUOTED_IDENTIFIER ON;
 SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
 
 DECLARE @ClusterId nvarchar(64) = 's7-smoke';
 DECLARE @NodeId    nvarchar(64) = 's7-smoke-node';
 DECLARE @DrvId     nvarchar(64) = 's7-smoke-drv';
-DECLARE @NsId      nvarchar(64) = 's7-smoke-ns';
+DECLARE @DevId     nvarchar(64) = 's7-smoke-dev';
 DECLARE @AreaId    nvarchar(64) = 's7-smoke-area';
 DECLARE @LineId    nvarchar(64) = 's7-smoke-line';
 DECLARE @EqId      nvarchar(64) = 's7-smoke-eq';
-DECLARE @EqUuid    uniqueidentifier = '17BD5A10-17BD-417B-917B-D5A1017BD5A1';
-DECLARE @TagId     nvarchar(64) = 's7-smoke-tag-db1dbw0';
+DECLARE @EqUuid    uniqueidentifier = '5717A5E0-5717-45E0-9571-7A5E05717A5E';
+DECLARE @Tag       nvarchar(64) = 's7-smoke-tag-db1dbw0';
+DECLARE @RefId     nvarchar(64) = 's7-smoke-ref-db1dbw0';
 
 BEGIN TRAN;
 
-DELETE FROM dbo.Tag                        WHERE TagId IN (@TagId);
-DELETE FROM dbo.Equipment                  WHERE EquipmentId = @EqId;
-DELETE FROM dbo.UnsLine                    WHERE UnsLineId = @LineId;
-DELETE FROM dbo.UnsArea                    WHERE UnsAreaId = @AreaId;
-DELETE FROM dbo.DriverInstance             WHERE DriverInstanceId = @DrvId;
-DELETE FROM dbo.Namespace                  WHERE NamespaceId = @NsId;
-DELETE FROM dbo.ConfigGeneration           WHERE ClusterId = @ClusterId;
-DELETE FROM dbo.ClusterNodeCredential      WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
-DELETE FROM dbo.ClusterNode                WHERE NodeId = @NodeId;
-DELETE FROM dbo.ServerCluster              WHERE ClusterId = @ClusterId;
-
+DELETE FROM dbo.UnsTagReference       WHERE UnsTagReferenceId = @RefId;
+DELETE FROM dbo.Tag                   WHERE TagId = @Tag;
+DELETE FROM dbo.Equipment             WHERE EquipmentId = @EqId;
+DELETE FROM dbo.UnsLine               WHERE UnsLineId = @LineId;
+DELETE FROM dbo.UnsArea               WHERE UnsAreaId = @AreaId;
+DELETE FROM dbo.Device                WHERE DeviceId = @DevId;
+DELETE FROM dbo.DriverInstance        WHERE DriverInstanceId = @DrvId;
+DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
+DELETE FROM dbo.ClusterNode           WHERE NodeId = @NodeId;
+DELETE FROM dbo.ServerCluster         WHERE ClusterId = @ClusterId;
 DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
 
 INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
 VALUES (@ClusterId, 'S7 Smoke', 'zb', 'lab', 1, 'None', 1, 's7-smoke');
 
-INSERT dbo.ClusterNode(NodeId, ClusterId, RedundancyRole, Host, OpcUaPort, DashboardPort,
+INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
                        ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
-VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 15050,
-        'urn:OtOpcUa:s7-smoke-node', 200, 1, 's7-smoke');
--- Dashboard moved off :5000 (Windows URL-ACL).
+VALUES (@NodeId, @ClusterId, 'localhost', 4840, 15050, 'urn:OtOpcUa:s7-smoke-node', 200, 1, 's7-smoke');
 
 INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
 VALUES (@NodeId, 'SqlLogin', 'sa', 1, 's7-smoke');
 
-DECLARE @Gen bigint;
-INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
-VALUES (@ClusterId, 'Draft', 's7-smoke');
-SET @Gen = SCOPE_IDENTITY();
-
-INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
-VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:s7-smoke:eq', 1);
-
-INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
-VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
-
-INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
-VALUES (@Gen, @LineId, @AreaId, 's7-line');
-
-INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
-                     Name, MachineCode, Enabled)
-VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 's7-sim', 's7-001', 1);
-
--- S7 DriverInstance — python-snap7 S7-1500 profile, slot 0, port 1102.
--- DriverConfig shape mirrors S7DriverConfigDto.
-INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
-                          Name, DriverType, DriverConfig, Enabled)
-VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'snap7-smoke', 'S7', N'{
-  "Host": "127.0.0.1",
-  "Port": 1102,
-  "CpuType": "S71500",
-  "Rack": 0,
-  "Slot": 0,
-  "TimeoutMs": 5000,
-  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": "MW0" },
-  "Tags": [
-    {
-      "Name": "DB1_DBW0",
-      "Address": "DB1.DBW0",
-      "DataType": "Int16",
-      "Writable": true,
-      "WriteIdempotent": true
-    }
-  ]
+-- DriverConfig keeps protocol/channel settings; endpoint moves to DeviceConfig.
+INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
+VALUES (@DrvId, @ClusterId, NULL, 'snap7-smoke', 'S7', N'{
+  "Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": "MW0" }
 }', 1);
 
-INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
-               AccessLevel, TagConfig, WriteIdempotent)
-VALUES (@Gen, @TagId, @DrvId, @EqId, 'DB1_DBW0', 'Int16', 'ReadWrite',
-        N'{"FullName":"DB1_DBW0","Address":"DB1.DBW0","DataType":"Int16"}', 1);
+-- DeviceConfig shape finalized against reworked options in Wave B (WP5).
+INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
+VALUES (@DevId, @DrvId, 'plc', 1, N'{ "Host": "127.0.0.1", "Port": 1102, "Rack": 0, "Slot": 0 }');
 
-EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
-                              @Notes = N'S7 smoke — task #212';
+INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
+VALUES (@Tag, @DevId, NULL, 'DB1_DBW0', 'Int16', 'ReadWrite', 1,
+        N'{ "address": "DB1.DBW0", "dataType": "Int16" }');
+
+INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name)          VALUES (@AreaId, @ClusterId, 'lab-floor');
+INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name)          VALUES (@LineId, @AreaId, 's7-line');
+INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
+VALUES (@EqId, @EqUuid, @LineId, 's7-sim', 's7-001', 1);
+
+INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
+VALUES (@RefId, @EqId, @Tag, 0);
 
 COMMIT;
 
-PRINT '';
-PRINT 'S7 smoke seed complete.';
-PRINT '  Cluster:    ' + @ClusterId;
-PRINT '  Node:       ' + @NodeId;
-PRINT '  Generation: ' + CONVERT(nvarchar(20), @Gen);
-PRINT '';
-PRINT 'Next steps:';
-PRINT '  1. Set src/.../Server/appsettings.json Node:NodeId = "s7-smoke-node"';
-PRINT '                                          Node:ClusterId = "s7-smoke"';
-PRINT '  2. docker compose -f tests/.../S7.IntegrationTests/Docker/docker-compose.yml --profile s7_1500 up -d';
-PRINT '  3. dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server';
-PRINT '  4. ./scripts/e2e/test-s7.ps1 -BridgeNodeId "ns=2;s=DB1_DBW0" -S7Host "127.0.0.1:1102"';
+PRINT 'S7 smoke seed complete (v3 schema). Cluster: ' + @ClusterId + '  Node: ' + @NodeId;
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/DriverDeviceConfigMerger.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/DriverDeviceConfigMerger.cs
new file mode 100644
index 00000000..b97756cf
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/DriverDeviceConfigMerger.cs
@@ -0,0 +1,99 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Commons.Types;
+
+/// <summary>
+///     v3 endpoint→<c>DeviceConfig</c> merge authority. Folds a driver's <c>DriverConfig</c> JSON
+///     (protocol/channel-level settings) together with its per-<c>Device</c> <c>DeviceConfig</c> JSON
+///     (host/endpoint + per-device settings — the Kepware channel/device split) plus the driver's authored
+///     raw tags into the SINGLE config blob every driver factory binds from. Shared by the deploy-decode
+///     seam (<c>DeploymentArtifact</c>, which builds each <c>DriverInstanceSpec.DriverConfig</c>) and — in
+///     Batch 2 — the browse modal (which needs the same merged shape as the browser's <c>configJson</c>),
+///     so the merge lives in exactly one place.
+///     <para><b>Contract.</b> Output = the parsed <c>DriverConfig</c> object with, in order:
+///     <list type="number">
+///       <item>When there is EXACTLY ONE device, its <c>DeviceConfig</c> keys shallow-merged up to the top
+///       level (DeviceConfig wins) — so a single-endpoint driver's endpoint (<c>Host</c>/<c>Port</c>,
+///       <c>EndpointUrl</c>, gateway address, …) lands where its options bind. Multiple devices do NOT
+///       merge up (their endpoints are per-device, read from the array below).</item>
+///       <item>A reconstructed <c>Devices</c> array — one object per device = its <c>DeviceConfig</c> keys
+///       plus <c>DeviceName</c> = the device's entity <c>Name</c> (the RawPath device segment /
+///       <see cref="RawTagEntry.DeviceName"/> routing key). Multi-device drivers read this; single-endpoint
+///       drivers ignore the unknown key.</item>
+///       <item>A <c>RawTags</c> array = the driver's authored <see cref="RawTagEntry"/> list, so
+///       <c>options.RawTags</c> binds.</item>
+///     </list>
+///     Existing top-level protocol/channel keys survive (single-device DeviceConfig keys override on a name
+///     clash — the documented Kepware precedence). Never throws on malformed member JSON: a blank/invalid
+///     <c>DriverConfig</c> or <c>DeviceConfig</c> degrades to an empty object for that member.</para>
+/// </summary>
+public static class DriverDeviceConfigMerger
+{
+    private static readonly JsonSerializerOptions SerializeOptions = new()
+    {
+        WriteIndented = false,
+        DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.Never,
+    };
+
+    /// <summary>The device rows feeding the merge: the entity <c>Name</c> (routing key) + schemaless <c>DeviceConfig</c> JSON.</summary>
+    /// <param name="Name">The device's entity <c>Name</c> — the RawPath device segment and multi-device routing key.</param>
+    /// <param name="DeviceConfig">The device's schemaless <c>DeviceConfig</c> JSON (endpoint + per-device settings).</param>
+    public readonly record struct DeviceRow(string Name, string? DeviceConfig);
+
+    /// <summary>Merge a driver's config + its devices' configs + its authored raw tags into one config blob.</summary>
+    /// <param name="driverConfigJson">The driver-level <c>DriverConfig</c> JSON (protocol/channel settings).</param>
+    /// <param name="devices">The driver's device rows, in deterministic order (the sole device merges up).</param>
+    /// <param name="rawTags">The driver's authored raw tags to inject as the <c>RawTags</c> array.</param>
+    /// <returns>The single merged config JSON string the driver factory binds from.</returns>
+    public static string Merge(
+        string? driverConfigJson,
+        IReadOnlyList<DeviceRow> devices,
+        IReadOnlyList<RawTagEntry> rawTags)
+    {
+        ArgumentNullException.ThrowIfNull(devices);
+        ArgumentNullException.ThrowIfNull(rawTags);
+
+        var root = ParseObject(driverConfigJson);
+
+        // (1) Exactly one device ⇒ shallow-merge its DeviceConfig up to the top level (DeviceConfig wins),
+        // so a single-endpoint driver's endpoint lands where its options bind. Multiple devices are
+        // per-device only (read from the Devices array below), so no merge-up.
+        if (devices.Count == 1)
+        {
+            var only = ParseObject(devices[0].DeviceConfig);
+            foreach (var (key, value) in only)
+                root[key] = value?.DeepClone();
+        }
+
+        // (2) Reconstruct the Devices array from ALL device rows: DeviceConfig keys + DeviceName = entity Name.
+        var devicesArray = new JsonArray();
+        foreach (var device in devices)
+        {
+            var obj = ParseObject(device.DeviceConfig);
+            obj["DeviceName"] = device.Name; // entity Name is the RawPath device segment + routing key
+            devicesArray.Add(obj);
+        }
+        root["Devices"] = devicesArray;
+
+        // (3) Inject the authored raw tags so options.RawTags binds.
+        root["RawTags"] = JsonSerializer.SerializeToNode(rawTags, SerializeOptions);
+
+        return root.ToJsonString(SerializeOptions);
+    }
+
+    /// <summary>Parse JSON into a mutable <see cref="JsonObject"/>; blank / non-object / malformed ⇒ a fresh empty object.</summary>
+    private static JsonObject ParseObject(string? json)
+    {
+        if (string.IsNullOrWhiteSpace(json)) return new JsonObject();
+        try
+        {
+            return JsonNode.Parse(json) as JsonObject ?? new JsonObject();
+        }
+        catch (JsonException)
+        {
+            return new JsonObject();
+        }
+    }
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPathResolver.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPathResolver.cs
new file mode 100644
index 00000000..47feedfd
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPathResolver.cs
@@ -0,0 +1,132 @@
+namespace ZB.MOM.WW.OtOpcUa.Commons.Types;
+
+/// <summary>
+///     Resolves a raw <c>Tag</c>'s v3 <c>RawPath</c> — the single identity string
+///     <c>&lt;Folder/…&gt;/&lt;Driver&gt;/&lt;Device&gt;/&lt;TagGroup/…&gt;/&lt;Tag&gt;</c> — from the raw
+///     topology's ancestry maps, and a driver's RawPath prefix (folders + driver name). Pure + input-shape
+///     agnostic: callers build the four id→ancestry maps from whatever they have (EF entities on the
+///     authoring/validation side, artifact JSON on the deploy-decode side) and both sides then agree
+///     byte-for-byte because the segment order + join live ONLY here (over <see cref="RawPaths"/>).
+///     <para>Every path is built through <see cref="RawPaths.Combine"/>, so segment charset (no
+///     <c>/</c>, no lead/trail whitespace) is enforced in one place. A broken link (missing device / driver
+///     lookup, or an invalid segment) yields <see langword="null"/> — never a throw — so a malformed
+///     artifact degrades to "this tag has no RawPath" (dropped) rather than faulting a whole deploy decode.
+///     Ancestry walks are depth-bounded to survive a corrupt parent cycle.</para>
+/// </summary>
+public sealed class RawPathResolver
+{
+    private const int MaxAncestryDepth = 256;
+
+    private readonly IReadOnlyDictionary<string, (string? ParentId, string Name)> _folders;
+    private readonly IReadOnlyDictionary<string, (string? RawFolderId, string Name)> _drivers;
+    private readonly IReadOnlyDictionary<string, (string DriverInstanceId, string Name)> _devices;
+    private readonly IReadOnlyDictionary<string, (string? ParentId, string Name)> _groups;
+
+    /// <summary>Initializes a new <see cref="RawPathResolver"/> over the raw topology's ancestry maps.</summary>
+    /// <param name="folders"><c>RawFolderId → (ParentRawFolderId?, Name)</c>. <see langword="null"/> parent = cluster root.</param>
+    /// <param name="drivers"><c>DriverInstanceId → (RawFolderId?, Name)</c>. <see langword="null"/> folder = cluster root.</param>
+    /// <param name="devices"><c>DeviceId → (DriverInstanceId, Name)</c>.</param>
+    /// <param name="groups"><c>TagGroupId → (ParentTagGroupId?, Name)</c>. <see langword="null"/> parent = directly under the device.</param>
+    public RawPathResolver(
+        IReadOnlyDictionary<string, (string? ParentId, string Name)> folders,
+        IReadOnlyDictionary<string, (string? RawFolderId, string Name)> drivers,
+        IReadOnlyDictionary<string, (string DriverInstanceId, string Name)> devices,
+        IReadOnlyDictionary<string, (string? ParentId, string Name)> groups)
+    {
+        ArgumentNullException.ThrowIfNull(folders);
+        ArgumentNullException.ThrowIfNull(drivers);
+        ArgumentNullException.ThrowIfNull(devices);
+        ArgumentNullException.ThrowIfNull(groups);
+        _folders = folders;
+        _drivers = drivers;
+        _devices = devices;
+        _groups = groups;
+    }
+
+    /// <summary>
+    ///     Build the RawPath prefix a driver contributes to every child tag: its folder ancestry
+    ///     (root → leaf) followed by the driver name. Returns <see langword="null"/> when the driver id is
+    ///     unknown or any segment/link is invalid.
+    /// </summary>
+    /// <param name="driverInstanceId">The driver instance id.</param>
+    /// <returns>The driver RawPath prefix, or <see langword="null"/> on a broken/unknown chain.</returns>
+    public string? TryBuildDriverPrefix(string driverInstanceId)
+    {
+        if (driverInstanceId is null || !_drivers.TryGetValue(driverInstanceId, out var driver)) return null;
+        try
+        {
+            var path = BuildFolderChain(driver.RawFolderId);
+            return RawPaths.Combine(path, driver.Name);
+        }
+        catch (ArgumentException)
+        {
+            return null;
+        }
+    }
+
+    /// <summary>
+    ///     Build a raw tag's full RawPath:
+    ///     <c>&lt;driver-prefix&gt;/&lt;Device&gt;/&lt;TagGroup ancestry root→leaf&gt;/&lt;Tag&gt;</c>.
+    ///     Returns <see langword="null"/> when the device / driver lookup is missing or any segment/link is
+    ///     invalid.
+    /// </summary>
+    /// <param name="deviceId">The tag's owning device id.</param>
+    /// <param name="tagGroupId">The tag's owning tag-group id, or <see langword="null"/> when directly under the device.</param>
+    /// <param name="tagName">The tag's leaf name.</param>
+    /// <returns>The tag's RawPath, or <see langword="null"/> on a broken/unknown chain.</returns>
+    public string? TryBuildTagPath(string deviceId, string? tagGroupId, string tagName)
+    {
+        if (deviceId is null || !_devices.TryGetValue(deviceId, out var device)) return null;
+        var driverPrefix = TryBuildDriverPrefix(device.DriverInstanceId);
+        if (driverPrefix is null) return null;
+        try
+        {
+            var path = RawPaths.Combine(driverPrefix, device.Name);
+            path = AppendGroupChain(path, tagGroupId);
+            return RawPaths.Combine(path, tagName);
+        }
+        catch (ArgumentException)
+        {
+            return null;
+        }
+    }
+
+    /// <summary>Build a folder ancestry path (root → leaf) for the given leaf folder id (null = cluster root ⇒ blank).</summary>
+    private string? BuildFolderChain(string? leafFolderId)
+    {
+        if (leafFolderId is null) return null;
+        var names = new List<string>();
+        var current = leafFolderId;
+        var depth = 0;
+        while (current is not null && depth++ < MaxAncestryDepth)
+        {
+            if (!_folders.TryGetValue(current, out var folder))
+                throw new ArgumentException($"Unknown RawFolder '{current}'.");
+            names.Add(folder.Name);
+            current = folder.ParentId;
+        }
+        names.Reverse();
+        return names.Count == 0 ? null : RawPaths.Build(names);
+    }
+
+    /// <summary>Append a tag-group ancestry path (root → leaf) onto <paramref name="parentPath"/> (null group ⇒ unchanged).</summary>
+    private string AppendGroupChain(string parentPath, string? leafGroupId)
+    {
+        if (leafGroupId is null) return parentPath;
+        var names = new List<string>();
+        var current = leafGroupId;
+        var depth = 0;
+        while (current is not null && depth++ < MaxAncestryDepth)
+        {
+            if (!_groups.TryGetValue(current, out var group))
+                throw new ArgumentException($"Unknown TagGroup '{current}'.");
+            names.Add(group.Name);
+            current = group.ParentId;
+        }
+        names.Reverse();
+        var path = parentPath;
+        foreach (var name in names)
+            path = RawPaths.Combine(path, name);
+        return path;
+    }
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPaths.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPaths.cs
new file mode 100644
index 00000000..1b38957f
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/RawPaths.cs
@@ -0,0 +1,135 @@
+namespace ZB.MOM.WW.OtOpcUa.Commons.Types;
+
+/// <summary>
+///     The v3 identity authority. A <c>RawPath</c> is the cluster-scoped, slash-separated raw device
+///     path — <c>&lt;Folder/…&gt;/&lt;Driver&gt;/&lt;Device&gt;/&lt;TagGroup/…&gt;/&lt;Tag&gt;</c> — and is
+///     the single string used at every identity seam: <c>ns=Raw</c> NodeIds, the driver wire-reference
+///     (<c>EquipmentTagRefResolver</c> key), the value fan-out / write-routing maps
+///     (<c>DriverHostActor</c>), the historian default tagname + mux interest key, the native-alarm
+///     <c>ConditionId</c>, and <c>ctx.GetTag</c> script paths.
+///     <para>
+///     RawPaths are ALWAYS built through this helper — never string-concatenated ad hoc — so the
+///     separator and the segment charset are enforced in exactly one place. Comparison is
+///     case-sensitive ordinal everywhere (see <see cref="Comparer"/>).
+///     </para>
+/// </summary>
+public static class RawPaths
+{
+    /// <summary>The single path separator character. Forbidden inside any segment.</summary>
+    public const char Separator = '/';
+
+    /// <summary>The path separator as a string (join/split convenience).</summary>
+    public const string SeparatorString = "/";
+
+    /// <summary>The one comparer for RawPaths and their segments: case-sensitive ordinal.</summary>
+    public static StringComparer Comparer => StringComparer.Ordinal;
+
+    /// <summary>
+    ///     Validate a single path segment. A segment must be non-empty, contain no
+    ///     <see cref="Separator"/>, and carry no leading/trailing whitespace (the separator and
+    ///     surrounding whitespace would corrupt the NodeId / round-trip).
+    /// </summary>
+    /// <param name="segment">The candidate segment (a folder / driver / device / group / tag name).</param>
+    /// <returns>A human-readable error when invalid, or <see langword="null"/> when the segment is valid.</returns>
+    public static string? ValidateSegment(string? segment)
+    {
+        if (string.IsNullOrEmpty(segment))
+            return "Name must not be empty.";
+        if (segment.IndexOf(Separator) >= 0)
+            return $"Name must not contain '{Separator}'.";
+        if (char.IsWhiteSpace(segment[0]) || char.IsWhiteSpace(segment[^1]))
+            return "Name must not have leading or trailing whitespace.";
+        return null;
+    }
+
+    /// <summary>True when <paramref name="segment"/> passes <see cref="ValidateSegment"/>.</summary>
+    /// <param name="segment">The candidate segment.</param>
+    /// <returns><see langword="true"/> when the segment is a legal RawPath segment.</returns>
+    public static bool IsValidSegment(string? segment) => ValidateSegment(segment) is null;
+
+    /// <summary>
+    ///     Build a RawPath from ordered segments (root-first). Every segment is validated via
+    ///     <see cref="ValidateSegment"/>; an invalid or empty segment list throws.
+    /// </summary>
+    /// <param name="segments">The ordered, non-empty segments (root → leaf).</param>
+    /// <returns>The slash-joined RawPath.</returns>
+    /// <exception cref="ArgumentException">A segment is invalid, or the sequence is empty.</exception>
+    public static string Build(IEnumerable<string> segments)
+    {
+        ArgumentNullException.ThrowIfNull(segments);
+        var list = segments as IReadOnlyList<string> ?? segments.ToList();
+        if (list.Count == 0)
+            throw new ArgumentException("A RawPath must have at least one segment.", nameof(segments));
+
+        for (var i = 0; i < list.Count; i++)
+        {
+            var error = ValidateSegment(list[i]);
+            if (error is not null)
+                throw new ArgumentException($"Invalid RawPath segment at index {i} ('{list[i]}'): {error}", nameof(segments));
+        }
+
+        return string.Join(Separator, list);
+    }
+
+    /// <summary>Build a RawPath from ordered segments (root-first). See <see cref="Build(IEnumerable{string})"/>.</summary>
+    /// <param name="segments">The ordered, non-empty segments (root → leaf).</param>
+    /// <returns>The slash-joined RawPath.</returns>
+    public static string Build(params string[] segments) => Build((IEnumerable<string>)segments);
+
+    /// <summary>
+    ///     Append a child segment to an existing (already-built) parent RawPath. The child is
+    ///     validated; a blank parent yields the (validated) child alone.
+    /// </summary>
+    /// <param name="parentPath">The parent RawPath (assumed already valid), or blank for a root segment.</param>
+    /// <param name="childSegment">The child segment to append.</param>
+    /// <returns>The combined RawPath.</returns>
+    /// <exception cref="ArgumentException">The child segment is invalid.</exception>
+    public static string Combine(string? parentPath, string childSegment)
+    {
+        var error = ValidateSegment(childSegment);
+        if (error is not null)
+            throw new ArgumentException($"Invalid RawPath segment ('{childSegment}'): {error}", nameof(childSegment));
+
+        return string.IsNullOrEmpty(parentPath) ? childSegment : parentPath + Separator + childSegment;
+    }
+
+    /// <summary>Split a RawPath into its ordered segments (root → leaf).</summary>
+    /// <param name="rawPath">The RawPath to split.</param>
+    /// <returns>The ordered segments; a single-element array for a one-segment path.</returns>
+    public static IReadOnlyList<string> Split(string rawPath)
+    {
+        ArgumentNullException.ThrowIfNull(rawPath);
+        return rawPath.Split(Separator);
+    }
+
+    /// <summary>The leaf (last) segment of a RawPath.</summary>
+    /// <param name="rawPath">The RawPath.</param>
+    /// <returns>The final segment.</returns>
+    public static string Leaf(string rawPath)
+    {
+        ArgumentNullException.ThrowIfNull(rawPath);
+        var idx = rawPath.LastIndexOf(Separator);
+        return idx < 0 ? rawPath : rawPath[(idx + 1)..];
+    }
+
+    /// <summary>
+    ///     Get the parent RawPath (everything up to, not including, the leaf). Returns
+    ///     <see langword="false"/> for a single-segment path (no parent).
+    /// </summary>
+    /// <param name="rawPath">The RawPath.</param>
+    /// <param name="parent">The parent RawPath when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when a parent exists.</returns>
+    public static bool TryParent(string rawPath, out string parent)
+    {
+        ArgumentNullException.ThrowIfNull(rawPath);
+        var idx = rawPath.LastIndexOf(Separator);
+        if (idx < 0)
+        {
+            parent = string.Empty;
+            return false;
+        }
+
+        parent = rawPath[..idx];
+        return true;
+    }
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/TagConfigIntent.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/TagConfigIntent.cs
index ba81fcf2..97c5b5dc 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/TagConfigIntent.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Commons/Types/TagConfigIntent.cs
@@ -8,28 +8,17 @@ namespace ZB.MOM.WW.OtOpcUa.Commons.Types;
 ///     (<c>AddressSpaceComposer</c>), the artifact-decode seam (<c>DeploymentArtifact</c>), the draft
 ///     gate (<c>DraftValidator</c>), and the walker (<c>EquipmentNodeWalker</c>). One
 ///     <see cref="JsonDocument.Parse(string)"/> per blob. Never throws.
-///     <para>Two deliberate variations are carried on the record so every seam can be served from one
-///     parse:</para>
-///     <list type="bullet">
-///         <item><description><see cref="FullName"/> is the driver-side wire reference: the top-level
-///         <c>FullName</c> string when present, else the RAW blob (an equipment tag's TagConfig JSON
-///         <em>is</em> its wire reference for the six protocol drivers). <c>Parse(null)</c> ⇒
-///         <c>FullName == ""</c>.</description></item>
-///         <item><description><see cref="ExplicitFullName"/> is the <c>FullName</c> property ONLY when
-///         present-and-string, else <see langword="null"/> — the DraftValidator Galaxy-rule semantics
-///         (it wants the explicit reference, not the raw-blob fallback).</description></item>
-///     </list>
+///     <para>Under the v3 identity contract, <c>TagConfig</c> no longer carries identity — the
+///     RawPath (computed elsewhere) is the single identity string at every seam. This type parses
+///     only the cross-driver PLATFORM intents (alarm / historize / array); the driver-specific
+///     address fields stay opaque inside the blob and are read by the per-driver resolvers.</para>
 /// </summary>
-/// <param name="FullName">Top-level <c>FullName</c> string, else the raw blob (wire-reference fallback).</param>
-/// <param name="ExplicitFullName">The <c>FullName</c> property when present-and-string, else <see langword="null"/>.</param>
 /// <param name="Alarm">The optional native-alarm intent parsed from the <c>alarm</c> object; <see langword="null"/> ⇒ plain value variable.</param>
 /// <param name="IsHistorized"><c>isHistorized</c> — true only when the value is a bool <c>true</c>.</param>
 /// <param name="HistorianTagname">Non-whitespace <c>historianTagname</c> string override, else <see langword="null"/> (not trimmed).</param>
 /// <param name="IsArray"><c>isArray</c> bool.</param>
 /// <param name="ArrayLength"><c>arrayLength</c> honoured ONLY when <see cref="IsArray"/> and a JSON number fitting <see cref="uint"/>; else <see langword="null"/>.</param>
 public sealed record TagConfigIntent(
-    string FullName,
-    string? ExplicitFullName,
     TagAlarmIntent? Alarm,
     bool IsHistorized,
     string? HistorianTagname,
@@ -38,40 +27,33 @@ public sealed record TagConfigIntent(
 {
     /// <summary>
     ///     Parse a Tag's schemaless <c>TagConfig</c> JSON into the cross-driver platform intents.
-    ///     Never throws: malformed JSON / non-object root / blank / null ⇒ all intents default with
-    ///     <see cref="FullName"/> = the raw blob (or "" for null). Semantics are ported verbatim from the
-    ///     historical <c>AddressSpaceComposer.Extract*</c> statics (the canonical copy).
+    ///     Never throws: malformed JSON / non-object root / blank / null ⇒ all intents default.
+    ///     Semantics are ported verbatim from the historical <c>AddressSpaceComposer.Extract*</c>
+    ///     statics (the canonical copy).
     /// </summary>
     /// <param name="tagConfig">The tag's raw <c>TagConfig</c> JSON (nullable/blank tolerated).</param>
     /// <returns>The parsed intents; never <see langword="null"/>.</returns>
     public static TagConfigIntent Parse(string? tagConfig)
     {
         if (string.IsNullOrWhiteSpace(tagConfig))
-            return new TagConfigIntent(tagConfig ?? string.Empty, null, null, false, null, false, null);
+            return new TagConfigIntent(null, false, null, false, null);
 
         try
         {
             using var doc = JsonDocument.Parse(tagConfig);
             var root = doc.RootElement;
             if (root.ValueKind != JsonValueKind.Object)
-                return new TagConfigIntent(tagConfig, null, null, false, null, false, null);
-
-            var explicitFullName =
-                root.TryGetProperty("FullName", out var fn) && fn.ValueKind == JsonValueKind.String
-                    ? fn.GetString()
-                    : null;
-            var fullName = explicitFullName ?? tagConfig;
+                return new TagConfigIntent(null, false, null, false, null);
 
             var (isHistorized, historianTagname) = ParseHistorize(root);
             var (isArray, arrayLength) = ParseArray(root);
 
             return new TagConfigIntent(
-                fullName, explicitFullName, ParseAlarm(root),
-                isHistorized, historianTagname, isArray, arrayLength);
+                ParseAlarm(root), isHistorized, historianTagname, isArray, arrayLength);
         }
         catch (JsonException)
         {
-            return new TagConfigIntent(tagConfig, null, null, false, null, false, null);
+            return new TagConfigIntent(null, false, null, false, null);
         }
     }
 
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Device.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Device.cs
index 0fca1d16..58b52274 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Device.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Device.cs
@@ -1,6 +1,12 @@
 namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 
-/// <summary>Per-device row for multi-device drivers (Modbus, AB CIP). Optional for single-device drivers.</summary>
+/// <summary>
+///     v3: a device under a <see cref="DriverInstance"/>. Now UNIVERSAL — every driver has ≥1 device
+///     (single-endpoint drivers get an auto-created default device). Endpoint/connection settings live
+///     in <see cref="DeviceConfig"/> (the Kepware channel/device split: <c>DriverConfig</c> keeps
+///     protocol/channel-level settings; <c>DeviceConfig</c> carries host/endpoint + per-device
+///     settings). The device name is a RawPath segment.
+/// </summary>
 public sealed class Device
 {
     /// <summary>
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/DriverInstance.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/DriverInstance.cs
index 6bc962a2..a63cf0e8 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/DriverInstance.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/DriverInstance.cs
@@ -13,12 +13,13 @@ public sealed class DriverInstance
     public required string ClusterId { get; set; }
 
     /// <summary>
-    ///     Logical FK to <see cref="Namespace.NamespaceId"/>. Same-cluster binding enforced by
-    ///     <c>sp_ValidateDraft</c>: Namespace.ClusterId must equal DriverInstance.ClusterId.
+    ///     v3: logical FK to a containing <see cref="RawFolder.RawFolderId"/>; <see langword="null"/>
+    ///     = the driver sits at the cluster root of the Raw tree. Contributes the leading segments of
+    ///     every child tag's <c>RawPath</c>.
     /// </summary>
-    public required string NamespaceId { get; set; }
+    public string? RawFolderId { get; set; }
 
-    /// <summary>Gets or sets the friendly name of this driver instance.</summary>
+    /// <summary>Gets or sets the friendly name of this driver instance. A RawPath segment.</summary>
     public required string Name { get; set; }
 
     /// <summary>Galaxy | Modbus | AbCip | AbLegacy | S7 | TwinCat | Focas | OpcUaClient</summary>
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Equipment.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Equipment.cs
index e6eef1c8..ce537148 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Equipment.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Equipment.cs
@@ -17,14 +17,9 @@ public sealed class Equipment
     /// <summary>UUIDv4, IMMUTABLE across all generations of the same EquipmentId. Downstream-consumer join key.</summary>
     public Guid EquipmentUuid { get; set; }
 
-    /// <summary>
-    ///     Optional logical FK to the driver providing data for this equipment.
-    ///     <c>null</c> = VirtualTag-only / driver-less equipment (no field driver).
-    /// </summary>
-    public string? DriverInstanceId { get; set; }
-
-    /// <summary>Optional logical FK to a multi-device driver's device.</summary>
-    public string? DeviceId { get; set; }
+    // v3: equipment no longer binds a driver or device. It references existing raw tags via
+    // UnsTagReference and hosts VirtualTags + ScriptedAlarms. The old DriverInstanceId / DeviceId
+    // binding columns are retired.
 
     /// <summary>Logical FK to <see cref="UnsLine.UnsLineId"/>.</summary>
     public required string UnsLineId { get; set; }
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/EquipmentImportBatch.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/EquipmentImportBatch.cs
deleted file mode 100644
index 35c58cf2..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/EquipmentImportBatch.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-
-/// <summary>
-///     Staged equipment-import batch per Phase 6.4 Stream B.2. Rows land in the child
-///     <see cref="EquipmentImportRow"/> table under a batch header; operator reviews + either
-///     drops (via <c>DropImportBatch</c>) or finalises (via <c>FinaliseImportBatch</c>) in one
-///     bounded transaction. The live <c>Equipment</c> table never sees partial state.
-/// </summary>
-/// <remarks>
-///     <para>User-scoped visibility: the preview modal only shows batches where
-///     <see cref="CreatedBy"/> equals the current operator. Prevents accidental
-///     cross-operator finalise during concurrent imports. An admin finalise / drop surface
-///     can override this — tracked alongside the UI follow-up.</para>
-///
-///     <para><see cref="FinalisedAtUtc"/> stamps the moment the batch promoted from staging
-///     into <c>Equipment</c>. Null = still in staging; non-null = archived / finalised.</para>
-/// </remarks>
-public sealed class EquipmentImportBatch
-{
-    /// <summary>Gets or sets the unique identifier for this batch.</summary>
-    public Guid Id { get; set; }
-
-    /// <summary>Gets or sets the cluster identifier.</summary>
-    public required string ClusterId { get; set; }
-
-    /// <summary>Gets or sets the user name who created this batch.</summary>
-    public required string CreatedBy { get; set; }
-
-    /// <summary>Gets or sets the UTC timestamp when this batch was created.</summary>
-    public DateTime CreatedAtUtc { get; set; }
-
-    /// <summary>Gets or sets the total number of rows staged in this batch.</summary>
-    public int RowsStaged { get; set; }
-
-    /// <summary>Gets or sets the number of rows accepted in this batch.</summary>
-    public int RowsAccepted { get; set; }
-
-    /// <summary>Gets or sets the number of rows rejected in this batch.</summary>
-    public int RowsRejected { get; set; }
-
-    /// <summary>Gets or sets the UTC timestamp when this batch was finalised, or null if still in staging.</summary>
-    public DateTime? FinalisedAtUtc { get; set; }
-
-    /// <summary>Gets or sets the collection of staged rows in this batch.</summary>
-    public ICollection<EquipmentImportRow> Rows { get; set; } = [];
-}
-
-/// <summary>
-///     One staged row under an <see cref="EquipmentImportBatch"/>. Mirrors the required
-///     + optional columns from the CSV importer's output + an
-///     <see cref="IsAccepted"/> flag + a <see cref="RejectReason"/> string the preview modal
-///     renders.
-/// </summary>
-public sealed class EquipmentImportRow
-{
-    /// <summary>Gets or sets the unique identifier for this row.</summary>
-    public Guid Id { get; set; }
-
-    /// <summary>Gets or sets the parent batch identifier.</summary>
-    public Guid BatchId { get; set; }
-
-    /// <summary>Gets or sets the line number in the source file.</summary>
-    public int LineNumberInFile { get; set; }
-
-    /// <summary>Gets or sets a value indicating whether this row was accepted.</summary>
-    public bool IsAccepted { get; set; }
-
-    /// <summary>Gets or sets the reason this row was rejected, if applicable.</summary>
-    public string? RejectReason { get; set; }
-
-    /// <summary>Gets or sets the Z tag identifier.</summary>
-    public required string ZTag { get; set; }
-
-    /// <summary>Gets or sets the machine code.</summary>
-    public required string MachineCode { get; set; }
-
-    /// <summary>Gets or sets the SAP identifier.</summary>
-    public required string SAPID { get; set; }
-
-    /// <summary>Gets or sets the equipment identifier.</summary>
-    public required string EquipmentId { get; set; }
-
-    /// <summary>Gets or sets the equipment UUID.</summary>
-    public required string EquipmentUuid { get; set; }
-
-    /// <summary>Gets or sets the equipment name.</summary>
-    public required string Name { get; set; }
-
-    /// <summary>Gets or sets the UNS area name.</summary>
-    public required string UnsAreaName { get; set; }
-
-    /// <summary>Gets or sets the UNS line name.</summary>
-    public required string UnsLineName { get; set; }
-
-    /// <summary>Gets or sets the manufacturer name.</summary>
-    public string? Manufacturer { get; set; }
-
-    /// <summary>Gets or sets the equipment model.</summary>
-    public string? Model { get; set; }
-
-    /// <summary>Gets or sets the serial number.</summary>
-    public string? SerialNumber { get; set; }
-
-    /// <summary>Gets or sets the hardware revision.</summary>
-    public string? HardwareRevision { get; set; }
-
-    /// <summary>Gets or sets the software revision.</summary>
-    public string? SoftwareRevision { get; set; }
-
-    /// <summary>Gets or sets the year of construction.</summary>
-    public string? YearOfConstruction { get; set; }
-
-    /// <summary>Gets or sets the asset location.</summary>
-    public string? AssetLocation { get; set; }
-
-    /// <summary>Gets or sets the manufacturer URI.</summary>
-    public string? ManufacturerUri { get; set; }
-
-    /// <summary>Gets or sets the device manual URI.</summary>
-    public string? DeviceManualUri { get; set; }
-
-    /// <summary>Gets or sets the parent batch.</summary>
-    public EquipmentImportBatch? Batch { get; set; }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Namespace.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Namespace.cs
deleted file mode 100644
index f7324fb2..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Namespace.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-
-/// <summary>
-///     OPC UA namespace served by a cluster. Generation-versioned —
-///     namespaces are content (affect what consumers see at the endpoint), not topology.
-/// </summary>
-public sealed class Namespace
-{
-    /// <summary>Gets or sets the row identifier for this namespace.</summary>
-    public Guid NamespaceRowId { get; set; }
-
-    /// <summary>Stable logical ID, e.g. "LINE3-OPCUA-equipment". Globally unique in v2.</summary>
-    public required string NamespaceId { get; set; }
-
-    /// <summary>Gets or sets the cluster identifier.</summary>
-    public required string ClusterId { get; set; }
-
-    /// <summary>Gets or sets the namespace kind.</summary>
-    public required NamespaceKind Kind { get; set; }
-
-    /// <summary>E.g. "urn:zb:warsaw-west:equipment". Unique fleet-wide per generation.</summary>
-    public required string NamespaceUri { get; set; }
-
-    /// <summary>Gets or sets a value indicating whether the namespace is enabled.</summary>
-    public bool Enabled { get; set; } = true;
-
-    /// <summary>Gets or sets optional notes about the namespace.</summary>
-    public string? Notes { get; set; }
-
-    /// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
-    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
-
-    /// <summary>Gets or sets the associated server cluster.</summary>
-    public ServerCluster? Cluster { get; set; }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/RawFolder.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/RawFolder.cs
new file mode 100644
index 00000000..c3947912
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/RawFolder.cs
@@ -0,0 +1,30 @@
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
+
+/// <summary>
+///     v3 Raw-tree driver-organizing folder. Nestable (Kepware-style) directly under a cluster or
+///     under another <see cref="RawFolder"/>. Folders group <see cref="DriverInstance"/> rows; they
+///     contribute the leading segments of a driver's <c>RawPath</c>.
+/// </summary>
+public sealed class RawFolder
+{
+    /// <summary>Gets or sets the database row identifier (PK).</summary>
+    public Guid RawFolderRowId { get; set; }
+
+    /// <summary>Stable logical ID, unique fleet-wide.</summary>
+    public required string RawFolderId { get; set; }
+
+    /// <summary>Logical FK to <see cref="ServerCluster.ClusterId"/> — the folder is cluster-rooted.</summary>
+    public required string ClusterId { get; set; }
+
+    /// <summary>Logical FK to a parent <see cref="RawFolder.RawFolderId"/>; <see langword="null"/> = root under the cluster.</summary>
+    public string? ParentRawFolderId { get; set; }
+
+    /// <summary>Sibling-unique folder name. A RawPath segment: no <c>/</c>, no lead/trail whitespace.</summary>
+    public required string Name { get; set; }
+
+    /// <summary>Sibling display ordering.</summary>
+    public int SortOrder { get; set; }
+
+    /// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
+    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ServerCluster.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ServerCluster.cs
index 192964f4..ffcc94b2 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ServerCluster.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ServerCluster.cs
@@ -47,6 +47,6 @@ public sealed class ServerCluster
     // Navigation
     /// <summary>Gets or sets the collection of cluster nodes.</summary>
     public ICollection<ClusterNode> Nodes { get; set; } = [];
-    /// <summary>Gets or sets the collection of namespaces in the cluster.</summary>
-    public ICollection<Namespace> Namespaces { get; set; } = [];
+    /// <summary>Gets or sets the collection of root-level Raw-tree folders in the cluster.</summary>
+    public ICollection<RawFolder> RawFolders { get; set; } = [];
 }
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Tag.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Tag.cs
index 32fefab5..0bc1e25f 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Tag.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/Tag.cs
@@ -3,46 +3,34 @@ using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 
 /// <summary>
-///     One canonical tag (signal) in a cluster's generation. <see cref="EquipmentId"/> set ⟺ the
-///     tag participates in the Equipment tree. A <c>GalaxyMxGateway</c>-bound equipment tag is an
-///     ordinary equipment tag (GalaxyMxGateway is a standard Equipment-kind driver) that carries its
-///     Galaxy attribute reference in <c>TagConfig.FullName</c> — there is no separate alias concept.
+///     v3 raw-only tag (signal). A tag is authored ONCE, under a <see cref="Device"/> in the Raw
+///     tree; its identity is its <c>RawPath</c>
+///     (<c>&lt;Folder/…&gt;/&lt;Driver&gt;/&lt;Device&gt;/&lt;TagGroup/…&gt;/&lt;Name&gt;</c>). UNS
+///     surfaces it by reference (<see cref="UnsTagReference"/>), never by re-authoring. The tag's
+///     driver-specific address lives inside <see cref="TagConfig"/> as an ordinary field (what the
+///     driver dials), not as system identity.
 /// </summary>
 public sealed class Tag
 {
-    /// <summary>
-    /// Gets or sets the unique database row identifier for the tag.
-    /// </summary>
+    /// <summary>Gets or sets the unique database row identifier for the tag (PK).</summary>
     public Guid TagRowId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the tag identifier.
-    /// </summary>
+    /// <summary>Gets or sets the stable logical tag identifier (unique fleet-wide).</summary>
     public required string TagId { get; set; }
 
-    /// <summary>
-    /// Gets or sets the driver instance identifier for this tag.
-    /// </summary>
-    public required string DriverInstanceId { get; set; }
+    /// <summary>v3: required logical FK to <see cref="Device.DeviceId"/>. Every tag lives under a device.</summary>
+    public required string DeviceId { get; set; }
 
     /// <summary>
-    /// Gets or sets the device identifier.
+    ///     Optional logical FK to a containing <see cref="TagGroup.TagGroupId"/>;
+    ///     <see langword="null"/> = the tag sits directly under its device. Contributes the middle
+    ///     segments of the tag's <c>RawPath</c>.
     /// </summary>
-    public string? DeviceId { get; set; }
+    public string? TagGroupId { get; set; }
 
-    /// <summary>
-    ///     Set when the tag belongs to an Equipment; NULL for FolderPath-scoped (namespace-root) tags.
-    /// </summary>
-    public string? EquipmentId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the tag name.
-    /// </summary>
+    /// <summary>Gets or sets the tag name. A RawPath segment: no <c>/</c>, no lead/trail whitespace.</summary>
     public required string Name { get; set; }
 
-    /// <summary>Only used when <see cref="EquipmentId"/> is NULL (FolderPath-scoped namespace tag).</summary>
-    public string? FolderPath { get; set; }
-
     /// <summary>OPC UA built-in type name (Boolean / Int32 / Float / etc.).</summary>
     public required string DataType { get; set; }
 
@@ -51,7 +39,7 @@ public sealed class Tag
     /// </summary>
     public required TagAccessLevel AccessLevel { get; set; }
 
-    /// <summary>Opt-in for write retry eligibility.</summary>
+    /// <summary>Opt-in for write retry eligibility (R2 resilience contract — retained in v3).</summary>
     public bool WriteIdempotent { get; set; }
 
     /// <summary>
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/TagGroup.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/TagGroup.cs
new file mode 100644
index 00000000..cd0a32b4
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/TagGroup.cs
@@ -0,0 +1,30 @@
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
+
+/// <summary>
+///     v3 Raw-tree tag-organizing group. Nestable (Kepware-style) directly under a
+///     <see cref="Device"/> or under another <see cref="TagGroup"/>. Groups contribute the middle
+///     segments of a tag's <c>RawPath</c> (between the device and the tag name).
+/// </summary>
+public sealed class TagGroup
+{
+    /// <summary>Gets or sets the database row identifier (PK).</summary>
+    public Guid TagGroupRowId { get; set; }
+
+    /// <summary>Stable logical ID, unique fleet-wide.</summary>
+    public required string TagGroupId { get; set; }
+
+    /// <summary>Logical FK to <see cref="Device.DeviceId"/> — the group lives under a device.</summary>
+    public required string DeviceId { get; set; }
+
+    /// <summary>Logical FK to a parent <see cref="TagGroup.TagGroupId"/>; <see langword="null"/> = root under the device.</summary>
+    public string? ParentTagGroupId { get; set; }
+
+    /// <summary>Sibling-unique group name. A RawPath segment: no <c>/</c>, no lead/trail whitespace.</summary>
+    public required string Name { get; set; }
+
+    /// <summary>Sibling display ordering.</summary>
+    public int SortOrder { get; set; }
+
+    /// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
+    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/UnsTagReference.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/UnsTagReference.cs
new file mode 100644
index 00000000..1b8e4fab
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/UnsTagReference.cs
@@ -0,0 +1,35 @@
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
+
+/// <summary>
+///     v3 UNS projection row: a reference from an <see cref="Equipment"/> to an existing raw
+///     <see cref="Tag"/>. UNS authoring is reference-only — equipment no longer authors
+///     <c>TagConfig</c> or binds a driver; it points at raw tags (optionally under a display-name
+///     override). The backing raw tag is the single value source; the UNS node fans out from it.
+/// </summary>
+public sealed class UnsTagReference
+{
+    /// <summary>Gets or sets the database row identifier (PK).</summary>
+    public Guid UnsTagReferenceRowId { get; set; }
+
+    /// <summary>Stable logical ID, unique fleet-wide.</summary>
+    public required string UnsTagReferenceId { get; set; }
+
+    /// <summary>Logical FK to <see cref="Equipment.EquipmentId"/> — the referencing equipment.</summary>
+    public required string EquipmentId { get; set; }
+
+    /// <summary>Logical FK to <see cref="Tag.TagId"/> — the backing raw tag (same cluster as the equipment).</summary>
+    public required string TagId { get; set; }
+
+    /// <summary>
+    ///     Optional UNS display-name override; <see langword="null"/> = use the raw tag's <c>Name</c>.
+    ///     The effective name must be unique within the equipment across references, VirtualTags, and
+    ///     ScriptedAlarms (enforced at authoring and at the deploy gate).
+    /// </summary>
+    public string? DisplayNameOverride { get; set; }
+
+    /// <summary>Sibling display ordering within the equipment's Tags list.</summary>
+    public int SortOrder { get; set; }
+
+    /// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
+    public byte[] RowVersion { get; set; } = Array.Empty<byte>();
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Enums/NamespaceKind.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Enums/NamespaceKind.cs
deleted file mode 100644
index 41969599..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Enums/NamespaceKind.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-
-/// <summary>OPC UA namespace kind. One of each kind per cluster per generation.</summary>
-public enum NamespaceKind
-{
-    /// <summary>
-    ///     Equipment namespace — raw signals from native-protocol drivers (Modbus, AB CIP, AB Legacy,
-    ///     S7, TwinCAT, FOCAS, and OpcUaClient when gatewaying raw equipment). UNS 5-level hierarchy
-    ///     applies.
-    /// </summary>
-    Equipment,
-
-    /// <summary>
-    ///     Reserved for future replay driver per handoff §"Digital Twin Touchpoints" — not populated
-    ///     in v2.0 but enum value reserved so the schema does not need to change when the replay
-    ///     driver lands.
-    /// </summary>
-    Simulated,
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.Designer.cs
deleted file mode 100644
index 02f69a71..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.Designer.cs
+++ /dev/null
@@ -1,1208 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260417212220_InitialSchema")]
-    partial class InitialSchema
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.cs
deleted file mode 100644
index 571d3b93..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417212220_InitialSchema.cs
+++ /dev/null
@@ -1,811 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialSchema : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "ConfigAuditLog",
-                columns: table => new
-                {
-                    AuditId = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Timestamp = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    Principal = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    EventType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: true),
-                    DetailsJson = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ConfigAuditLog", x => x.AuditId);
-                    table.CheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ExternalIdReservation",
-                columns: table => new
-                {
-                    ReservationId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    Kind = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    Value = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    EquipmentUuid = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    FirstPublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    FirstPublishedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    LastPublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    ReleasedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    ReleasedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    ReleaseReason = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ExternalIdReservation", x => x.ReservationId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ServerCluster",
-                columns: table => new
-                {
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    Enterprise = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Site = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    NodeCount = table.Column<byte>(type: "tinyint", nullable: false),
-                    RedundancyMode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    ModifiedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    ModifiedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ServerCluster", x => x.ClusterId);
-                    table.CheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ClusterNode",
-                columns: table => new
-                {
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    RedundancyRole = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    Host = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: false),
-                    OpcUaPort = table.Column<int>(type: "int", nullable: false),
-                    DashboardPort = table.Column<int>(type: "int", nullable: false),
-                    ApplicationUri = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                    ServiceLevelBase = table.Column<byte>(type: "tinyint", nullable: false),
-                    DriverConfigOverridesJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    LastSeenAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ClusterNode", x => x.NodeId);
-                    table.ForeignKey(
-                        name: "FK_ClusterNode_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ConfigGeneration",
-                columns: table => new
-                {
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Status = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    ParentGenerationId = table.Column<long>(type: "bigint", nullable: true),
-                    PublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    PublishedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    Notes = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ConfigGeneration", x => x.GenerationId);
-                    table.ForeignKey(
-                        name: "FK_ConfigGeneration_ConfigGeneration_ParentGenerationId",
-                        column: x => x.ParentGenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_ConfigGeneration_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ClusterNodeCredential",
-                columns: table => new
-                {
-                    CredentialId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Kind = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Value = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    RotatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ClusterNodeCredential", x => x.CredentialId);
-                    table.ForeignKey(
-                        name: "FK_ClusterNodeCredential_ClusterNode_NodeId",
-                        column: x => x.NodeId,
-                        principalTable: "ClusterNode",
-                        principalColumn: "NodeId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ClusterNodeGenerationState",
-                columns: table => new
-                {
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    CurrentGenerationId = table.Column<long>(type: "bigint", nullable: true),
-                    LastAppliedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    LastAppliedStatus = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
-                    LastAppliedError = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
-                    LastSeenAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ClusterNodeGenerationState", x => x.NodeId);
-                    table.ForeignKey(
-                        name: "FK_ClusterNodeGenerationState_ClusterNode_NodeId",
-                        column: x => x.NodeId,
-                        principalTable: "ClusterNode",
-                        principalColumn: "NodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_ClusterNodeGenerationState_ConfigGeneration_CurrentGenerationId",
-                        column: x => x.CurrentGenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Device",
-                columns: table => new
-                {
-                    DeviceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    DeviceConfig = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Device", x => x.DeviceRowId);
-                    table.CheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                    table.ForeignKey(
-                        name: "FK_Device_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "DriverInstance",
-                columns: table => new
-                {
-                    DriverInstanceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    NamespaceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    DriverType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    DriverConfig = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DriverInstance", x => x.DriverInstanceRowId);
-                    table.CheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                    table.ForeignKey(
-                        name: "FK_DriverInstance_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_DriverInstance_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Equipment",
-                columns: table => new
-                {
-                    EquipmentRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    EquipmentUuid = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    UnsLineId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    MachineCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    ZTag = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    SAPID = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    Manufacturer = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    Model = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    SerialNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    HardwareRevision = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true),
-                    SoftwareRevision = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true),
-                    YearOfConstruction = table.Column<short>(type: "smallint", nullable: true),
-                    AssetLocation = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                    ManufacturerUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    DeviceManualUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    EquipmentClassRef = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Equipment", x => x.EquipmentRowId);
-                    table.ForeignKey(
-                        name: "FK_Equipment_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Namespace",
-                columns: table => new
-                {
-                    NamespaceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    NamespaceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Kind = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    NamespaceUri = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Namespace", x => x.NamespaceRowId);
-                    table.ForeignKey(
-                        name: "FK_Namespace_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_Namespace_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "NodeAcl",
-                columns: table => new
-                {
-                    NodeAclRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    NodeAclId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    LdapGroup = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                    ScopeKind = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    ScopeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    PermissionFlags = table.Column<int>(type: "int", nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_NodeAcl", x => x.NodeAclRowId);
-                    table.ForeignKey(
-                        name: "FK_NodeAcl_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "PollGroup",
-                columns: table => new
-                {
-                    PollGroupRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    PollGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    IntervalMs = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_PollGroup", x => x.PollGroupRowId);
-                    table.CheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                    table.ForeignKey(
-                        name: "FK_PollGroup_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Tag",
-                columns: table => new
-                {
-                    TagRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    TagId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    FolderPath = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    DataType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    AccessLevel = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    WriteIdempotent = table.Column<bool>(type: "bit", nullable: false),
-                    PollGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    TagConfig = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Tag", x => x.TagRowId);
-                    table.CheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                    table.ForeignKey(
-                        name: "FK_Tag_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UnsArea",
-                columns: table => new
-                {
-                    UnsAreaRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    UnsAreaId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UnsArea", x => x.UnsAreaRowId);
-                    table.ForeignKey(
-                        name: "FK_UnsArea_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_UnsArea_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "UnsLine",
-                columns: table => new
-                {
-                    UnsLineRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    UnsLineId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    UnsAreaId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_UnsLine", x => x.UnsLineRowId);
-                    table.ForeignKey(
-                        name: "FK_UnsLine_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ClusterNode_ApplicationUri",
-                table: "ClusterNode",
-                column: "ApplicationUri",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ClusterNode_Primary_Per_Cluster",
-                table: "ClusterNode",
-                column: "ClusterId",
-                unique: true,
-                filter: "[RedundancyRole] = 'Primary'");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ClusterNodeCredential_NodeId",
-                table: "ClusterNodeCredential",
-                columns: new[] { "NodeId", "Enabled" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ClusterNodeCredential_Value",
-                table: "ClusterNodeCredential",
-                columns: new[] { "Kind", "Value" },
-                unique: true,
-                filter: "[Enabled] = 1");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ClusterNodeGenerationState_Generation",
-                table: "ClusterNodeGenerationState",
-                column: "CurrentGenerationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigAuditLog_Cluster_Time",
-                table: "ConfigAuditLog",
-                columns: new[] { "ClusterId", "Timestamp" },
-                descending: new[] { false, true });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigAuditLog_Generation",
-                table: "ConfigAuditLog",
-                column: "GenerationId",
-                filter: "[GenerationId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigGeneration_Cluster_Published",
-                table: "ConfigGeneration",
-                columns: new[] { "ClusterId", "Status", "GenerationId" },
-                descending: new[] { false, false, true })
-                .Annotation("SqlServer:Include", new[] { "PublishedAt" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigGeneration_ParentGenerationId",
-                table: "ConfigGeneration",
-                column: "ParentGenerationId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ConfigGeneration_Draft_Per_Cluster",
-                table: "ConfigGeneration",
-                column: "ClusterId",
-                unique: true,
-                filter: "[Status] = 'Draft'");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Device_Generation_Driver",
-                table: "Device",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Device_Generation_LogicalId",
-                table: "Device",
-                columns: new[] { "GenerationId", "DeviceId" },
-                unique: true,
-                filter: "[DeviceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_ClusterId",
-                table: "DriverInstance",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_Generation_Cluster",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_Generation_Namespace",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "NamespaceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_DriverInstance_Generation_LogicalId",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "DriverInstanceId" },
-                unique: true,
-                filter: "[DriverInstanceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_Driver",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_Line",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "UnsLineId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_MachineCode",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "MachineCode" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_SAPID",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "SAPID" },
-                filter: "[SAPID] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_ZTag",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "ZTag" },
-                filter: "[ZTag] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_LinePath",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "UnsLineId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_LogicalId",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "EquipmentId" },
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_Uuid",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "EquipmentUuid" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ExternalIdReservation_Equipment",
-                table: "ExternalIdReservation",
-                column: "EquipmentUuid");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ExternalIdReservation_KindValue_Active",
-                table: "ExternalIdReservation",
-                columns: new[] { "Kind", "Value" },
-                unique: true,
-                filter: "[ReleasedAt] IS NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Namespace_ClusterId",
-                table: "Namespace",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Namespace_Generation_Cluster",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_Cluster_Kind",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "ClusterId", "Kind" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_LogicalId",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceId" },
-                unique: true,
-                filter: "[NamespaceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_LogicalId_Cluster",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceId", "ClusterId" },
-                unique: true,
-                filter: "[NamespaceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_NamespaceUri",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceUri" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Cluster",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Group",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "LdapGroup" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Scope",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ScopeKind", "ScopeId" },
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_Generation_GroupScope",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId" },
-                unique: true,
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_Generation_LogicalId",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "NodeAclId" },
-                unique: true,
-                filter: "[NodeAclId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_PollGroup_Generation_Driver",
-                table: "PollGroup",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_PollGroup_Generation_LogicalId",
-                table: "PollGroup",
-                columns: new[] { "GenerationId", "PollGroupId" },
-                unique: true,
-                filter: "[PollGroupId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ServerCluster_Site",
-                table: "ServerCluster",
-                column: "Site");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ServerCluster_Name",
-                table: "ServerCluster",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Generation_Driver_Device",
-                table: "Tag",
-                columns: new[] { "GenerationId", "DriverInstanceId", "DeviceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Generation_Equipment",
-                table: "Tag",
-                columns: new[] { "GenerationId", "EquipmentId" },
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_EquipmentPath",
-                table: "Tag",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_FolderPath",
-                table: "Tag",
-                columns: new[] { "GenerationId", "DriverInstanceId", "FolderPath", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_LogicalId",
-                table: "Tag",
-                columns: new[] { "GenerationId", "TagId" },
-                unique: true,
-                filter: "[TagId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsArea_ClusterId",
-                table: "UnsArea",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsArea_Generation_Cluster",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_Generation_ClusterName",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "ClusterId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_Generation_LogicalId",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "UnsAreaId" },
-                unique: true,
-                filter: "[UnsAreaId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsLine_Generation_Area",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsAreaId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_Generation_AreaName",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsAreaId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_Generation_LogicalId",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsLineId" },
-                unique: true,
-                filter: "[UnsLineId] IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ClusterNodeCredential");
-
-            migrationBuilder.DropTable(
-                name: "ClusterNodeGenerationState");
-
-            migrationBuilder.DropTable(
-                name: "ConfigAuditLog");
-
-            migrationBuilder.DropTable(
-                name: "Device");
-
-            migrationBuilder.DropTable(
-                name: "DriverInstance");
-
-            migrationBuilder.DropTable(
-                name: "Equipment");
-
-            migrationBuilder.DropTable(
-                name: "ExternalIdReservation");
-
-            migrationBuilder.DropTable(
-                name: "Namespace");
-
-            migrationBuilder.DropTable(
-                name: "NodeAcl");
-
-            migrationBuilder.DropTable(
-                name: "PollGroup");
-
-            migrationBuilder.DropTable(
-                name: "Tag");
-
-            migrationBuilder.DropTable(
-                name: "UnsArea");
-
-            migrationBuilder.DropTable(
-                name: "UnsLine");
-
-            migrationBuilder.DropTable(
-                name: "ClusterNode");
-
-            migrationBuilder.DropTable(
-                name: "ConfigGeneration");
-
-            migrationBuilder.DropTable(
-                name: "ServerCluster");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.Designer.cs
deleted file mode 100644
index 7943c0ec..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.Designer.cs
+++ /dev/null
@@ -1,1208 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260417215224_StoredProcedures")]
-    partial class StoredProcedures
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.cs
deleted file mode 100644
index 66c5bc90..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417215224_StoredProcedures.cs
+++ /dev/null
@@ -1,510 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations;
-
-/// <summary>
-///     Stored procedures per <c>config-db-schema.md §"Stored Procedures"</c>. All node + admin DB
-///     access funnels through these — direct table writes are revoked in the AuthorizationGrants
-///     migration that follows. CREATE OR ALTER style so procs version with the schema.
-/// </summary>
-public partial class StoredProcedures : Migration
-{
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.Sql(Procs.GetCurrentGenerationForCluster);
-        migrationBuilder.Sql(Procs.GetGenerationContent);
-        migrationBuilder.Sql(Procs.RegisterNodeGenerationApplied);
-        migrationBuilder.Sql(Procs.ValidateDraft);
-        migrationBuilder.Sql(Procs.PublishGeneration);
-        migrationBuilder.Sql(Procs.RollbackToGeneration);
-        migrationBuilder.Sql(Procs.ComputeGenerationDiff);
-        migrationBuilder.Sql(Procs.ReleaseExternalIdReservation);
-    }
-
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-        foreach (var name in new[]
-                 {
-                     "sp_ReleaseExternalIdReservation", "sp_ComputeGenerationDiff", "sp_RollbackToGeneration",
-                     "sp_PublishGeneration", "sp_ValidateDraft", "sp_RegisterNodeGenerationApplied",
-                     "sp_GetGenerationContent", "sp_GetCurrentGenerationForCluster",
-                 })
-        {
-            migrationBuilder.Sql($"IF OBJECT_ID(N'dbo.{name}', N'P') IS NOT NULL DROP PROCEDURE dbo.{name};");
-        }
-    }
-
-    private static class Procs
-    {
-        public const string GetCurrentGenerationForCluster = @"
-CREATE OR ALTER PROCEDURE dbo.sp_GetCurrentGenerationForCluster
-    @NodeId    nvarchar(64),
-    @ClusterId nvarchar(64)
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    DECLARE @Caller nvarchar(128) = SUSER_SNAME();
-
-    IF NOT EXISTS (
-        SELECT 1 FROM dbo.ClusterNodeCredential
-        WHERE NodeId = @NodeId AND Value = @Caller AND Enabled = 1)
-    BEGIN
-        RAISERROR('Unauthorized: caller %s is not bound to NodeId %s', 16, 1, @Caller, @NodeId);
-        RETURN;
-    END
-
-    IF NOT EXISTS (
-        SELECT 1 FROM dbo.ClusterNode
-        WHERE NodeId = @NodeId AND ClusterId = @ClusterId AND Enabled = 1)
-    BEGIN
-        RAISERROR('Forbidden: NodeId %s does not belong to ClusterId %s', 16, 1, @NodeId, @ClusterId);
-        RETURN;
-    END
-
-    SELECT TOP 1 GenerationId, ClusterId, Status, PublishedAt, PublishedBy, Notes
-    FROM   dbo.ConfigGeneration
-    WHERE  ClusterId = @ClusterId AND Status = 'Published'
-    ORDER BY GenerationId DESC;
-END
-";
-
-        public const string GetGenerationContent = @"
-CREATE OR ALTER PROCEDURE dbo.sp_GetGenerationContent
-    @NodeId       nvarchar(64),
-    @GenerationId bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    DECLARE @Caller    nvarchar(128) = SUSER_SNAME();
-    DECLARE @ClusterId nvarchar(64);
-
-    SELECT @ClusterId = ClusterId FROM dbo.ConfigGeneration WHERE GenerationId = @GenerationId;
-
-    IF @ClusterId IS NULL
-    BEGIN
-        RAISERROR('GenerationId %I64d not found', 16, 1, @GenerationId);
-        RETURN;
-    END
-
-    IF NOT EXISTS (
-        SELECT 1
-        FROM   dbo.ClusterNodeCredential c
-        JOIN   dbo.ClusterNode n ON n.NodeId = c.NodeId
-        WHERE  c.NodeId = @NodeId AND c.Value = @Caller AND c.Enabled = 1
-          AND  n.ClusterId = @ClusterId AND n.Enabled = 1)
-    BEGIN
-        RAISERROR('Forbidden: caller %s not bound to a node in ClusterId %s', 16, 1, @Caller, @ClusterId);
-        RETURN;
-    END
-
-    SELECT * FROM dbo.Namespace       WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.UnsArea         WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.UnsLine         WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.DriverInstance  WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.Device          WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.Equipment       WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.PollGroup       WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.Tag             WHERE GenerationId = @GenerationId;
-    SELECT * FROM dbo.NodeAcl         WHERE GenerationId = @GenerationId;
-END
-";
-
-        public const string RegisterNodeGenerationApplied = @"
-CREATE OR ALTER PROCEDURE dbo.sp_RegisterNodeGenerationApplied
-    @NodeId          nvarchar(64),
-    @GenerationId    bigint,
-    @Status          nvarchar(16),
-    @Error           nvarchar(max) = NULL
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    DECLARE @Caller nvarchar(128) = SUSER_SNAME();
-
-    IF NOT EXISTS (
-        SELECT 1 FROM dbo.ClusterNodeCredential
-        WHERE NodeId = @NodeId AND Value = @Caller AND Enabled = 1)
-    BEGIN
-        RAISERROR('Unauthorized: caller %s is not bound to NodeId %s', 16, 1, @Caller, @NodeId);
-        RETURN;
-    END
-
-    MERGE dbo.ClusterNodeGenerationState AS tgt
-    USING (SELECT @NodeId AS NodeId) AS src ON tgt.NodeId = src.NodeId
-    WHEN MATCHED THEN UPDATE SET
-        CurrentGenerationId = @GenerationId,
-        LastAppliedAt       = SYSUTCDATETIME(),
-        LastAppliedStatus   = @Status,
-        LastAppliedError    = @Error,
-        LastSeenAt          = SYSUTCDATETIME()
-    WHEN NOT MATCHED THEN INSERT
-        (NodeId, CurrentGenerationId, LastAppliedAt, LastAppliedStatus, LastAppliedError, LastSeenAt)
-        VALUES (@NodeId, @GenerationId, SYSUTCDATETIME(), @Status, @Error, SYSUTCDATETIME());
-
-    -- Build DetailsJson via STRING_ESCAPE so a @Status containing a double-quote/backslash cannot
-    -- produce malformed JSON (which would fail CK_ConfigAuditLog_DetailsJson_IsJson and abort the
-    -- transaction) or inject extra JSON structure into the audit record.
-    INSERT dbo.ConfigAuditLog (Principal, EventType, NodeId, GenerationId, DetailsJson)
-    VALUES (@Caller, 'NodeApplied', @NodeId, @GenerationId,
-            CONCAT('{""status"":""', STRING_ESCAPE(@Status, 'json'), '""}'));
-END
-";
-
-        public const string ValidateDraft = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ValidateDraft
-    @DraftGenerationId bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    DECLARE @ClusterId nvarchar(64);
-    DECLARE @Status    nvarchar(16);
-
-    SELECT @ClusterId = ClusterId, @Status = Status
-    FROM   dbo.ConfigGeneration WHERE GenerationId = @DraftGenerationId;
-
-    IF @ClusterId IS NULL
-    BEGIN
-        RAISERROR('GenerationId %I64d not found', 16, 1, @DraftGenerationId);
-        RETURN;
-    END
-
-    IF @Status <> 'Draft'
-    BEGIN
-        RAISERROR('GenerationId %I64d is not in Draft status (current=%s)', 16, 1, @DraftGenerationId, @Status);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1 FROM dbo.Tag t
-        LEFT JOIN dbo.DriverInstance d ON d.GenerationId = t.GenerationId AND d.DriverInstanceId = t.DriverInstanceId
-        WHERE t.GenerationId = @DraftGenerationId AND d.DriverInstanceId IS NULL)
-    BEGIN
-        RAISERROR('Draft has tags with unresolved DriverInstanceId', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1 FROM dbo.Tag t
-        LEFT JOIN dbo.Device dv ON dv.GenerationId = t.GenerationId AND dv.DeviceId = t.DeviceId
-        WHERE t.GenerationId = @DraftGenerationId AND t.DeviceId IS NOT NULL AND dv.DeviceId IS NULL)
-    BEGIN
-        RAISERROR('Draft has tags with unresolved DeviceId', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1 FROM dbo.Tag t
-        LEFT JOIN dbo.PollGroup pg ON pg.GenerationId = t.GenerationId AND pg.PollGroupId = t.PollGroupId
-        WHERE t.GenerationId = @DraftGenerationId AND t.PollGroupId IS NOT NULL AND pg.PollGroupId IS NULL)
-    BEGIN
-        RAISERROR('Draft has tags with unresolved PollGroupId', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1
-        FROM   dbo.DriverInstance di
-        JOIN   dbo.Namespace ns ON ns.GenerationId = di.GenerationId AND ns.NamespaceId = di.NamespaceId
-        WHERE  di.GenerationId = @DraftGenerationId
-          AND  ns.ClusterId <> di.ClusterId)
-    BEGIN
-        INSERT dbo.ConfigAuditLog (Principal, EventType, ClusterId, GenerationId)
-        VALUES (SUSER_SNAME(), 'CrossClusterNamespaceAttempt', @ClusterId, @DraftGenerationId);
-        RAISERROR('BadCrossClusterNamespaceBinding: namespace and driver must belong to the same cluster', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1
-        FROM   dbo.Equipment draft
-        JOIN   dbo.Equipment prior
-            ON prior.EquipmentId = draft.EquipmentId
-           AND prior.EquipmentUuid <> draft.EquipmentUuid
-           AND prior.GenerationId <> draft.GenerationId
-        JOIN   dbo.ConfigGeneration pg ON pg.GenerationId = prior.GenerationId
-        WHERE  draft.GenerationId = @DraftGenerationId
-          AND  pg.ClusterId = @ClusterId)
-    BEGIN
-        RAISERROR('EquipmentUuid immutability violated for an EquipmentId that existed in a prior generation', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1
-        FROM   dbo.Equipment draft
-        JOIN   dbo.ExternalIdReservation r
-            ON r.Kind = 'ZTag' AND r.Value = draft.ZTag AND r.ReleasedAt IS NULL
-           AND r.EquipmentUuid <> draft.EquipmentUuid
-        WHERE  draft.GenerationId = @DraftGenerationId AND draft.ZTag IS NOT NULL)
-    BEGIN
-        RAISERROR('BadDuplicateExternalIdentifier: a ZTag in the draft is reserved by a different EquipmentUuid', 16, 1);
-        RETURN;
-    END
-
-    IF EXISTS (
-        SELECT 1
-        FROM   dbo.Equipment draft
-        JOIN   dbo.ExternalIdReservation r
-            ON r.Kind = 'SAPID' AND r.Value = draft.SAPID AND r.ReleasedAt IS NULL
-           AND r.EquipmentUuid <> draft.EquipmentUuid
-        WHERE  draft.GenerationId = @DraftGenerationId AND draft.SAPID IS NOT NULL)
-    BEGIN
-        RAISERROR('BadDuplicateExternalIdentifier: a SAPID in the draft is reserved by a different EquipmentUuid', 16, 1);
-        RETURN;
-    END
-END
-";
-
-        public const string PublishGeneration = @"
-CREATE OR ALTER PROCEDURE dbo.sp_PublishGeneration
-    @ClusterId          nvarchar(64),
-    @DraftGenerationId  bigint,
-    @Notes              nvarchar(1024) = NULL
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-
-    -- Transaction-nesting awareness: if a caller (e.g. sp_RollbackToGeneration) already
-    -- holds a transaction, we use SAVE TRANSACTION so our failure path rolls back only to
-    -- the savepoint instead of issuing a bare ROLLBACK that wipes the caller's transaction
-    -- (which sets @@TRANCOUNT = 0 and causes error 3902 on the caller's subsequent COMMIT).
-    DECLARE @OwnsTxn  bit = 0;
-    DECLARE @SaveName nvarchar(32) = N'sp_PublishGeneration';
-
-    IF @@TRANCOUNT = 0
-    BEGIN
-        BEGIN TRANSACTION;
-        SET @OwnsTxn = 1;
-    END
-    ELSE
-    BEGIN
-        SAVE TRANSACTION sp_PublishGeneration;
-    END
-
-    DECLARE @Lock nvarchar(255) = N'OtOpcUa_Publish_' + @ClusterId;
-    DECLARE @LockResult int;
-    EXEC @LockResult = sp_getapplock @Resource = @Lock, @LockMode = 'Exclusive', @LockTimeout = 0;
-    IF @LockResult < 0
-    BEGIN
-        RAISERROR('PublishConflict: another publish is in progress for cluster %s', 16, 1, @ClusterId);
-        IF @OwnsTxn = 1 ROLLBACK;
-        ELSE ROLLBACK TRANSACTION sp_PublishGeneration;
-        RETURN;
-    END
-
-    -- sp_ValidateDraft signals every rejection with RAISERROR(..., 16, 1) — a severity-16 error is
-    -- NOT batch-aborting and SET XACT_ABORT ON does not abort the transaction for it, so without a
-    -- TRY/CATCH control would return here and the draft would publish despite failed validation.
-    -- Catch the validation error, roll back the publish transaction (only to our savepoint when a
-    -- caller owns the outer transaction), and re-raise so the caller sees the real validation failure.
-    BEGIN TRY
-        EXEC dbo.sp_ValidateDraft @DraftGenerationId = @DraftGenerationId;
-    END TRY
-    BEGIN CATCH
-        IF @OwnsTxn = 1 ROLLBACK;
-        ELSE ROLLBACK TRANSACTION sp_PublishGeneration;
-        THROW;
-    END CATCH
-
-    MERGE dbo.ExternalIdReservation AS tgt
-    USING (
-        SELECT 'ZTag' AS Kind, ZTag AS Value, EquipmentUuid
-        FROM   dbo.Equipment
-        WHERE  GenerationId = @DraftGenerationId AND ZTag IS NOT NULL
-        UNION ALL
-        SELECT 'SAPID', SAPID, EquipmentUuid
-        FROM   dbo.Equipment
-        WHERE  GenerationId = @DraftGenerationId AND SAPID IS NOT NULL
-    ) AS src
-        ON  tgt.Kind = src.Kind AND tgt.Value = src.Value AND tgt.EquipmentUuid = src.EquipmentUuid
-    WHEN MATCHED THEN UPDATE SET LastPublishedAt = SYSUTCDATETIME()
-    WHEN NOT MATCHED BY TARGET THEN
-        INSERT (Kind, Value, EquipmentUuid, ClusterId, FirstPublishedBy, LastPublishedAt)
-        VALUES (src.Kind, src.Value, src.EquipmentUuid, @ClusterId, SUSER_SNAME(), SYSUTCDATETIME());
-
-    UPDATE dbo.ConfigGeneration
-    SET    Status = 'Superseded'
-    WHERE  ClusterId = @ClusterId AND Status = 'Published';
-
-    UPDATE dbo.ConfigGeneration
-    SET    Status      = 'Published',
-           PublishedAt = SYSUTCDATETIME(),
-           PublishedBy = SUSER_SNAME(),
-           Notes       = ISNULL(@Notes, Notes)
-    WHERE  GenerationId = @DraftGenerationId AND ClusterId = @ClusterId AND Status = 'Draft';
-
-    IF @@ROWCOUNT = 0
-    BEGIN
-        RAISERROR('Draft %I64d for cluster %s not in Draft status (was it already published?)', 16, 1, @DraftGenerationId, @ClusterId);
-        IF @OwnsTxn = 1 ROLLBACK;
-        ELSE ROLLBACK TRANSACTION sp_PublishGeneration;
-        RETURN;
-    END
-
-    INSERT dbo.ConfigAuditLog (Principal, EventType, ClusterId, GenerationId)
-    VALUES (SUSER_SNAME(), 'Published', @ClusterId, @DraftGenerationId);
-
-    IF @OwnsTxn = 1 COMMIT;
-END
-";
-
-        public const string RollbackToGeneration = @"
-CREATE OR ALTER PROCEDURE dbo.sp_RollbackToGeneration
-    @ClusterId            nvarchar(64),
-    @TargetGenerationId   bigint,
-    @Notes                nvarchar(1024) = NULL
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-    BEGIN TRANSACTION;
-
-    IF NOT EXISTS (
-        SELECT 1 FROM dbo.ConfigGeneration
-        WHERE GenerationId = @TargetGenerationId AND ClusterId = @ClusterId
-          AND Status IN ('Published', 'Superseded'))
-    BEGIN
-        RAISERROR('Target generation %I64d not found or not rollback-eligible', 16, 1, @TargetGenerationId);
-        ROLLBACK; RETURN;
-    END
-
-    DECLARE @NewGenId bigint;
-    INSERT dbo.ConfigGeneration (ClusterId, Status, CreatedAt, CreatedBy, PublishedAt, PublishedBy, Notes)
-    VALUES (@ClusterId, 'Draft', SYSUTCDATETIME(), SUSER_SNAME(), NULL, NULL,
-            ISNULL(@Notes, CONCAT('Rollback clone of generation ', @TargetGenerationId)));
-    SET @NewGenId = SCOPE_IDENTITY();
-
-    INSERT dbo.Namespace      (GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled, Notes)
-        SELECT @NewGenId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled, Notes FROM dbo.Namespace WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.UnsArea        (GenerationId, UnsAreaId, ClusterId, Name, Notes)
-        SELECT @NewGenId, UnsAreaId, ClusterId, Name, Notes FROM dbo.UnsArea WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.UnsLine        (GenerationId, UnsLineId, UnsAreaId, Name, Notes)
-        SELECT @NewGenId, UnsLineId, UnsAreaId, Name, Notes FROM dbo.UnsLine WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.DriverInstance (GenerationId, DriverInstanceId, ClusterId, NamespaceId, Name, DriverType, Enabled, DriverConfig)
-        SELECT @NewGenId, DriverInstanceId, ClusterId, NamespaceId, Name, DriverType, Enabled, DriverConfig FROM dbo.DriverInstance WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.Device         (GenerationId, DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
-        SELECT @NewGenId, DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig FROM dbo.Device WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.Equipment      (GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, DeviceId, UnsLineId, Name, MachineCode, ZTag, SAPID, Manufacturer, Model, SerialNumber, HardwareRevision, SoftwareRevision, YearOfConstruction, AssetLocation, ManufacturerUri, DeviceManualUri, EquipmentClassRef, Enabled)
-        SELECT @NewGenId, EquipmentId, EquipmentUuid, DriverInstanceId, DeviceId, UnsLineId, Name, MachineCode, ZTag, SAPID, Manufacturer, Model, SerialNumber, HardwareRevision, SoftwareRevision, YearOfConstruction, AssetLocation, ManufacturerUri, DeviceManualUri, EquipmentClassRef, Enabled FROM dbo.Equipment WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.PollGroup      (GenerationId, PollGroupId, DriverInstanceId, Name, IntervalMs)
-        SELECT @NewGenId, PollGroupId, DriverInstanceId, Name, IntervalMs FROM dbo.PollGroup WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.Tag            (GenerationId, TagId, DriverInstanceId, DeviceId, EquipmentId, Name, FolderPath, DataType, AccessLevel, WriteIdempotent, PollGroupId, TagConfig)
-        SELECT @NewGenId, TagId, DriverInstanceId, DeviceId, EquipmentId, Name, FolderPath, DataType, AccessLevel, WriteIdempotent, PollGroupId, TagConfig FROM dbo.Tag WHERE GenerationId = @TargetGenerationId;
-    INSERT dbo.NodeAcl        (GenerationId, NodeAclId, ClusterId, LdapGroup, ScopeKind, ScopeId, PermissionFlags, Notes)
-        SELECT @NewGenId, NodeAclId, ClusterId, LdapGroup, ScopeKind, ScopeId, PermissionFlags, Notes FROM dbo.NodeAcl WHERE GenerationId = @TargetGenerationId;
-
-    EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @NewGenId, @Notes = @Notes;
-
-    -- @TargetGenerationId is a bigint, but build the JSON value via an explicit numeric CONVERT so
-    -- the emitted token is always a bare JSON number — never reliant on implicit string coercion.
-    INSERT dbo.ConfigAuditLog (Principal, EventType, ClusterId, GenerationId, DetailsJson)
-    VALUES (SUSER_SNAME(), 'RolledBack', @ClusterId, @NewGenId,
-            CONCAT('{""rolledBackTo"":', CONVERT(nvarchar(20), CONVERT(bigint, @TargetGenerationId)), '}'));
-
-    COMMIT;
-END
-";
-
-        public const string ComputeGenerationDiff = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
-    @FromGenerationId bigint,
-    @ToGenerationId   bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    CREATE TABLE #diff (TableName nvarchar(32), LogicalId nvarchar(64), ChangeKind nvarchar(16));
-
-    WITH f AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Namespace', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'DriverInstance', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Equipment', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Tag', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    SELECT TableName, LogicalId, ChangeKind FROM #diff;
-    DROP TABLE #diff;
-END
-";
-
-        public const string ReleaseExternalIdReservation = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ReleaseExternalIdReservation
-    @Kind           nvarchar(16),
-    @Value          nvarchar(64),
-    @ReleaseReason  nvarchar(512)
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-
-    IF @ReleaseReason IS NULL OR LEN(@ReleaseReason) = 0
-    BEGIN
-        RAISERROR('ReleaseReason is required', 16, 1);
-        RETURN;
-    END
-
-    UPDATE dbo.ExternalIdReservation
-    SET    ReleasedAt     = SYSUTCDATETIME(),
-           ReleasedBy     = SUSER_SNAME(),
-           ReleaseReason  = @ReleaseReason
-    WHERE  Kind = @Kind AND Value = @Value AND ReleasedAt IS NULL;
-
-    IF @@ROWCOUNT = 0
-    BEGIN
-        RAISERROR('No active reservation found for (%s, %s)', 16, 1, @Kind, @Value);
-        RETURN;
-    END
-
-    -- Escape both caller-supplied values via STRING_ESCAPE so quotes/backslashes cannot break the
-    -- JSON document or inject additional structure into the audit record.
-    INSERT dbo.ConfigAuditLog (Principal, EventType, DetailsJson)
-    VALUES (SUSER_SNAME(), 'ExternalIdReleased',
-            CONCAT('{""kind"":""', STRING_ESCAPE(@Kind, 'json'),
-                   '"",""value"":""', STRING_ESCAPE(@Value, 'json'), '""}'));
-END
-";
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.Designer.cs
deleted file mode 100644
index c5c24506..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.Designer.cs
+++ /dev/null
@@ -1,1208 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260417220857_AuthorizationGrants")]
-    partial class AuthorizationGrants
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.cs
deleted file mode 100644
index 3bb0d387..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260417220857_AuthorizationGrants.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations;
-
-/// <summary>
-///     Creates the two DB roles per <c>config-db-schema.md §"Authorization Model"</c> and grants
-///     EXECUTE on the appropriate stored procedures. Deliberately grants no direct table DML — all
-///     writes funnel through the procs, which authenticate via <c>SUSER_SNAME()</c>.
-///     Principals (SQL logins, gMSA users, cert-mapped users) are provisioned by the DBA outside
-///     this migration and then added to one of the two roles.
-/// </summary>
-public partial class AuthorizationGrants : Migration
-{
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.Sql(@"
-IF DATABASE_PRINCIPAL_ID('OtOpcUaNode') IS NULL
-    CREATE ROLE OtOpcUaNode;
-IF DATABASE_PRINCIPAL_ID('OtOpcUaAdmin') IS NULL
-    CREATE ROLE OtOpcUaAdmin;
-");
-
-        migrationBuilder.Sql(@"
-GRANT EXECUTE ON OBJECT::dbo.sp_GetCurrentGenerationForCluster TO OtOpcUaNode;
-GRANT EXECUTE ON OBJECT::dbo.sp_GetGenerationContent            TO OtOpcUaNode;
-GRANT EXECUTE ON OBJECT::dbo.sp_RegisterNodeGenerationApplied   TO OtOpcUaNode;
-
-GRANT EXECUTE ON OBJECT::dbo.sp_GetCurrentGenerationForCluster TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_GetGenerationContent            TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_ValidateDraft                   TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_PublishGeneration               TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_RollbackToGeneration            TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_ComputeGenerationDiff           TO OtOpcUaAdmin;
-GRANT EXECUTE ON OBJECT::dbo.sp_ReleaseExternalIdReservation    TO OtOpcUaAdmin;
-
-DENY UPDATE, DELETE, INSERT ON SCHEMA::dbo TO OtOpcUaNode;
-DENY UPDATE, DELETE, INSERT ON SCHEMA::dbo TO OtOpcUaAdmin;
-DENY SELECT ON SCHEMA::dbo TO OtOpcUaNode;
--- Admins may SELECT for reporting views in the future — grant views explicitly, not the schema.
-DENY SELECT ON SCHEMA::dbo TO OtOpcUaAdmin;
-");
-    }
-
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.Sql(@"
-IF DATABASE_PRINCIPAL_ID('OtOpcUaNode') IS NOT NULL
-    DROP ROLE OtOpcUaNode;
-IF DATABASE_PRINCIPAL_ID('OtOpcUaAdmin') IS NOT NULL
-    DROP ROLE OtOpcUaAdmin;
-");
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.Designer.cs
deleted file mode 100644
index e6111beb..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.Designer.cs
+++ /dev/null
@@ -1,1248 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260418193608_AddDriverHostStatus")]
-    partial class AddDriverHostStatus
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.cs
deleted file mode 100644
index ab14c5dd..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260418193608_AddDriverHostStatus.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddDriverHostStatus : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "DriverHostStatus",
-                columns: table => new
-                {
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    HostName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                    State = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    StateChangedUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
-                    LastSeenUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
-                    Detail = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DriverHostStatus", x => new { x.NodeId, x.DriverInstanceId, x.HostName });
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverHostStatus_LastSeen",
-                table: "DriverHostStatus",
-                column: "LastSeenUtc");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverHostStatus_Node",
-                table: "DriverHostStatus",
-                column: "NodeId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "DriverHostStatus");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.Designer.cs
deleted file mode 100644
index 76a80ede..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.Designer.cs
+++ /dev/null
@@ -1,1287 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260419124034_AddDriverInstanceResilienceStatus")]
-    partial class AddDriverInstanceResilienceStatus
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.cs
deleted file mode 100644
index 120866a5..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419124034_AddDriverInstanceResilienceStatus.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddDriverInstanceResilienceStatus : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "DriverInstanceResilienceStatus",
-                columns: table => new
-                {
-                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    HostName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
-                    LastCircuitBreakerOpenUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    ConsecutiveFailures = table.Column<int>(type: "int", nullable: false),
-                    CurrentBulkheadDepth = table.Column<int>(type: "int", nullable: false),
-                    LastRecycleUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    BaselineFootprintBytes = table.Column<long>(type: "bigint", nullable: false),
-                    CurrentFootprintBytes = table.Column<long>(type: "bigint", nullable: false),
-                    LastSampledUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DriverInstanceResilienceStatus", x => new { x.DriverInstanceId, x.HostName });
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverResilience_LastSampled",
-                table: "DriverInstanceResilienceStatus",
-                column: "LastSampledUtc");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "DriverInstanceResilienceStatus");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.Designer.cs
deleted file mode 100644
index a82dbdae..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.Designer.cs
+++ /dev/null
@@ -1,1342 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260419131444_AddLdapGroupRoleMapping")]
-    partial class AddLdapGroupRoleMapping
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.cs
deleted file mode 100644
index 58eaa7f0..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419131444_AddLdapGroupRoleMapping.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddLdapGroupRoleMapping : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "LdapGroupRoleMapping",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    LdapGroup = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
-                    Role = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    IsSystemWide = table.Column<bool>(type: "bit", nullable: false),
-                    CreatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_LdapGroupRoleMapping", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_LdapGroupRoleMapping_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_LdapGroupRoleMapping_ClusterId",
-                table: "LdapGroupRoleMapping",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_LdapGroupRoleMapping_Group",
-                table: "LdapGroupRoleMapping",
-                column: "LdapGroup");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_LdapGroupRoleMapping_Group_Cluster",
-                table: "LdapGroupRoleMapping",
-                columns: new[] { "LdapGroup", "ClusterId" },
-                unique: true,
-                filter: "[ClusterId] IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "LdapGroupRoleMapping");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.Designer.cs
deleted file mode 100644
index ea8ef07b..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.Designer.cs
+++ /dev/null
@@ -1,1347 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260419161932_AddDriverInstanceResilienceConfig")]
-    partial class AddDriverInstanceResilienceConfig
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.cs
deleted file mode 100644
index 568944fd..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419161932_AddDriverInstanceResilienceConfig.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddDriverInstanceResilienceConfig : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "ResilienceConfig",
-                table: "DriverInstance",
-                type: "nvarchar(max)",
-                nullable: true);
-
-            migrationBuilder.AddCheckConstraint(
-                name: "CK_DriverInstance_ResilienceConfig_IsJson",
-                table: "DriverInstance",
-                sql: "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropCheckConstraint(
-                name: "CK_DriverInstance_ResilienceConfig_IsJson",
-                table: "DriverInstance");
-
-            migrationBuilder.DropColumn(
-                name: "ResilienceConfig",
-                table: "DriverInstance");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.Designer.cs
deleted file mode 100644
index a985f7d1..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.Designer.cs
+++ /dev/null
@@ -1,1505 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260419185124_AddEquipmentImportBatch")]
-    partial class AddEquipmentImportBatch
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.cs
deleted file mode 100644
index 0e76922c..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260419185124_AddEquipmentImportBatch.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddEquipmentImportBatch : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "EquipmentImportBatch",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    CreatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
-                    RowsStaged = table.Column<int>(type: "int", nullable: false),
-                    RowsAccepted = table.Column<int>(type: "int", nullable: false),
-                    RowsRejected = table.Column<int>(type: "int", nullable: false),
-                    FinalisedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_EquipmentImportBatch", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "EquipmentImportRow",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    BatchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    LineNumberInFile = table.Column<int>(type: "int", nullable: false),
-                    IsAccepted = table.Column<bool>(type: "bit", nullable: false),
-                    RejectReason = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    ZTag = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    MachineCode = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    SAPID = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    EquipmentUuid = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    UnsAreaName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    UnsLineName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Manufacturer = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                    Model = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                    SerialNumber = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
-                    HardwareRevision = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    SoftwareRevision = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    YearOfConstruction = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: true),
-                    AssetLocation = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    ManufacturerUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
-                    DeviceManualUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_EquipmentImportRow", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_EquipmentImportRow_EquipmentImportBatch_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "EquipmentImportBatch",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EquipmentImportBatch_Creator_Finalised",
-                table: "EquipmentImportBatch",
-                columns: new[] { "CreatedBy", "FinalisedAtUtc" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_EquipmentImportRow_Batch",
-                table: "EquipmentImportRow",
-                column: "BatchId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "EquipmentImportRow");
-
-            migrationBuilder.DropTable(
-                name: "EquipmentImportBatch");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.Designer.cs
deleted file mode 100644
index e4ca8be6..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.Designer.cs
+++ /dev/null
@@ -1,1505 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260420000001_ExtendComputeGenerationDiffWithNodeAcl")]
-    partial class ExtendComputeGenerationDiffWithNodeAcl
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.cs
deleted file mode 100644
index ade0576c..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420000001_ExtendComputeGenerationDiffWithNodeAcl.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Extends <c>dbo.sp_ComputeGenerationDiff</c> to emit <c>NodeAcl</c> rows alongside the
-    ///     existing Namespace/DriverInstance/Equipment/Tag output — closes the final slice of
-    ///     task #196 (DiffViewer ACL section). Logical id for NodeAcl is a composite
-    ///     <c>LdapGroup|ScopeKind|ScopeId</c> triple so a Change row surfaces whether the grant
-    ///     shifted permissions, moved scope, or was added/removed outright.
-    /// </summary>
-    /// <inheritdoc />
-    public partial class ExtendComputeGenerationDiffWithNodeAcl : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ComputeGenerationDiffV2);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ComputeGenerationDiffV1);
-        }
-
-        private static class Procs
-        {
-            /// <summary>V2 — adds the NodeAcl section to the diff output.</summary>
-            public const string ComputeGenerationDiffV2 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
-    @FromGenerationId bigint,
-    @ToGenerationId   bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    CREATE TABLE #diff (TableName nvarchar(32), LogicalId nvarchar(128), ChangeKind nvarchar(16));
-
-    WITH f AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Namespace', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'DriverInstance', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Equipment', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Tag', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    -- NodeAcl section. Logical id is the (LdapGroup, ScopeKind, ScopeId) triple so the diff
-    -- distinguishes same row with new permissions (Modified via CHECKSUM on PermissionFlags + Notes)
-    -- from a scope move (which surfaces as Added + Removed of different logical ids).
-    WITH f AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @FromGenerationId),
-         t AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'NodeAcl', COALESCE(f.LogicalId, t.LogicalId),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    SELECT TableName, LogicalId, ChangeKind FROM #diff;
-    DROP TABLE #diff;
-END
-";
-
-            /// <summary>V1 — exact proc shipped in migration 20260417215224_StoredProcedures. Restored on Down().</summary>
-            public const string ComputeGenerationDiffV1 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
-    @FromGenerationId bigint,
-    @ToGenerationId   bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    CREATE TABLE #diff (TableName nvarchar(32), LogicalId nvarchar(64), ChangeKind nvarchar(16));
-
-    WITH f AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Namespace', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'DriverInstance', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Equipment', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Tag', CONVERT(nvarchar(64), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    SELECT TableName, LogicalId, ChangeKind FROM #diff;
-    DROP TABLE #diff;
-END
-";
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.Designer.cs
deleted file mode 100644
index 06319e69..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.Designer.cs
+++ /dev/null
@@ -1,1793 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260420231641_AddPhase7ScriptingTables")]
-    partial class AddPhase7ScriptingTables
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("GenerationId", "ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_Generation_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "SourceHash")
-                        .HasDatabaseName("IX_Script_Generation_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("GenerationId", "PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Generation_Script");
-
-                    b.HasIndex("GenerationId", "ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_Generation_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_Generation_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("GenerationId", "ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Generation_Script");
-
-                    b.HasIndex("GenerationId", "VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_Generation_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_Generation_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.cs
deleted file mode 100644
index 3730ecfe..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420231641_AddPhase7ScriptingTables.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddPhase7ScriptingTables : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Script",
-                columns: table => new
-                {
-                    ScriptRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    ScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    SourceCode = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    SourceHash = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Language = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Script", x => x.ScriptRowId);
-                    table.ForeignKey(
-                        name: "FK_Script_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ScriptedAlarm",
-                columns: table => new
-                {
-                    ScriptedAlarmRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    ScriptedAlarmId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    AlarmType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    Severity = table.Column<int>(type: "int", nullable: false),
-                    MessageTemplate = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: false),
-                    PredicateScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    HistorizeToAveva = table.Column<bool>(type: "bit", nullable: false),
-                    Retain = table.Column<bool>(type: "bit", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScriptedAlarm", x => x.ScriptedAlarmRowId);
-                    table.CheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-                    table.CheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                    table.ForeignKey(
-                        name: "FK_ScriptedAlarm_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ScriptedAlarmState",
-                columns: table => new
-                {
-                    ScriptedAlarmId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    EnabledState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    AckedState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    ConfirmedState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    ShelvingState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
-                    ShelvingExpiresUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    LastAckUser = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    LastAckComment = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
-                    LastAckUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    LastConfirmUser = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    LastConfirmComment = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
-                    LastConfirmUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    CommentsJson = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    UpdatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()")
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScriptedAlarmState", x => x.ScriptedAlarmId);
-                    table.CheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "VirtualTag",
-                columns: table => new
-                {
-                    VirtualTagRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false),
-                    VirtualTagId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
-                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    DataType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
-                    ScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    ChangeTriggered = table.Column<bool>(type: "bit", nullable: false),
-                    TimerIntervalMs = table.Column<int>(type: "int", nullable: true),
-                    Historize = table.Column<bool>(type: "bit", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_VirtualTag", x => x.VirtualTagRowId);
-                    table.CheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-                    table.CheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                    table.ForeignKey(
-                        name: "FK_VirtualTag_ConfigGeneration_GenerationId",
-                        column: x => x.GenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Script_Generation_SourceHash",
-                table: "Script",
-                columns: new[] { "GenerationId", "SourceHash" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Script_Generation_LogicalId",
-                table: "Script",
-                columns: new[] { "GenerationId", "ScriptId" },
-                unique: true,
-                filter: "[ScriptId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScriptedAlarm_Generation_Script",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "PredicateScriptId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_Generation_EquipmentPath",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_Generation_LogicalId",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "ScriptedAlarmId" },
-                unique: true,
-                filter: "[ScriptedAlarmId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_VirtualTag_Generation_Script",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "ScriptId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_Generation_EquipmentPath",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_Generation_LogicalId",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "VirtualTagId" },
-                unique: true,
-                filter: "[VirtualTagId] IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Script");
-
-            migrationBuilder.DropTable(
-                name: "ScriptedAlarm");
-
-            migrationBuilder.DropTable(
-                name: "ScriptedAlarmState");
-
-            migrationBuilder.DropTable(
-                name: "VirtualTag");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.Designer.cs
deleted file mode 100644
index 69d9562d..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.Designer.cs
+++ /dev/null
@@ -1,1793 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260420232000_ExtendComputeGenerationDiffWithPhase7")]
-    partial class ExtendComputeGenerationDiffWithPhase7
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("RedundancyRole")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_Primary_Per_Cluster")
-                        .HasFilter("[RedundancyRole] = 'Primary'");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("CurrentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastAppliedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastAppliedError")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("LastAppliedStatus")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("CurrentGenerationId")
-                        .HasDatabaseName("IX_ClusterNodeGenerationState_Generation");
-
-                    b.ToTable("ClusterNodeGenerationState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.Property<long>("GenerationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("GenerationId"));
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<long?>("ParentGenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("PublishedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("PublishedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("GenerationId");
-
-                    b.HasIndex("ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigGeneration_Draft_Per_Cluster")
-                        .HasFilter("[Status] = 'Draft'");
-
-                    b.HasIndex("ParentGenerationId");
-
-                    b.HasIndex("ClusterId", "Status", "GenerationId")
-                        .IsDescending(false, false, true)
-                        .HasDatabaseName("IX_ConfigGeneration_Cluster_Published");
-
-                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("ClusterId", "Status", "GenerationId"), new[] { "PublishedAt" });
-
-                    b.ToTable("ConfigGeneration", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("GenerationId", "DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_Generation_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Generation_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_Generation_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Generation_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_Uuid");
-
-                    b.HasIndex("GenerationId", "MachineCode")
-                        .HasDatabaseName("IX_Equipment_Generation_MachineCode");
-
-                    b.HasIndex("GenerationId", "SAPID")
-                        .HasDatabaseName("IX_Equipment_Generation_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Generation_Line");
-
-                    b.HasIndex("GenerationId", "ZTag")
-                        .HasDatabaseName("IX_Equipment_Generation_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Generation_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_Namespace_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_NamespaceUri");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_Cluster_Kind");
-
-                    b.HasIndex("GenerationId", "NamespaceId", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Generation_LogicalId_Cluster")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Group");
-
-                    b.HasIndex("GenerationId", "NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Generation_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_Generation_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Generation_Driver");
-
-                    b.HasIndex("GenerationId", "PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_Generation_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("GenerationId", "ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_Generation_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "SourceHash")
-                        .HasDatabaseName("IX_Script_Generation_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("GenerationId", "PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Generation_Script");
-
-                    b.HasIndex("GenerationId", "ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_Generation_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_Generation_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("GenerationId", "EquipmentId")
-                        .HasDatabaseName("IX_Tag_Generation_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Generation_Driver_Device");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_Generation_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("GenerationId", "ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Generation_Cluster");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_Generation_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("GenerationId", "UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Generation_Area");
-
-                    b.HasIndex("GenerationId", "UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_Generation_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("GenerationId", "ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Generation_Script");
-
-                    b.HasIndex("GenerationId", "VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_Generation_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId", "EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_Generation_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "CurrentGeneration")
-                        .WithMany()
-                        .HasForeignKey("CurrentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithOne("GenerationState")
-                        .HasForeignKey("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeGenerationState", "NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CurrentGeneration");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Generations")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentGenerationId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigGeneration", "Generation")
-                        .WithMany()
-                        .HasForeignKey("GenerationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Generation");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-
-                    b.Navigation("GenerationState");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Generations");
-
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.cs
deleted file mode 100644
index 2cd3cf7d..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260420232000_ExtendComputeGenerationDiffWithPhase7.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Phase 7 follow-up (task #241) — extends <c>dbo.sp_ComputeGenerationDiff</c> to emit
-    ///     Script / VirtualTag / ScriptedAlarm rows alongside the existing Namespace /
-    ///     DriverInstance / Equipment / Tag / NodeAcl output. Admin DiffViewer now shows
-    ///     Phase 7 changes between generations.
-    /// </summary>
-    /// <remarks>
-    ///     Logical ids: ScriptId, VirtualTagId, ScriptedAlarmId — stable across generations
-    ///     so a Script whose source changes surfaces as Modified (CHECKSUM picks up the
-    ///     SourceHash delta) while a renamed script surfaces as Modified on Name alone.
-    ///     ScriptedAlarmState is deliberately excluded — it's not generation-scoped, so
-    ///     diffing it between generations is meaningless.
-    /// </remarks>
-    /// <inheritdoc />
-    public partial class ExtendComputeGenerationDiffWithPhase7 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ComputeGenerationDiffV3);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ComputeGenerationDiffV2);
-        }
-
-        private static class Procs
-        {
-            /// <summary>V3 — adds Script / VirtualTag / ScriptedAlarm sections.</summary>
-            public const string ComputeGenerationDiffV3 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
-    @FromGenerationId bigint,
-    @ToGenerationId   bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    CREATE TABLE #diff (TableName nvarchar(32), LogicalId nvarchar(128), ChangeKind nvarchar(16));
-
-    WITH f AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Namespace', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'DriverInstance', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Equipment', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Tag', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @FromGenerationId),
-         t AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'NodeAcl', COALESCE(f.LogicalId, t.LogicalId),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    -- Phase 7 — Script section. CHECKSUM picks up source changes via SourceHash + rename
-    -- via Name; Language future-proofs for non-C# engines. Same Name + same Source =
-    -- Unchanged (identical hash).
-    WITH f AS (SELECT ScriptId AS LogicalId, CHECKSUM(Name, SourceHash, Language) AS Sig FROM dbo.Script WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT ScriptId AS LogicalId, CHECKSUM(Name, SourceHash, Language) AS Sig FROM dbo.Script WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Script', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    -- Phase 7 — VirtualTag section.
-    WITH f AS (SELECT VirtualTagId AS LogicalId, CHECKSUM(EquipmentId, Name, DataType, ScriptId, ChangeTriggered, TimerIntervalMs, Historize, Enabled) AS Sig FROM dbo.VirtualTag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT VirtualTagId AS LogicalId, CHECKSUM(EquipmentId, Name, DataType, ScriptId, ChangeTriggered, TimerIntervalMs, Historize, Enabled) AS Sig FROM dbo.VirtualTag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'VirtualTag', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    -- Phase 7 — ScriptedAlarm section. ScriptedAlarmState (operator ack trail) is
-    -- logical-id keyed outside the generation scope + intentionally excluded here —
-    -- diffing ack state between generations is semantically meaningless.
-    WITH f AS (SELECT ScriptedAlarmId AS LogicalId, CHECKSUM(EquipmentId, Name, AlarmType, Severity, MessageTemplate, PredicateScriptId, HistorizeToAveva, Retain, Enabled) AS Sig FROM dbo.ScriptedAlarm WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT ScriptedAlarmId AS LogicalId, CHECKSUM(EquipmentId, Name, AlarmType, Severity, MessageTemplate, PredicateScriptId, HistorizeToAveva, Retain, Enabled) AS Sig FROM dbo.ScriptedAlarm WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'ScriptedAlarm', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    SELECT TableName, LogicalId, ChangeKind FROM #diff;
-    DROP TABLE #diff;
-END
-";
-
-            /// <summary>V2 — restores the pre-Phase-7 proc on Down().</summary>
-            public const string ComputeGenerationDiffV2 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
-    @FromGenerationId bigint,
-    @ToGenerationId   bigint
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    CREATE TABLE #diff (TableName nvarchar(32), LogicalId nvarchar(128), ChangeKind nvarchar(16));
-
-    WITH f AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT NamespaceId AS LogicalId, CHECKSUM(NamespaceUri, Kind, Enabled, Notes) AS Sig FROM dbo.Namespace WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Namespace', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT DriverInstanceId AS LogicalId, CHECKSUM(ClusterId, NamespaceId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) AS Sig FROM dbo.DriverInstance WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'DriverInstance', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT EquipmentId AS LogicalId, CHECKSUM(EquipmentUuid, DriverInstanceId, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) AS Sig FROM dbo.Equipment WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Equipment', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @FromGenerationId),
-         t AS (SELECT TagId AS LogicalId, CHECKSUM(DriverInstanceId, DeviceId, EquipmentId, PollGroupId, FolderPath, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) AS Sig FROM dbo.Tag WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'Tag', CONVERT(nvarchar(128), COALESCE(f.LogicalId, t.LogicalId)),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    WITH f AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @FromGenerationId),
-         t AS (
-            SELECT  CONVERT(nvarchar(128), LdapGroup + '|' + CONVERT(nvarchar(16), ScopeKind) + '|' + ISNULL(ScopeId, '(cluster)')) AS LogicalId,
-                    CHECKSUM(ClusterId, PermissionFlags, Notes) AS Sig
-            FROM    dbo.NodeAcl WHERE GenerationId = @ToGenerationId)
-    INSERT #diff
-    SELECT 'NodeAcl', COALESCE(f.LogicalId, t.LogicalId),
-           CASE WHEN f.LogicalId IS NULL THEN 'Added'
-                WHEN t.LogicalId IS NULL THEN 'Removed'
-                WHEN f.Sig <> t.Sig       THEN 'Modified'
-                ELSE 'Unchanged' END
-    FROM   f FULL OUTER JOIN t ON f.LogicalId = t.LogicalId
-    WHERE  f.LogicalId IS NULL OR t.LogicalId IS NULL OR f.Sig <> t.Sig;
-
-    SELECT TableName, LogicalId, ChangeKind FROM #diff;
-    DROP TABLE #diff;
-END
-";
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260522000001_AddReleasedByToReleaseExternalIdReservation.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260522000001_AddReleasedByToReleaseExternalIdReservation.cs
deleted file mode 100644
index c337481b..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260522000001_AddReleasedByToReleaseExternalIdReservation.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Admin-008: adds <c>@ReleasedBy</c> parameter to
-    ///     <c>dbo.sp_ReleaseExternalIdReservation</c> so the operator principal name (the LDAP
-    ///     sign-in) is recorded in <c>ExternalIdReservation.ReleasedBy</c> and the
-    ///     <c>ConfigAuditLog.Principal</c> column.
-    ///
-    ///     Prior to this migration the proc used <c>SUSER_SNAME()</c> for both columns, which
-    ///     recorded the shared SQL service account rather than the Admin-UI operator who performed
-    ///     the release — making the audit trail useless for attribution.  The stored proc now
-    ///     accepts <c>@ReleasedBy nvarchar(128)</c> and uses it for both columns; validation
-    ///     rejects a null/empty value the same way <c>@ReleaseReason</c> is validated.
-    /// </summary>
-    /// <inheritdoc />
-    public partial class AddReleasedByToReleaseExternalIdReservation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ReleaseExternalIdReservationV2);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(Procs.ReleaseExternalIdReservationV1);
-        }
-
-        private static class Procs
-        {
-            /// <summary>V2 — accepts <c>@ReleasedBy</c> for proper operator attribution.</summary>
-            public const string ReleaseExternalIdReservationV2 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ReleaseExternalIdReservation
-    @Kind           nvarchar(16),
-    @Value          nvarchar(64),
-    @ReleaseReason  nvarchar(512),
-    @ReleasedBy     nvarchar(128)
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-
-    IF @ReleaseReason IS NULL OR LEN(@ReleaseReason) = 0
-    BEGIN
-        RAISERROR('ReleaseReason is required', 16, 1);
-        RETURN;
-    END
-
-    IF @ReleasedBy IS NULL OR LEN(@ReleasedBy) = 0
-    BEGIN
-        RAISERROR('ReleasedBy is required', 16, 1);
-        RETURN;
-    END
-
-    UPDATE dbo.ExternalIdReservation
-    SET    ReleasedAt     = SYSUTCDATETIME(),
-           ReleasedBy     = @ReleasedBy,
-           ReleaseReason  = @ReleaseReason
-    WHERE  Kind = @Kind AND Value = @Value AND ReleasedAt IS NULL;
-
-    IF @@ROWCOUNT = 0
-    BEGIN
-        RAISERROR('No active reservation found for (%s, %s)', 16, 1, @Kind, @Value);
-        RETURN;
-    END
-
-    -- Escape all caller-supplied values via STRING_ESCAPE so quotes/backslashes cannot break the
-    -- JSON document or inject additional structure into the audit record.
-    INSERT dbo.ConfigAuditLog (Principal, EventType, DetailsJson)
-    VALUES (@ReleasedBy, 'ExternalIdReleased',
-            CONCAT('{""kind"":""', STRING_ESCAPE(@Kind, 'json'),
-                   '"",""value"":""', STRING_ESCAPE(@Value, 'json'), '""}'));
-END
-";
-
-            /// <summary>V1 — original proc (uses SUSER_SNAME() for attribution). Restored on Down().</summary>
-            public const string ReleaseExternalIdReservationV1 = @"
-CREATE OR ALTER PROCEDURE dbo.sp_ReleaseExternalIdReservation
-    @Kind           nvarchar(16),
-    @Value          nvarchar(64),
-    @ReleaseReason  nvarchar(512)
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET XACT_ABORT ON;
-
-    IF @ReleaseReason IS NULL OR LEN(@ReleaseReason) = 0
-    BEGIN
-        RAISERROR('ReleaseReason is required', 16, 1);
-        RETURN;
-    END
-
-    UPDATE dbo.ExternalIdReservation
-    SET    ReleasedAt     = SYSUTCDATETIME(),
-           ReleasedBy     = SUSER_SNAME(),
-           ReleaseReason  = @ReleaseReason
-    WHERE  Kind = @Kind AND Value = @Value AND ReleasedAt IS NULL;
-
-    IF @@ROWCOUNT = 0
-    BEGIN
-        RAISERROR('No active reservation found for (%s, %s)', 16, 1, @Kind, @Value);
-        RETURN;
-    END
-
-    -- Escape both caller-supplied values via STRING_ESCAPE so quotes/backslashes cannot break the
-    -- JSON document or inject additional structure into the audit record.
-    INSERT dbo.ConfigAuditLog (Principal, EventType, DetailsJson)
-    VALUES (SUSER_SNAME(), 'ExternalIdReleased',
-            CONCAT('{""kind"":""', STRING_ESCAPE(@Kind, 'json'),
-                   '"",""value"":""', STRING_ESCAPE(@Value, 'json'), '""}'));
-END
-";
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.cs
deleted file mode 100644
index bbbbbd6d..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.cs
+++ /dev/null
@@ -1,1562 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class V2HostingAlignment : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Device_ConfigGeneration_GenerationId",
-                table: "Device");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_DriverInstance_ConfigGeneration_GenerationId",
-                table: "DriverInstance");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Equipment_ConfigGeneration_GenerationId",
-                table: "Equipment");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Namespace_ConfigGeneration_GenerationId",
-                table: "Namespace");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_NodeAcl_ConfigGeneration_GenerationId",
-                table: "NodeAcl");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_PollGroup_ConfigGeneration_GenerationId",
-                table: "PollGroup");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Script_ConfigGeneration_GenerationId",
-                table: "Script");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_ScriptedAlarm_ConfigGeneration_GenerationId",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Tag_ConfigGeneration_GenerationId",
-                table: "Tag");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_UnsArea_ConfigGeneration_GenerationId",
-                table: "UnsArea");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_UnsLine_ConfigGeneration_GenerationId",
-                table: "UnsLine");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_VirtualTag_ConfigGeneration_GenerationId",
-                table: "VirtualTag");
-
-            migrationBuilder.DropTable(
-                name: "ClusterNodeGenerationState");
-
-            migrationBuilder.DropTable(
-                name: "ConfigGeneration");
-
-            migrationBuilder.DropIndex(
-                name: "IX_VirtualTag_Generation_Script",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_VirtualTag_Generation_EquipmentPath",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_VirtualTag_Generation_LogicalId",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_UnsLine_Generation_Area",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsLine_Generation_AreaName",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsLine_Generation_LogicalId",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "IX_UnsArea_Generation_Cluster",
-                table: "UnsArea");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsArea_Generation_ClusterName",
-                table: "UnsArea");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsArea_Generation_LogicalId",
-                table: "UnsArea");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Tag_Generation_Driver_Device",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Tag_Generation_Equipment",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_Generation_EquipmentPath",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_Generation_FolderPath",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_Generation_LogicalId",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_ScriptedAlarm_Generation_Script",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "UX_ScriptedAlarm_Generation_EquipmentPath",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "UX_ScriptedAlarm_Generation_LogicalId",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Script_Generation_SourceHash",
-                table: "Script");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Script_Generation_LogicalId",
-                table: "Script");
-
-            migrationBuilder.DropIndex(
-                name: "IX_PollGroup_Generation_Driver",
-                table: "PollGroup");
-
-            migrationBuilder.DropIndex(
-                name: "UX_PollGroup_Generation_LogicalId",
-                table: "PollGroup");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Generation_Cluster",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Generation_Group",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Generation_Scope",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "UX_NodeAcl_Generation_GroupScope",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "UX_NodeAcl_Generation_LogicalId",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Namespace_Generation_Cluster",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_Generation_Cluster_Kind",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_Generation_LogicalId",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_Generation_LogicalId_Cluster",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_Generation_NamespaceUri",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Generation_Driver",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Generation_Line",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Generation_MachineCode",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Generation_SAPID",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Generation_ZTag",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_Generation_LinePath",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_Generation_LogicalId",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_Generation_Uuid",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_DriverInstance_Generation_Cluster",
-                table: "DriverInstance");
-
-            migrationBuilder.DropIndex(
-                name: "IX_DriverInstance_Generation_Namespace",
-                table: "DriverInstance");
-
-            migrationBuilder.DropIndex(
-                name: "UX_DriverInstance_Generation_LogicalId",
-                table: "DriverInstance");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Device_Generation_Driver",
-                table: "Device");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Device_Generation_LogicalId",
-                table: "Device");
-
-            migrationBuilder.DropIndex(
-                name: "UX_ClusterNode_Primary_Per_Cluster",
-                table: "ClusterNode");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "VirtualTag");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "UnsLine");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "UnsArea");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "Tag");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "Script");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "PollGroup");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "NodeAcl");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "Namespace");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "Equipment");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "DriverInstance");
-
-            migrationBuilder.DropColumn(
-                name: "GenerationId",
-                table: "Device");
-
-            migrationBuilder.DropColumn(
-                name: "RedundancyRole",
-                table: "ClusterNode");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_UnsArea_ClusterId",
-                table: "UnsArea",
-                newName: "IX_UnsArea_Cluster");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_Namespace_ClusterId",
-                table: "Namespace",
-                newName: "IX_Namespace_Cluster");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_DriverInstance_ClusterId",
-                table: "DriverInstance",
-                newName: "IX_DriverInstance_Cluster");
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "VirtualTag",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "UnsLine",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "UnsArea",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "Tag",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "ScriptedAlarm",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "Script",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "PollGroup",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "NodeAcl",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "Namespace",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "Equipment",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "DriverInstance",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.AddColumn<byte[]>(
-                name: "RowVersion",
-                table: "Device",
-                type: "rowversion",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: new byte[0]);
-
-            migrationBuilder.CreateTable(
-                name: "ConfigEdit",
-                columns: table => new
-                {
-                    EditId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    EntityId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    FieldsJson = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    ExecutionId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    EditedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    EditedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    SourceNode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ConfigEdit", x => x.EditId);
-                    table.CheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "DataProtectionKeys",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    FriendlyName = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Xml = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Deployment",
-                columns: table => new
-                {
-                    DeploymentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
-                    RevisionHash = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    CreatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    ArtifactBlob = table.Column<byte[]>(type: "varbinary(max)", nullable: false),
-                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false),
-                    FailureReason = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
-                    SealedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Deployment", x => x.DeploymentId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "NodeDeploymentState",
-                columns: table => new
-                {
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    DeploymentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    StartedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    AppliedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    FailureReason = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
-                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_NodeDeploymentState", x => new { x.NodeId, x.DeploymentId });
-                    table.ForeignKey(
-                        name: "FK_NodeDeploymentState_ClusterNode_NodeId",
-                        column: x => x.NodeId,
-                        principalTable: "ClusterNode",
-                        principalColumn: "NodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_NodeDeploymentState_Deployment_DeploymentId",
-                        column: x => x.DeploymentId,
-                        principalTable: "Deployment",
-                        principalColumn: "DeploymentId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_VirtualTag_Script",
-                table: "VirtualTag",
-                column: "ScriptId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_EquipmentPath",
-                table: "VirtualTag",
-                columns: new[] { "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_LogicalId",
-                table: "VirtualTag",
-                column: "VirtualTagId",
-                unique: true,
-                filter: "[VirtualTagId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsLine_Area",
-                table: "UnsLine",
-                column: "UnsAreaId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_AreaName",
-                table: "UnsLine",
-                columns: new[] { "UnsAreaId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_LogicalId",
-                table: "UnsLine",
-                column: "UnsLineId",
-                unique: true,
-                filter: "[UnsLineId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_ClusterName",
-                table: "UnsArea",
-                columns: new[] { "ClusterId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_LogicalId",
-                table: "UnsArea",
-                column: "UnsAreaId",
-                unique: true,
-                filter: "[UnsAreaId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Driver_Device",
-                table: "Tag",
-                columns: new[] { "DriverInstanceId", "DeviceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Equipment",
-                table: "Tag",
-                column: "EquipmentId",
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_EquipmentPath",
-                table: "Tag",
-                columns: new[] { "EquipmentId", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_FolderPath",
-                table: "Tag",
-                columns: new[] { "DriverInstanceId", "FolderPath", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_LogicalId",
-                table: "Tag",
-                column: "TagId",
-                unique: true,
-                filter: "[TagId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScriptedAlarm_Script",
-                table: "ScriptedAlarm",
-                column: "PredicateScriptId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_EquipmentPath",
-                table: "ScriptedAlarm",
-                columns: new[] { "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_LogicalId",
-                table: "ScriptedAlarm",
-                column: "ScriptedAlarmId",
-                unique: true,
-                filter: "[ScriptedAlarmId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Script_SourceHash",
-                table: "Script",
-                column: "SourceHash");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Script_LogicalId",
-                table: "Script",
-                column: "ScriptId",
-                unique: true,
-                filter: "[ScriptId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_PollGroup_Driver",
-                table: "PollGroup",
-                column: "DriverInstanceId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_PollGroup_LogicalId",
-                table: "PollGroup",
-                column: "PollGroupId",
-                unique: true,
-                filter: "[PollGroupId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Cluster",
-                table: "NodeAcl",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Group",
-                table: "NodeAcl",
-                column: "LdapGroup");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Scope",
-                table: "NodeAcl",
-                columns: new[] { "ScopeKind", "ScopeId" },
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_GroupScope",
-                table: "NodeAcl",
-                columns: new[] { "ClusterId", "LdapGroup", "ScopeKind", "ScopeId" },
-                unique: true,
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_LogicalId",
-                table: "NodeAcl",
-                column: "NodeAclId",
-                unique: true,
-                filter: "[NodeAclId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Cluster_Kind",
-                table: "Namespace",
-                columns: new[] { "ClusterId", "Kind" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_LogicalId",
-                table: "Namespace",
-                column: "NamespaceId",
-                unique: true,
-                filter: "[NamespaceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_NamespaceUri",
-                table: "Namespace",
-                column: "NamespaceUri",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Driver",
-                table: "Equipment",
-                column: "DriverInstanceId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Line",
-                table: "Equipment",
-                column: "UnsLineId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_MachineCode",
-                table: "Equipment",
-                column: "MachineCode");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_SAPID",
-                table: "Equipment",
-                column: "SAPID",
-                filter: "[SAPID] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_ZTag",
-                table: "Equipment",
-                column: "ZTag",
-                filter: "[ZTag] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_LinePath",
-                table: "Equipment",
-                columns: new[] { "UnsLineId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_LogicalId",
-                table: "Equipment",
-                column: "EquipmentId",
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Uuid",
-                table: "Equipment",
-                column: "EquipmentUuid",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_Namespace",
-                table: "DriverInstance",
-                column: "NamespaceId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_DriverInstance_LogicalId",
-                table: "DriverInstance",
-                column: "DriverInstanceId",
-                unique: true,
-                filter: "[DriverInstanceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Device_Driver",
-                table: "Device",
-                column: "DriverInstanceId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Device_LogicalId",
-                table: "Device",
-                column: "DeviceId",
-                unique: true,
-                filter: "[DeviceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ClusterNode_ClusterId",
-                table: "ClusterNode",
-                column: "ClusterId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigEdit_EditedAt",
-                table: "ConfigEdit",
-                column: "EditedAtUtc");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigEdit_Entity",
-                table: "ConfigEdit",
-                columns: new[] { "EntityType", "EntityId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigEdit_Execution",
-                table: "ConfigEdit",
-                column: "ExecutionId",
-                filter: "[ExecutionId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Deployment_CreatedAt",
-                table: "Deployment",
-                column: "CreatedAtUtc");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Deployment_Status",
-                table: "Deployment",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeDeploymentState_Deployment",
-                table: "NodeDeploymentState",
-                column: "DeploymentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeDeploymentState_Status",
-                table: "NodeDeploymentState",
-                column: "Status");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ConfigEdit");
-
-            migrationBuilder.DropTable(
-                name: "DataProtectionKeys");
-
-            migrationBuilder.DropTable(
-                name: "NodeDeploymentState");
-
-            migrationBuilder.DropTable(
-                name: "Deployment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_VirtualTag_Script",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_VirtualTag_EquipmentPath",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_VirtualTag_LogicalId",
-                table: "VirtualTag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_UnsLine_Area",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsLine_AreaName",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsLine_LogicalId",
-                table: "UnsLine");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsArea_ClusterName",
-                table: "UnsArea");
-
-            migrationBuilder.DropIndex(
-                name: "UX_UnsArea_LogicalId",
-                table: "UnsArea");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Tag_Driver_Device",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Tag_Equipment",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_EquipmentPath",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_FolderPath",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Tag_LogicalId",
-                table: "Tag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_ScriptedAlarm_Script",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "UX_ScriptedAlarm_EquipmentPath",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "UX_ScriptedAlarm_LogicalId",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Script_SourceHash",
-                table: "Script");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Script_LogicalId",
-                table: "Script");
-
-            migrationBuilder.DropIndex(
-                name: "IX_PollGroup_Driver",
-                table: "PollGroup");
-
-            migrationBuilder.DropIndex(
-                name: "UX_PollGroup_LogicalId",
-                table: "PollGroup");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Cluster",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Group",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "IX_NodeAcl_Scope",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "UX_NodeAcl_GroupScope",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "UX_NodeAcl_LogicalId",
-                table: "NodeAcl");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_Cluster_Kind",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_LogicalId",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Namespace_NamespaceUri",
-                table: "Namespace");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Driver",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_Line",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_MachineCode",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_SAPID",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Equipment_ZTag",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_LinePath",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_LogicalId",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Equipment_Uuid",
-                table: "Equipment");
-
-            migrationBuilder.DropIndex(
-                name: "IX_DriverInstance_Namespace",
-                table: "DriverInstance");
-
-            migrationBuilder.DropIndex(
-                name: "UX_DriverInstance_LogicalId",
-                table: "DriverInstance");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Device_Driver",
-                table: "Device");
-
-            migrationBuilder.DropIndex(
-                name: "UX_Device_LogicalId",
-                table: "Device");
-
-            migrationBuilder.DropIndex(
-                name: "IX_ClusterNode_ClusterId",
-                table: "ClusterNode");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "VirtualTag");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "UnsLine");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "UnsArea");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "Tag");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "ScriptedAlarm");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "Script");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "PollGroup");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "NodeAcl");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "Namespace");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "Equipment");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "DriverInstance");
-
-            migrationBuilder.DropColumn(
-                name: "RowVersion",
-                table: "Device");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_UnsArea_Cluster",
-                table: "UnsArea",
-                newName: "IX_UnsArea_ClusterId");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_Namespace_Cluster",
-                table: "Namespace",
-                newName: "IX_Namespace_ClusterId");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_DriverInstance_Cluster",
-                table: "DriverInstance",
-                newName: "IX_DriverInstance_ClusterId");
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "VirtualTag",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "UnsLine",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "UnsArea",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "Tag",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "ScriptedAlarm",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "Script",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "PollGroup",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "NodeAcl",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "Namespace",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "Equipment",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "DriverInstance",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<long>(
-                name: "GenerationId",
-                table: "Device",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<string>(
-                name: "RedundancyRole",
-                table: "ClusterNode",
-                type: "nvarchar(16)",
-                maxLength: 16,
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.CreateTable(
-                name: "ConfigGeneration",
-                columns: table => new
-                {
-                    GenerationId = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    ParentGenerationId = table.Column<long>(type: "bigint", nullable: true),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
-                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
-                    Notes = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
-                    PublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    PublishedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
-                    Status = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ConfigGeneration", x => x.GenerationId);
-                    table.ForeignKey(
-                        name: "FK_ConfigGeneration_ConfigGeneration_ParentGenerationId",
-                        column: x => x.ParentGenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_ConfigGeneration_ServerCluster_ClusterId",
-                        column: x => x.ClusterId,
-                        principalTable: "ServerCluster",
-                        principalColumn: "ClusterId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ClusterNodeGenerationState",
-                columns: table => new
-                {
-                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
-                    CurrentGenerationId = table.Column<long>(type: "bigint", nullable: true),
-                    LastAppliedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
-                    LastAppliedError = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
-                    LastAppliedStatus = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
-                    LastSeenAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ClusterNodeGenerationState", x => x.NodeId);
-                    table.ForeignKey(
-                        name: "FK_ClusterNodeGenerationState_ClusterNode_NodeId",
-                        column: x => x.NodeId,
-                        principalTable: "ClusterNode",
-                        principalColumn: "NodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_ClusterNodeGenerationState_ConfigGeneration_CurrentGenerationId",
-                        column: x => x.CurrentGenerationId,
-                        principalTable: "ConfigGeneration",
-                        principalColumn: "GenerationId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_VirtualTag_Generation_Script",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "ScriptId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_Generation_EquipmentPath",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_VirtualTag_Generation_LogicalId",
-                table: "VirtualTag",
-                columns: new[] { "GenerationId", "VirtualTagId" },
-                unique: true,
-                filter: "[VirtualTagId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsLine_Generation_Area",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsAreaId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_Generation_AreaName",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsAreaId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsLine_Generation_LogicalId",
-                table: "UnsLine",
-                columns: new[] { "GenerationId", "UnsLineId" },
-                unique: true,
-                filter: "[UnsLineId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UnsArea_Generation_Cluster",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_Generation_ClusterName",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "ClusterId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_UnsArea_Generation_LogicalId",
-                table: "UnsArea",
-                columns: new[] { "GenerationId", "UnsAreaId" },
-                unique: true,
-                filter: "[UnsAreaId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Generation_Driver_Device",
-                table: "Tag",
-                columns: new[] { "GenerationId", "DriverInstanceId", "DeviceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Tag_Generation_Equipment",
-                table: "Tag",
-                columns: new[] { "GenerationId", "EquipmentId" },
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_EquipmentPath",
-                table: "Tag",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_FolderPath",
-                table: "Tag",
-                columns: new[] { "GenerationId", "DriverInstanceId", "FolderPath", "Name" },
-                unique: true,
-                filter: "[EquipmentId] IS NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Tag_Generation_LogicalId",
-                table: "Tag",
-                columns: new[] { "GenerationId", "TagId" },
-                unique: true,
-                filter: "[TagId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScriptedAlarm_Generation_Script",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "PredicateScriptId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_Generation_EquipmentPath",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "EquipmentId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ScriptedAlarm_Generation_LogicalId",
-                table: "ScriptedAlarm",
-                columns: new[] { "GenerationId", "ScriptedAlarmId" },
-                unique: true,
-                filter: "[ScriptedAlarmId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Script_Generation_SourceHash",
-                table: "Script",
-                columns: new[] { "GenerationId", "SourceHash" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Script_Generation_LogicalId",
-                table: "Script",
-                columns: new[] { "GenerationId", "ScriptId" },
-                unique: true,
-                filter: "[ScriptId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_PollGroup_Generation_Driver",
-                table: "PollGroup",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_PollGroup_Generation_LogicalId",
-                table: "PollGroup",
-                columns: new[] { "GenerationId", "PollGroupId" },
-                unique: true,
-                filter: "[PollGroupId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Cluster",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Group",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "LdapGroup" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_NodeAcl_Generation_Scope",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ScopeKind", "ScopeId" },
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_Generation_GroupScope",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "ClusterId", "LdapGroup", "ScopeKind", "ScopeId" },
-                unique: true,
-                filter: "[ScopeId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_NodeAcl_Generation_LogicalId",
-                table: "NodeAcl",
-                columns: new[] { "GenerationId", "NodeAclId" },
-                unique: true,
-                filter: "[NodeAclId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Namespace_Generation_Cluster",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_Cluster_Kind",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "ClusterId", "Kind" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_LogicalId",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceId" },
-                unique: true,
-                filter: "[NamespaceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_LogicalId_Cluster",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceId", "ClusterId" },
-                unique: true,
-                filter: "[NamespaceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Namespace_Generation_NamespaceUri",
-                table: "Namespace",
-                columns: new[] { "GenerationId", "NamespaceUri" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_Driver",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_Line",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "UnsLineId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_MachineCode",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "MachineCode" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_SAPID",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "SAPID" },
-                filter: "[SAPID] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Equipment_Generation_ZTag",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "ZTag" },
-                filter: "[ZTag] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_LinePath",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "UnsLineId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_LogicalId",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "EquipmentId" },
-                unique: true,
-                filter: "[EquipmentId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Equipment_Generation_Uuid",
-                table: "Equipment",
-                columns: new[] { "GenerationId", "EquipmentUuid" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_Generation_Cluster",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "ClusterId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_DriverInstance_Generation_Namespace",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "NamespaceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_DriverInstance_Generation_LogicalId",
-                table: "DriverInstance",
-                columns: new[] { "GenerationId", "DriverInstanceId" },
-                unique: true,
-                filter: "[DriverInstanceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Device_Generation_Driver",
-                table: "Device",
-                columns: new[] { "GenerationId", "DriverInstanceId" });
-
-            migrationBuilder.CreateIndex(
-                name: "UX_Device_Generation_LogicalId",
-                table: "Device",
-                columns: new[] { "GenerationId", "DeviceId" },
-                unique: true,
-                filter: "[DeviceId] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ClusterNode_Primary_Per_Cluster",
-                table: "ClusterNode",
-                column: "ClusterId",
-                unique: true,
-                filter: "[RedundancyRole] = 'Primary'");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ClusterNodeGenerationState_Generation",
-                table: "ClusterNodeGenerationState",
-                column: "CurrentGenerationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigGeneration_Cluster_Published",
-                table: "ConfigGeneration",
-                columns: new[] { "ClusterId", "Status", "GenerationId" },
-                descending: new[] { false, false, true })
-                .Annotation("SqlServer:Include", new[] { "PublishedAt" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ConfigGeneration_ParentGenerationId",
-                table: "ConfigGeneration",
-                column: "ParentGenerationId");
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ConfigGeneration_Draft_Per_Cluster",
-                table: "ConfigGeneration",
-                column: "ClusterId",
-                unique: true,
-                filter: "[Status] = 'Draft'");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Device_ConfigGeneration_GenerationId",
-                table: "Device",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_DriverInstance_ConfigGeneration_GenerationId",
-                table: "DriverInstance",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Equipment_ConfigGeneration_GenerationId",
-                table: "Equipment",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Namespace_ConfigGeneration_GenerationId",
-                table: "Namespace",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_NodeAcl_ConfigGeneration_GenerationId",
-                table: "NodeAcl",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_PollGroup_ConfigGeneration_GenerationId",
-                table: "PollGroup",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Script_ConfigGeneration_GenerationId",
-                table: "Script",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_ScriptedAlarm_ConfigGeneration_GenerationId",
-                table: "ScriptedAlarm",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Tag_ConfigGeneration_GenerationId",
-                table: "Tag",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_UnsArea_ConfigGeneration_GenerationId",
-                table: "UnsArea",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_UnsLine_ConfigGeneration_GenerationId",
-                table: "UnsLine",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_VirtualTag_ConfigGeneration_GenerationId",
-                table: "VirtualTag",
-                column: "GenerationId",
-                principalTable: "ConfigGeneration",
-                principalColumn: "GenerationId",
-                onDelete: ReferentialAction.Restrict);
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.Designer.cs
deleted file mode 100644
index 96ba5ae2..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.Designer.cs
+++ /dev/null
@@ -1,1755 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260526105027_AddConfigAuditLogEventIdColumns")]
-    partial class AddConfigAuditLogEventIdColumns
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("FriendlyName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Xml")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DataProtectionKeys", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_ClusterNode_ClusterId");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("CorrelationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("EventId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("EventId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
-                        .HasFilter("[EventId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigEdit", b =>
-                {
-                    b.Property<Guid>("EditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("EditedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("EditedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<Guid>("EntityId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("ExecutionId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("FieldsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceNode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EditId");
-
-                    b.HasIndex("EditedAtUtc")
-                        .HasDatabaseName("IX_ConfigEdit_EditedAt");
-
-                    b.HasIndex("ExecutionId")
-                        .HasDatabaseName("IX_ConfigEdit_Execution")
-                        .HasFilter("[ExecutionId] IS NOT NULL");
-
-                    b.HasIndex("EntityType", "EntityId")
-                        .HasDatabaseName("IX_ConfigEdit_Entity");
-
-                    b.ToTable("ConfigEdit", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", b =>
-                {
-                    b.Property<Guid>("DeploymentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<byte[]>("ArtifactBlob")
-                        .IsRequired()
-                        .HasColumnType("varbinary(max)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("RevisionHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime?>("SealedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("DeploymentId");
-
-                    b.HasIndex("CreatedAtUtc")
-                        .HasDatabaseName("IX_Deployment_CreatedAt");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_Deployment_Status");
-
-                    b.ToTable("Deployment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Cluster");
-
-                    b.HasIndex("DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
-                    b.HasIndex("EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Uuid");
-
-                    b.HasIndex("MachineCode")
-                        .HasDatabaseName("IX_Equipment_MachineCode");
-
-                    b.HasIndex("SAPID")
-                        .HasDatabaseName("IX_Equipment_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Line");
-
-                    b.HasIndex("ZTag")
-                        .HasDatabaseName("IX_Equipment_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Cluster");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Group");
-
-                    b.HasIndex("NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("DeploymentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("AppliedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime>("StartedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("NodeId", "DeploymentId");
-
-                    b.HasIndex("DeploymentId")
-                        .HasDatabaseName("IX_NodeDeploymentState_Deployment");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_NodeDeploymentState_Status");
-
-                    b.ToTable("NodeDeploymentState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Driver");
-
-                    b.HasIndex("PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("SourceHash")
-                        .HasDatabaseName("IX_Script_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Script");
-
-                    b.HasIndex("ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Cluster");
-
-                    b.HasIndex("UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Area");
-
-                    b.HasIndex("UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Script");
-
-                    b.HasIndex("VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
-                        .WithMany()
-                        .HasForeignKey("DeploymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany()
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Deployment");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.cs
deleted file mode 100644
index 72bb343d..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526105027_AddConfigAuditLogEventIdColumns.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddConfigAuditLogEventIdColumns : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<Guid>(
-                name: "CorrelationId",
-                table: "ConfigAuditLog",
-                type: "uniqueidentifier",
-                nullable: true);
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "EventId",
-                table: "ConfigAuditLog",
-                type: "uniqueidentifier",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "UX_ConfigAuditLog_EventId",
-                table: "ConfigAuditLog",
-                column: "EventId",
-                unique: true,
-                filter: "[EventId] IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "UX_ConfigAuditLog_EventId",
-                table: "ConfigAuditLog");
-
-            migrationBuilder.DropColumn(
-                name: "CorrelationId",
-                table: "ConfigAuditLog");
-
-            migrationBuilder.DropColumn(
-                name: "EventId",
-                table: "ConfigAuditLog");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.Designer.cs
deleted file mode 100644
index 853f9386..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.Designer.cs
+++ /dev/null
@@ -1,1755 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260602112419_CanonicalizeAdminRoles")]
-    partial class CanonicalizeAdminRoles
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("FriendlyName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Xml")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DataProtectionKeys", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_ClusterNode_ClusterId");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("CorrelationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("EventId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("EventId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
-                        .HasFilter("[EventId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigEdit", b =>
-                {
-                    b.Property<Guid>("EditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("EditedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("EditedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<Guid>("EntityId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("ExecutionId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("FieldsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceNode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EditId");
-
-                    b.HasIndex("EditedAtUtc")
-                        .HasDatabaseName("IX_ConfigEdit_EditedAt");
-
-                    b.HasIndex("ExecutionId")
-                        .HasDatabaseName("IX_ConfigEdit_Execution")
-                        .HasFilter("[ExecutionId] IS NOT NULL");
-
-                    b.HasIndex("EntityType", "EntityId")
-                        .HasDatabaseName("IX_ConfigEdit_Entity");
-
-                    b.ToTable("ConfigEdit", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", b =>
-                {
-                    b.Property<Guid>("DeploymentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<byte[]>("ArtifactBlob")
-                        .IsRequired()
-                        .HasColumnType("varbinary(max)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("RevisionHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime?>("SealedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("DeploymentId");
-
-                    b.HasIndex("CreatedAtUtc")
-                        .HasDatabaseName("IX_Deployment_CreatedAt");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_Deployment_Status");
-
-                    b.ToTable("Deployment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Cluster");
-
-                    b.HasIndex("DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
-                    b.HasIndex("EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Uuid");
-
-                    b.HasIndex("MachineCode")
-                        .HasDatabaseName("IX_Equipment_MachineCode");
-
-                    b.HasIndex("SAPID")
-                        .HasDatabaseName("IX_Equipment_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Line");
-
-                    b.HasIndex("ZTag")
-                        .HasDatabaseName("IX_Equipment_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Cluster");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Group");
-
-                    b.HasIndex("NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("DeploymentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("AppliedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime>("StartedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("NodeId", "DeploymentId");
-
-                    b.HasIndex("DeploymentId")
-                        .HasDatabaseName("IX_NodeDeploymentState_Deployment");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_NodeDeploymentState_Status");
-
-                    b.ToTable("NodeDeploymentState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Driver");
-
-                    b.HasIndex("PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("SourceHash")
-                        .HasDatabaseName("IX_Script_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Script");
-
-                    b.HasIndex("ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Cluster");
-
-                    b.HasIndex("UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Area");
-
-                    b.HasIndex("UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Script");
-
-                    b.HasIndex("VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
-                        .WithMany()
-                        .HasForeignKey("DeploymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany()
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Deployment");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.cs
deleted file mode 100644
index 49ee6312..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602112419_CanonicalizeAdminRoles.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Task 1.7 — canonicalizes the control-plane admin role VALUES persisted in the
-    ///     <c>LdapGroupRoleMapping.Role</c> column. The column stores the <c>AdminRole</c> enum
-    ///     member name as a string (EF <c>HasConversion&lt;string&gt;</c>, <c>nvarchar(32)</c>);
-    ///     renaming the enum members (<c>ConfigViewer → Viewer</c>, <c>ConfigEditor → Designer</c>,
-    ///     <c>FleetAdmin → Administrator</c>) therefore requires rewriting existing rows so the C#
-    ///     enum and the stored strings stay in sync.
-    /// </summary>
-    /// <remarks>
-    ///     This is a pure DATA migration: the schema (column type, length, indexes) is unchanged,
-    ///     so the model snapshot is byte-identical to the prior migration. The new canonical strings
-    ///     ("Viewer" = 6, "Designer" = 8, "Administrator" = 13 chars) all fit the existing
-    ///     <c>nvarchar(32)</c> column. Enforcement semantics are preserved — it is a rename only.
-    /// </remarks>
-    public partial class CanonicalizeAdminRoles : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'Viewer' WHERE [Role] = N'ConfigViewer';");
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'Designer' WHERE [Role] = N'ConfigEditor';");
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'Administrator' WHERE [Role] = N'FleetAdmin';");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'FleetAdmin' WHERE [Role] = N'Administrator';");
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'ConfigEditor' WHERE [Role] = N'Designer';");
-            migrationBuilder.Sql("UPDATE [LdapGroupRoleMapping] SET [Role] = N'ConfigViewer' WHERE [Role] = N'Viewer';");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.Designer.cs
deleted file mode 100644
index 291b6673..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.Designer.cs
+++ /dev/null
@@ -1,1759 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260602135350_AddConfigAuditLogOutcome")]
-    partial class AddConfigAuditLogOutcome
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("FriendlyName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Xml")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DataProtectionKeys", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_ClusterNode_ClusterId");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("CorrelationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("EventId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Outcome")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("EventId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
-                        .HasFilter("[EventId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigEdit", b =>
-                {
-                    b.Property<Guid>("EditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("EditedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("EditedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<Guid>("EntityId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("ExecutionId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("FieldsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceNode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EditId");
-
-                    b.HasIndex("EditedAtUtc")
-                        .HasDatabaseName("IX_ConfigEdit_EditedAt");
-
-                    b.HasIndex("ExecutionId")
-                        .HasDatabaseName("IX_ConfigEdit_Execution")
-                        .HasFilter("[ExecutionId] IS NOT NULL");
-
-                    b.HasIndex("EntityType", "EntityId")
-                        .HasDatabaseName("IX_ConfigEdit_Entity");
-
-                    b.ToTable("ConfigEdit", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", b =>
-                {
-                    b.Property<Guid>("DeploymentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<byte[]>("ArtifactBlob")
-                        .IsRequired()
-                        .HasColumnType("varbinary(max)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("RevisionHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime?>("SealedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("DeploymentId");
-
-                    b.HasIndex("CreatedAtUtc")
-                        .HasDatabaseName("IX_Deployment_CreatedAt");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_Deployment_Status");
-
-                    b.ToTable("Deployment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Cluster");
-
-                    b.HasIndex("DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
-                    b.HasIndex("EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Uuid");
-
-                    b.HasIndex("MachineCode")
-                        .HasDatabaseName("IX_Equipment_MachineCode");
-
-                    b.HasIndex("SAPID")
-                        .HasDatabaseName("IX_Equipment_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Line");
-
-                    b.HasIndex("ZTag")
-                        .HasDatabaseName("IX_Equipment_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Cluster");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Group");
-
-                    b.HasIndex("NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("DeploymentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("AppliedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime>("StartedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("NodeId", "DeploymentId");
-
-                    b.HasIndex("DeploymentId")
-                        .HasDatabaseName("IX_NodeDeploymentState_Deployment");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_NodeDeploymentState_Status");
-
-                    b.ToTable("NodeDeploymentState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Driver");
-
-                    b.HasIndex("PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("SourceHash")
-                        .HasDatabaseName("IX_Script_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Script");
-
-                    b.HasIndex("ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Cluster");
-
-                    b.HasIndex("UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Area");
-
-                    b.HasIndex("UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Script");
-
-                    b.HasIndex("VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
-                        .WithMany()
-                        .HasForeignKey("DeploymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany()
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Deployment");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.cs
deleted file mode 100644
index c43068d6..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260602135350_AddConfigAuditLogOutcome.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Task 2.2 — adds the nullable <c>Outcome</c> column to <c>ConfigAuditLog</c> for the
-    ///     canonical <c>ZB.MOM.WW.Audit.AuditOutcome</c> (stored as its enum member name,
-    ///     <c>nvarchar(16)</c>, mirroring how <c>AdminRole</c> is persisted). Purely additive:
-    ///     nullable with no backfill, so existing rows and the bespoke stored-procedure audit
-    ///     path (which does not derive an outcome) keep writing NULL.
-    /// </summary>
-    public partial class AddConfigAuditLogOutcome : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Outcome",
-                table: "ConfigAuditLog",
-                type: "nvarchar(16)",
-                maxLength: 16,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Outcome",
-                table: "ConfigAuditLog");
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.Designer.cs
deleted file mode 100644
index c3c8d817..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.Designer.cs
+++ /dev/null
@@ -1,1758 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260608104706_NullableEquipmentDriverInstanceId")]
-    partial class NullableEquipmentDriverInstanceId
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("FriendlyName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Xml")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DataProtectionKeys", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_ClusterNode_ClusterId");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("CorrelationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("EventId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Outcome")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("EventId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
-                        .HasFilter("[EventId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigEdit", b =>
-                {
-                    b.Property<Guid>("EditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("EditedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("EditedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<Guid>("EntityId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("ExecutionId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("FieldsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceNode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EditId");
-
-                    b.HasIndex("EditedAtUtc")
-                        .HasDatabaseName("IX_ConfigEdit_EditedAt");
-
-                    b.HasIndex("ExecutionId")
-                        .HasDatabaseName("IX_ConfigEdit_Execution")
-                        .HasFilter("[ExecutionId] IS NOT NULL");
-
-                    b.HasIndex("EntityType", "EntityId")
-                        .HasDatabaseName("IX_ConfigEdit_Entity");
-
-                    b.ToTable("ConfigEdit", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", b =>
-                {
-                    b.Property<Guid>("DeploymentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<byte[]>("ArtifactBlob")
-                        .IsRequired()
-                        .HasColumnType("varbinary(max)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("RevisionHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime?>("SealedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("DeploymentId");
-
-                    b.HasIndex("CreatedAtUtc")
-                        .HasDatabaseName("IX_Deployment_CreatedAt");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_Deployment_Status");
-
-                    b.ToTable("Deployment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Cluster");
-
-                    b.HasIndex("DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
-                    b.HasIndex("EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Uuid");
-
-                    b.HasIndex("MachineCode")
-                        .HasDatabaseName("IX_Equipment_MachineCode");
-
-                    b.HasIndex("SAPID")
-                        .HasDatabaseName("IX_Equipment_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Line");
-
-                    b.HasIndex("ZTag")
-                        .HasDatabaseName("IX_Equipment_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Cluster");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Group");
-
-                    b.HasIndex("NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("DeploymentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("AppliedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime>("StartedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("NodeId", "DeploymentId");
-
-                    b.HasIndex("DeploymentId")
-                        .HasDatabaseName("IX_NodeDeploymentState_Deployment");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_NodeDeploymentState_Status");
-
-                    b.ToTable("NodeDeploymentState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Driver");
-
-                    b.HasIndex("PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("SourceHash")
-                        .HasDatabaseName("IX_Script_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Script");
-
-                    b.HasIndex("ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Cluster");
-
-                    b.HasIndex("UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Area");
-
-                    b.HasIndex("UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Script");
-
-                    b.HasIndex("VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
-                        .WithMany()
-                        .HasForeignKey("DeploymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany()
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Deployment");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.cs
deleted file mode 100644
index bc9e28f4..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260608104706_NullableEquipmentDriverInstanceId.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <inheritdoc />
-    public partial class NullableEquipmentDriverInstanceId : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "DriverInstanceId",
-                table: "Equipment",
-                type: "nvarchar(64)",
-                maxLength: 64,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(64)",
-                oldMaxLength: 64);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // WARNING: this rollback converts any existing NULL (driver-less) rows to "" for DriverInstanceId.
-            // Only safe when no driver-less equipment exists in the database.
-            migrationBuilder.AlterColumn<string>(
-                name: "DriverInstanceId",
-                table: "Equipment",
-                type: "nvarchar(64)",
-                maxLength: 64,
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(64)",
-                oldMaxLength: 64,
-                oldNullable: true);
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.Designer.cs
deleted file mode 100644
index bbf9d7d3..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.Designer.cs
+++ /dev/null
@@ -1,1758 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ZB.MOM.WW.OtOpcUa.Configuration;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260613022355_CleanupSystemPlatformNamespaces")]
-    partial class CleanupSystemPlatformNamespaces
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("FriendlyName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Xml")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DataProtectionKeys", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ApplicationUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<int>("DashboardPort")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DriverConfigOverridesJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Host")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("nvarchar(255)");
-
-                    b.Property<DateTime?>("LastSeenAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("OpcUaPort")
-                        .HasColumnType("int");
-
-                    b.Property<byte>("ServiceLevelBase")
-                        .HasColumnType("tinyint");
-
-                    b.HasKey("NodeId");
-
-                    b.HasIndex("ApplicationUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNode_ApplicationUri");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_ClusterNode_ClusterId");
-
-                    b.ToTable("ClusterNode", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.Property<Guid>("CredentialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NodeId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime?>("RotatedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.HasKey("CredentialId");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ClusterNodeCredential_Value")
-                        .HasFilter("[Enabled] = 1");
-
-                    b.HasIndex("NodeId", "Enabled")
-                        .HasDatabaseName("IX_ClusterNodeCredential_NodeId");
-
-                    b.ToTable("ClusterNodeCredential", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigAuditLog", b =>
-                {
-                    b.Property<long>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("AuditId"));
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("CorrelationId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DetailsJson")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("EventId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<long?>("GenerationId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Outcome")
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Principal")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime>("Timestamp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("EventId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
-                        .HasFilter("[EventId] IS NOT NULL");
-
-                    b.HasIndex("GenerationId")
-                        .HasDatabaseName("IX_ConfigAuditLog_Generation")
-                        .HasFilter("[GenerationId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Timestamp")
-                        .IsDescending(false, true)
-                        .HasDatabaseName("IX_ConfigAuditLog_Cluster_Time");
-
-                    b.ToTable("ConfigAuditLog", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ConfigEdit", b =>
-                {
-                    b.Property<Guid>("EditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<DateTime>("EditedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("EditedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<Guid>("EntityId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid?>("ExecutionId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("FieldsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceNode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EditId");
-
-                    b.HasIndex("EditedAtUtc")
-                        .HasDatabaseName("IX_ConfigEdit_EditedAt");
-
-                    b.HasIndex("ExecutionId")
-                        .HasDatabaseName("IX_ConfigEdit_Execution")
-                        .HasFilter("[ExecutionId] IS NOT NULL");
-
-                    b.HasIndex("EntityType", "EntityId")
-                        .HasDatabaseName("IX_ConfigEdit_Entity");
-
-                    b.ToTable("ConfigEdit", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", b =>
-                {
-                    b.Property<Guid>("DeploymentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<byte[]>("ArtifactBlob")
-                        .IsRequired()
-                        .HasColumnType("varbinary(max)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<string>("RevisionHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime?>("SealedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("DeploymentId");
-
-                    b.HasIndex("CreatedAtUtc")
-                        .HasDatabaseName("IX_Deployment_CreatedAt");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_Deployment_Status");
-
-                    b.ToTable("Deployment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Device", b =>
-                {
-                    b.Property<Guid>("DeviceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DeviceConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DeviceRowId");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Device_LogicalId")
-                        .HasFilter("[DeviceId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Device_Driver");
-
-                    b.ToTable("Device", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverHostStatus", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Detail")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<DateTime>("LastSeenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("State")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("StateChangedUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("NodeId", "DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSeenUtc")
-                        .HasDatabaseName("IX_DriverHostStatus_LastSeen");
-
-                    b.HasIndex("NodeId")
-                        .HasDatabaseName("IX_DriverHostStatus_Node");
-
-                    b.ToTable("DriverHostStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.Property<Guid>("DriverInstanceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ResilienceConfig")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("DriverInstanceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_DriverInstance_Cluster");
-
-                    b.HasIndex("DriverInstanceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_DriverInstance_LogicalId")
-                        .HasFilter("[DriverInstanceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
-
-                    b.ToTable("DriverInstance", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
-
-                            t.HasCheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstanceResilienceStatus", b =>
-                {
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HostName")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<long>("BaselineFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ConsecutiveFailures")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CurrentBulkheadDepth")
-                        .HasColumnType("int");
-
-                    b.Property<long>("CurrentFootprintBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime?>("LastCircuitBreakerOpenUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("LastRecycleUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime>("LastSampledUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.HasKey("DriverInstanceId", "HostName");
-
-                    b.HasIndex("LastSampledUtc")
-                        .HasDatabaseName("IX_DriverResilience_LastSampled");
-
-                    b.ToTable("DriverInstanceResilienceStatus", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Equipment", b =>
-                {
-                    b.Property<Guid>("EquipmentRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentClassRef")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("SAPID")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("UnsLineId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<short?>("YearOfConstruction")
-                        .HasColumnType("smallint");
-
-                    b.Property<string>("ZTag")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("EquipmentRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
-                    b.HasIndex("EquipmentId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LogicalId")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentUuid")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_Uuid");
-
-                    b.HasIndex("MachineCode")
-                        .HasDatabaseName("IX_Equipment_MachineCode");
-
-                    b.HasIndex("SAPID")
-                        .HasDatabaseName("IX_Equipment_SAPID")
-                        .HasFilter("[SAPID] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId")
-                        .HasDatabaseName("IX_Equipment_Line");
-
-                    b.HasIndex("ZTag")
-                        .HasDatabaseName("IX_Equipment_ZTag")
-                        .HasFilter("[ZTag] IS NOT NULL");
-
-                    b.HasIndex("UnsLineId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Equipment_LinePath");
-
-                    b.ToTable("Equipment", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
-                {
-                    b.Property<Guid>("ReservationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("EquipmentUuid")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("FirstPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("FirstPublishedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("LastPublishedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("ReleaseReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ReleasedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ReservationId");
-
-                    b.HasIndex("EquipmentUuid")
-                        .HasDatabaseName("IX_ExternalIdReservation_Equipment");
-
-                    b.HasIndex("Kind", "Value")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ExternalIdReservation_KindValue_Active")
-                        .HasFilter("[ReleasedAt] IS NULL");
-
-                    b.ToTable("ExternalIdReservation", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<bool>("IsSystemWide")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Role")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClusterId");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_LdapGroupRoleMapping_Group");
-
-                    b.HasIndex("LdapGroup", "ClusterId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_LdapGroupRoleMapping_Group_Cluster")
-                        .HasFilter("[ClusterId] IS NOT NULL");
-
-                    b.ToTable("LdapGroupRoleMapping", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
-                {
-                    b.Property<Guid>("NodeAclRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("LdapGroup")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("NodeAclId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<int>("PermissionFlags")
-                        .HasColumnType("int");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScopeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ScopeKind")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.HasKey("NodeAclRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_NodeAcl_Cluster");
-
-                    b.HasIndex("LdapGroup")
-                        .HasDatabaseName("IX_NodeAcl_Group");
-
-                    b.HasIndex("NodeAclId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_LogicalId")
-                        .HasFilter("[NodeAclId] IS NOT NULL");
-
-                    b.HasIndex("ScopeKind", "ScopeId")
-                        .HasDatabaseName("IX_NodeAcl_Scope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "LdapGroup", "ScopeKind", "ScopeId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_NodeAcl_GroupScope")
-                        .HasFilter("[ScopeId] IS NOT NULL");
-
-                    b.ToTable("NodeAcl", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.Property<string>("NodeId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<Guid>("DeploymentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("AppliedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("FailureReason")
-                        .HasMaxLength(2048)
-                        .HasColumnType("nvarchar(2048)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<DateTime>("StartedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.HasKey("NodeId", "DeploymentId");
-
-                    b.HasIndex("DeploymentId")
-                        .HasDatabaseName("IX_NodeDeploymentState_Deployment");
-
-                    b.HasIndex("Status")
-                        .HasDatabaseName("IX_NodeDeploymentState_Status");
-
-                    b.ToTable("NodeDeploymentState", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.PollGroup", b =>
-                {
-                    b.Property<Guid>("PollGroupRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("IntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("PollGroupRowId");
-
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_PollGroup_Driver");
-
-                    b.HasIndex("PollGroupId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_PollGroup_LogicalId")
-                        .HasFilter("[PollGroupId] IS NOT NULL");
-
-                    b.ToTable("PollGroup", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
-                {
-                    b.Property<Guid>("ScriptRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("SourceCode")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("SourceHash")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("ScriptRowId");
-
-                    b.HasIndex("ScriptId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Script_LogicalId")
-                        .HasFilter("[ScriptId] IS NOT NULL");
-
-                    b.HasIndex("SourceHash")
-                        .HasDatabaseName("IX_Script_SourceHash");
-
-                    b.ToTable("Script", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarm", b =>
-                {
-                    b.Property<Guid>("ScriptedAlarmRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AlarmType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("HistorizeToAveva")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("MessageTemplate")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PredicateScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Retain")
-                        .HasColumnType("bit");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int>("Severity")
-                        .HasColumnType("int");
-
-                    b.HasKey("ScriptedAlarmRowId");
-
-                    b.HasIndex("PredicateScriptId")
-                        .HasDatabaseName("IX_ScriptedAlarm_Script");
-
-                    b.HasIndex("ScriptedAlarmId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_LogicalId")
-                        .HasFilter("[ScriptedAlarmId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ScriptedAlarm_EquipmentPath");
-
-                    b.ToTable("ScriptedAlarm", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
-
-                            t.HasCheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ScriptedAlarmState", b =>
-                {
-                    b.Property<string>("ScriptedAlarmId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("AckedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("CommentsJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("ConfirmedState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("EnabledState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("LastAckComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastAckUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastAckUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("LastConfirmComment")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("LastConfirmUser")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("LastConfirmUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<DateTime?>("ShelvingExpiresUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ShelvingState")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<DateTime>("UpdatedAtUtc")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.HasKey("ScriptedAlarmId");
-
-                    b.ToTable("ScriptedAlarmState", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Property<string>("ClusterId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2(3)")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Enterprise")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<DateTime?>("ModifiedAt")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("ModifiedBy")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte>("NodeCount")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<string>("RedundancyMode")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("Site")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.HasKey("ClusterId");
-
-                    b.HasIndex("Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_ServerCluster_Name");
-
-                    b.HasIndex("Site")
-                        .HasDatabaseName("IX_ServerCluster_Site");
-
-                    b.ToTable("ServerCluster", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Tag", b =>
-                {
-                    b.Property<Guid>("TagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("AccessLevel")
-                        .IsRequired()
-                        .HasMaxLength(16)
-                        .HasColumnType("nvarchar(16)");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("PollGroupId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("TagConfig")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("TagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("WriteIdempotent")
-                        .HasColumnType("bit");
-
-                    b.HasKey("TagRowId");
-
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("TagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_LogicalId")
-                        .HasFilter("[TagId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
-
-                    b.ToTable("Tag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.Property<Guid>("UnsAreaRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsAreaRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_UnsArea_Cluster");
-
-                    b.HasIndex("UnsAreaId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_LogicalId")
-                        .HasFilter("[UnsAreaId] IS NOT NULL");
-
-                    b.HasIndex("ClusterId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsArea_ClusterName");
-
-                    b.ToTable("UnsArea", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsLine", b =>
-                {
-                    b.Property<Guid>("UnsLineRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("UnsAreaId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("UnsLineRowId");
-
-                    b.HasIndex("UnsAreaId")
-                        .HasDatabaseName("IX_UnsLine_Area");
-
-                    b.HasIndex("UnsLineId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_LogicalId")
-                        .HasFilter("[UnsLineId] IS NOT NULL");
-
-                    b.HasIndex("UnsAreaId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_UnsLine_AreaName");
-
-                    b.ToTable("UnsLine", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
-                {
-                    b.Property<Guid>("VirtualTagRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<bool>("ChangeTriggered")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("DataType")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Historize")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.Property<string>("ScriptId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<int?>("TimerIntervalMs")
-                        .HasColumnType("int");
-
-                    b.Property<string>("VirtualTagId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.HasKey("VirtualTagRowId");
-
-                    b.HasIndex("ScriptId")
-                        .HasDatabaseName("IX_VirtualTag_Script");
-
-                    b.HasIndex("VirtualTagId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_LogicalId")
-                        .HasFilter("[VirtualTagId] IS NOT NULL");
-
-                    b.HasIndex("EquipmentId", "Name")
-                        .IsUnique()
-                        .HasDatabaseName("UX_VirtualTag_EquipmentPath");
-
-                    b.ToTable("VirtualTag", null, t =>
-                        {
-                            t.HasCheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
-
-                            t.HasCheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
-                        });
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Nodes")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNodeCredential", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany("Credentials")
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.DriverInstance", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
-                        .WithMany()
-                        .HasForeignKey("DeploymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", "Node")
-                        .WithMany()
-                        .HasForeignKey("NodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Deployment");
-
-                    b.Navigation("Node");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany()
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ClusterNode", b =>
-                {
-                    b.Navigation("Credentials");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
-                {
-                    b.Navigation("Namespaces");
-
-                    b.Navigation("Nodes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.cs
deleted file mode 100644
index a15163e7..00000000
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260613022355_CleanupSystemPlatformNamespaces.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
-{
-    /// <summary>
-    ///     Forward-only DATA-cleanup migration for the Galaxy clean break: the
-    ///     <c>NamespaceKind.SystemPlatform</c> enum member was removed (Galaxy is now an
-    ///     Equipment-kind driver). <c>Namespace.Kind</c> is persisted as a string via
-    ///     <c>HasConversion&lt;string&gt;</c>, so any leftover row with <c>Kind = 'SystemPlatform'</c>
-    ///     would throw at materialisation time (no matching enum member) the moment the new code
-    ///     reads the table. This deletes those namespaces plus everything that hung off them.
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         There is NO schema/model change in this migration — the model snapshot is unchanged.
-    ///         The unique index <c>UX_Namespace_Cluster_Kind</c> (unique on <c>ClusterId, Kind</c>) is
-    ///         intentionally KEPT: <c>Simulated</c> remains a reserved kind, so one-of-each-kind-per-cluster
-    ///         is still the correct constraint.
-    ///     </para>
-    ///     <para>
-    ///         The cross-table relationships in this graph are LOGICAL foreign keys (string Id columns,
-    ///         e.g. <c>DriverInstance.NamespaceId</c> → <c>Namespace.NamespaceId</c>,
-    ///         <c>Tag.DriverInstanceId</c> → <c>DriverInstance.DriverInstanceId</c>) enforced by
-    ///         <c>sp_ValidateDraft</c>, NOT physical DB FK constraints — only the <c>*.ClusterId</c>
-    ///         relationships are real DB FKs. So no FK constraint can be violated here. The deletes are
-    ///         nonetheless ordered child→parent so no orphaned rows are left behind, and every statement
-    ///         is keyed off the set of SystemPlatform namespaces, so on a DB with zero such rows every
-    ///         DELETE simply affects 0 rows (idempotent / safe to run repeatedly).
-    ///     </para>
-    ///     <para>
-    ///         Two tables carry LOGICAL refs with no physical FK and so were easy to miss: <c>NodeAcl</c>
-    ///         (per-scope grants keyed by <c>ScopeKind</c> + <c>ScopeId</c>) is cleaned for the
-    ///         Namespace/Equipment/FolderSegment/Tag scopes that get deleted, and
-    ///         <c>ExternalIdReservation</c> (fleet-wide ZTag/SAPID reservations keyed by
-    ///         <c>EquipmentUuid</c>) is RELEASED — not deleted — for the affected equipment so the
-    ///         reserved external IDs free up while the audit row survives. Both run before the entity
-    ///         rows they reference are removed so the id subqueries still resolve.
-    ///     </para>
-    /// </remarks>
-    /// <inheritdoc />
-    public partial class CleanupSystemPlatformNamespaces : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            // Delete in child -> parent order. Everything is keyed off the set of namespaces whose
-            // Kind = 'SystemPlatform' (the string form persisted by HasConversion<string>), funnelled
-            // through the DriverInstances that lived in those namespaces.
-            migrationBuilder.Sql(@"
--- Defensive: SystemPlatform namespaces historically held only EquipmentId-NULL mirror tags, but a
--- stray equipment-scoped tag / Equipment could be bound to a SystemPlatform-namespace driver. Clean
--- both, plus anything that FKs into the affected Equipment (VirtualTag / ScriptedAlarm / state).
-
--- Logical-reference cleanup that must run FIRST -------------------------------------------
--- NodeAcl rows carry purely LOGICAL scope refs (ScopeKind + ScopeId, no physical FK). When the
--- scoped entity is deleted below the ScopeId dangles and the ACL evaluator would still match it,
--- silently granting/denying on a node that no longer exists. ScopeKind persists as a string via
--- HasConversion<string>, so the values below ('Namespace'/'Equipment'/'FolderSegment'/'Tag') are
--- the literal enum member names. These deletes must read the entity-id subqueries while those rows
--- still exist, hence they run before the entity DELETEs further down.
-
--- Namespace-scoped grants pointing at the SystemPlatform namespaces themselves.
-DELETE FROM [NodeAcl]
-WHERE [ScopeKind] = 'Namespace'
-  AND [ScopeId] IN (
-    SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform');
-
--- Equipment- and FolderSegment-scoped grants pointing at Equipment that hangs off the affected
--- DriverInstances (both share Equipment.EquipmentId as the ScopeId).
-DELETE FROM [NodeAcl]
-WHERE [ScopeKind] IN ('Equipment', 'FolderSegment')
-  AND [ScopeId] IN (
-    SELECT [EquipmentId] FROM [Equipment]
-    WHERE [DriverInstanceId] IN (
-        SELECT [DriverInstanceId] FROM [DriverInstance]
-        WHERE [NamespaceId] IN (
-            SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform')));
-
--- Tag-scoped grants pointing at Tags bound to the affected DriverInstances (ScopeId = Tag.TagId).
-DELETE FROM [NodeAcl]
-WHERE [ScopeKind] = 'Tag'
-  AND [ScopeId] IN (
-    SELECT [TagId] FROM [Tag]
-    WHERE [DriverInstanceId] IN (
-        SELECT [DriverInstanceId] FROM [DriverInstance]
-        WHERE [NamespaceId] IN (
-            SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform')));
-
--- ExternalIdReservation is NOT generation-versioned and must outlive equipment deletion as a
--- RELEASE, not a delete: active rows (ReleasedAt IS NULL) hold a fleet-wide unique reservation of
--- the ZTag/SAPID under a filtered unique index. If we left them active after dropping the
--- Equipment, the same external IDs could never be reused. Release them so the IDs free up while the
--- audit row survives. Run BEFORE the Equipment DELETE so the EquipmentUuid subquery still resolves.
-UPDATE [ExternalIdReservation]
-SET [ReleasedAt] = SYSUTCDATETIME(),
-    [ReleasedBy] = 'CleanupSystemPlatformNamespaces',
-    [ReleaseReason] = 'Equipment removed by SystemPlatform-namespace cleanup migration (retired NamespaceKind).'
-WHERE [ReleasedAt] IS NULL
-  AND [EquipmentUuid] IN (
-    SELECT [EquipmentUuid] FROM [Equipment]
-    WHERE [DriverInstanceId] IN (
-        SELECT [DriverInstanceId] FROM [DriverInstance]
-        WHERE [NamespaceId] IN (
-            SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform')));
-
--- Grandchildren of the affected Equipment ------------------------------------------------
--- ScriptedAlarmState is keyed by ScriptedAlarm.ScriptedAlarmId; remove before its ScriptedAlarm.
-DELETE FROM [ScriptedAlarmState]
-WHERE [ScriptedAlarmId] IN (
-    SELECT [ScriptedAlarmId] FROM [ScriptedAlarm]
-    WHERE [EquipmentId] IN (
-        SELECT [EquipmentId] FROM [Equipment]
-        WHERE [DriverInstanceId] IN (
-            SELECT [DriverInstanceId] FROM [DriverInstance]
-            WHERE [NamespaceId] IN (
-                SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform'))));
-
-DELETE FROM [ScriptedAlarm]
-WHERE [EquipmentId] IN (
-    SELECT [EquipmentId] FROM [Equipment]
-    WHERE [DriverInstanceId] IN (
-        SELECT [DriverInstanceId] FROM [DriverInstance]
-        WHERE [NamespaceId] IN (
-            SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform')));
-
-DELETE FROM [VirtualTag]
-WHERE [EquipmentId] IN (
-    SELECT [EquipmentId] FROM [Equipment]
-    WHERE [DriverInstanceId] IN (
-        SELECT [DriverInstanceId] FROM [DriverInstance]
-        WHERE [NamespaceId] IN (
-            SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform')));
-
--- Children of the affected DriverInstances ------------------------------------------------
--- Tags bound to those drivers: both EquipmentId-NULL mirror tags AND any equipment-scoped tag.
-DELETE FROM [Tag]
-WHERE [DriverInstanceId] IN (
-    SELECT [DriverInstanceId] FROM [DriverInstance]
-    WHERE [NamespaceId] IN (
-        SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform'));
-
-DELETE FROM [PollGroup]
-WHERE [DriverInstanceId] IN (
-    SELECT [DriverInstanceId] FROM [DriverInstance]
-    WHERE [NamespaceId] IN (
-        SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform'));
-
-DELETE FROM [Device]
-WHERE [DriverInstanceId] IN (
-    SELECT [DriverInstanceId] FROM [DriverInstance]
-    WHERE [NamespaceId] IN (
-        SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform'));
-
-DELETE FROM [Equipment]
-WHERE [DriverInstanceId] IN (
-    SELECT [DriverInstanceId] FROM [DriverInstance]
-    WHERE [NamespaceId] IN (
-        SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform'));
-
--- The DriverInstances themselves ----------------------------------------------------------
-DELETE FROM [DriverInstance]
-WHERE [NamespaceId] IN (
-    SELECT [NamespaceId] FROM [Namespace] WHERE [Kind] = 'SystemPlatform');
-
--- The SystemPlatform namespaces (the rows that would crash EF on read) --------------------
-DELETE FROM [Namespace] WHERE [Kind] = 'SystemPlatform';
-");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // Forward-only data cleanup: the deleted SystemPlatform namespaces and their dependent
-            // rows cannot be reconstructed (the data is gone, and SystemPlatform is no longer a valid
-            // NamespaceKind). Intentionally a no-op rather than a throw, so rolling back a LATER
-            // migration does not blow up on this one.
-        }
-    }
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.Designer.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.Designer.cs
similarity index 89%
rename from src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.Designer.cs
rename to src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.Designer.cs
index 7b1008c2..8e0b28b7 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260526081556_V2HostingAlignment.Designer.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.Designer.cs
@@ -12,8 +12,8 @@ using ZB.MOM.WW.OtOpcUa.Configuration;
 namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 {
     [DbContext(typeof(OtOpcUaConfigDbContext))]
-    [Migration("20260526081556_V2HostingAlignment")]
-    partial class V2HostingAlignment
+    [Migration("20260715230637_V3Initial")]
+    partial class V3Initial
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -168,9 +168,15 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<Guid?>("CorrelationId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<string>("DetailsJson")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<Guid?>("EventId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<string>("EventType")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -183,6 +189,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("Outcome")
+                        .HasMaxLength(16)
+                        .HasColumnType("nvarchar(16)");
+
                     b.Property<string>("Principal")
                         .IsRequired()
                         .HasMaxLength(128)
@@ -195,6 +205,11 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 
                     b.HasKey("AuditId");
 
+                    b.HasIndex("EventId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_ConfigAuditLog_EventId")
+                        .HasFilter("[EventId] IS NOT NULL");
+
                     b.HasIndex("GenerationId")
                         .HasDatabaseName("IX_ConfigAuditLog_Generation")
                         .HasFilter("[GenerationId] IS NOT NULL");
@@ -361,6 +376,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.HasIndex("DriverInstanceId")
                         .HasDatabaseName("IX_Device_Driver");
 
+                    b.HasIndex("DriverInstanceId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_Device_Driver_Name");
+
                     b.ToTable("Device", null, t =>
                         {
                             t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
@@ -440,8 +459,7 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(128)
                         .HasColumnType("nvarchar(128)");
 
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
+                    b.Property<string>("RawFolderId")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
@@ -464,8 +482,18 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasDatabaseName("UX_DriverInstance_LogicalId")
                         .HasFilter("[DriverInstanceId] IS NOT NULL");
 
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
+                    b.HasIndex("RawFolderId")
+                        .HasDatabaseName("IX_DriverInstance_RawFolder");
+
+                    b.HasIndex("ClusterId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_DriverInstance_ClusterRoot_Name")
+                        .HasFilter("[RawFolderId] IS NULL");
+
+                    b.HasIndex("ClusterId", "RawFolderId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_DriverInstance_Folder_Name")
+                        .HasFilter("[RawFolderId] IS NOT NULL");
 
                     b.ToTable("DriverInstance", null, t =>
                         {
@@ -525,19 +553,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(256)
                         .HasColumnType("nvarchar(256)");
 
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<string>("DeviceManualUri")
                         .HasMaxLength(512)
                         .HasColumnType("nvarchar(512)");
 
-                    b.Property<string>("DriverInstanceId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("Enabled")
                         .HasColumnType("bit");
 
@@ -610,9 +629,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 
                     b.HasKey("EquipmentRowId");
 
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
                     b.HasIndex("EquipmentId")
                         .IsUnique()
                         .HasDatabaseName("UX_Equipment_LogicalId")
@@ -643,148 +659,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("Equipment", (string)null);
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
                 {
                     b.Property<Guid>("ReservationId")
@@ -894,66 +768,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("LdapGroupRoleMapping", (string)null);
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
                 {
                     b.Property<Guid>("NodeAclRowId")
@@ -1109,6 +923,63 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         });
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.RawFolder", b =>
+                {
+                    b.Property<Guid>("RawFolderRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("ClusterId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentRawFolderId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("RawFolderId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.HasKey("RawFolderRowId");
+
+                    b.HasIndex("ClusterId")
+                        .HasDatabaseName("IX_RawFolder_Cluster");
+
+                    b.HasIndex("RawFolderId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_LogicalId")
+                        .HasFilter("[RawFolderId] IS NOT NULL");
+
+                    b.HasIndex("ClusterId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_ClusterRoot_Name")
+                        .HasFilter("[ParentRawFolderId] IS NULL");
+
+                    b.HasIndex("ClusterId", "ParentRawFolderId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_Parent_Name")
+                        .HasFilter("[ParentRawFolderId] IS NOT NULL");
+
+                    b.ToTable("RawFolder", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
                 {
                     b.Property<Guid>("ScriptRowId")
@@ -1388,22 +1259,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasColumnType("nvarchar(32)");
 
                     b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
                         .IsRequired()
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(128)
@@ -1423,6 +1282,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("TagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("TagId")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -1432,27 +1295,23 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 
                     b.HasKey("TagRowId");
 
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
                     b.HasIndex("TagId")
                         .IsUnique()
                         .HasDatabaseName("UX_Tag_LogicalId")
                         .HasFilter("[TagId] IS NOT NULL");
 
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
+                    b.HasIndex("DeviceId", "Name")
                         .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
+                        .HasDatabaseName("UX_Tag_Device_Name")
+                        .HasFilter("[TagGroupId] IS NULL");
 
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
+                    b.HasIndex("DeviceId", "TagGroupId")
+                        .HasDatabaseName("IX_Tag_Device");
+
+                    b.HasIndex("DeviceId", "TagGroupId", "Name")
                         .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
+                        .HasDatabaseName("UX_Tag_Group_Name")
+                        .HasFilter("[TagGroupId] IS NOT NULL");
 
                     b.ToTable("Tag", null, t =>
                         {
@@ -1460,6 +1319,63 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         });
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.TagGroup", b =>
+                {
+                    b.Property<Guid>("TagGroupRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentTagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.HasKey("TagGroupRowId");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("IX_TagGroup_Device");
+
+                    b.HasIndex("TagGroupId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_LogicalId")
+                        .HasFilter("[TagGroupId] IS NOT NULL");
+
+                    b.HasIndex("DeviceId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_DeviceRoot_Name")
+                        .HasFilter("[ParentTagGroupId] IS NULL");
+
+                    b.HasIndex("DeviceId", "ParentTagGroupId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_Parent_Name")
+                        .HasFilter("[ParentTagGroupId] IS NOT NULL");
+
+                    b.ToTable("TagGroup", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
                 {
                     b.Property<Guid>("UnsAreaRowId")
@@ -1556,6 +1472,60 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("UnsLine", (string)null);
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsTagReference", b =>
+                {
+                    b.Property<Guid>("UnsTagReferenceRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("DisplayNameOverride")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("EquipmentId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TagId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("UnsTagReferenceId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.HasKey("UnsTagReferenceRowId");
+
+                    b.HasIndex("EquipmentId")
+                        .HasDatabaseName("IX_UnsTagReference_Equipment");
+
+                    b.HasIndex("TagId")
+                        .HasDatabaseName("IX_UnsTagReference_Tag");
+
+                    b.HasIndex("UnsTagReferenceId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_UnsTagReference_LogicalId")
+                        .HasFilter("[UnsTagReferenceId] IS NOT NULL");
+
+                    b.HasIndex("EquipmentId", "TagId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_UnsTagReference_Equip_Tag");
+
+                    b.ToTable("UnsTagReference", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
                 {
                     b.Property<Guid>("VirtualTagRowId")
@@ -1660,17 +1630,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Cluster");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
@@ -1681,17 +1640,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Cluster");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
@@ -1711,6 +1659,15 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Node");
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.RawFolder", b =>
+                {
+                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", null)
+                        .WithMany("RawFolders")
+                        .HasForeignKey("ClusterId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
@@ -1727,16 +1684,11 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Credentials");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
                 {
-                    b.Navigation("Namespaces");
-
                     b.Navigation("Nodes");
+
+                    b.Navigation("RawFolders");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.StoredProcedures.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.StoredProcedures.cs
new file mode 100644
index 00000000..ad8dcf90
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.StoredProcedures.cs
@@ -0,0 +1,285 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
+{
+    /// <summary>
+    ///     Hand-authored SQL squashed into <c>V3Initial</c> from the retired per-migration proc files
+    ///     (<c>*_StoredProcedures.cs</c>, <c>*_ExtendComputeGenerationDiffWith*.cs</c>) and
+    ///     <c>AuthorizationGrants.cs</c>.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         <b>Port audit (v3 WP1).</b> The v1 stored procs were built entirely on the
+    ///         <c>ConfigGeneration</c> / <c>GenerationId</c> / <c>ClusterNodeGenerationState</c>
+    ///         generation model, which <c>V2HostingAlignment</c> (2026-05-26) dropped outright — so
+    ///         those procs have been vestigial since v2 (SQL Server's deferred name resolution let them
+    ///         keep existing while referencing phantom tables). No production code calls them; the v2/v3
+    ///         deploy + diff path is entirely C# (ControlPlane <c>ConfigComposer</c>,
+    ///         <c>AddressSpaceChangeClassifier</c>, <c>DraftValidator</c>). Their only consumer is
+    ///         <c>AuthorizationTests</c>, which exercises the DB-role EXECUTE grants and expects
+    ///         RAISERROR / permission failures — never a successful data operation.
+    ///     </para>
+    ///     <para>
+    ///         Under greenfield v3 the two-role authorization model (<c>OtOpcUaNode</c> /
+    ///         <c>OtOpcUaAdmin</c> + EXECUTE grants) is <b>retained</b> as a real security feature, so the
+    ///         eight proc <b>names</b> must exist for the grants + tests to bind. Each proc is rewritten
+    ///         here to be schema-valid against the v3 schema (references NO dropped table/column):
+    ///     </para>
+    ///     <list type="bullet">
+    ///         <item><c>sp_GetCurrentGenerationForCluster</c> keeps its <c>ClusterNodeCredential</c> +
+    ///         <c>ClusterNode</c> "Unauthorized" auth check (both tables retained), then RAISERRORs a
+    ///         v3-retirement message — preserving the exact behavior AuthorizationTests asserts.</item>
+    ///         <item><c>sp_PublishGeneration</c> is granted to <c>OtOpcUaAdmin</c> only and RAISERRORs a
+    ///         retirement message (never the word "permission"), so the Node-denied vs Admin-allowed
+    ///         grant assertions still hold.</item>
+    ///         <item><c>sp_ComputeGenerationDiff</c> is rewritten to reference the v3 tables
+    ///         (RawFolder / DriverInstance / Device / TagGroup / Tag / Equipment / UnsTagReference /
+    ///         NodeAcl) as a schema-valid current-state signature inventory. A genuine
+    ///         generation-to-generation diff is architecturally impossible now (no GenerationId column);
+    ///         the real diff lives in the C# ControlPlane.</item>
+    ///         <item><c>sp_ReleaseExternalIdReservation</c> is ported verbatim — it only touches retained
+    ///         tables (<c>ExternalIdReservation</c>, <c>ConfigAuditLog</c>).</item>
+    ///     </list>
+    /// </remarks>
+    public partial class V3Initial
+    {
+        private static void CreateStoredProcedures(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(GetCurrentGenerationForCluster);
+            migrationBuilder.Sql(GetGenerationContent);
+            migrationBuilder.Sql(RegisterNodeGenerationApplied);
+            migrationBuilder.Sql(ValidateDraft);
+            migrationBuilder.Sql(PublishGeneration);
+            migrationBuilder.Sql(RollbackToGeneration);
+            migrationBuilder.Sql(ComputeGenerationDiff);
+            migrationBuilder.Sql(ReleaseExternalIdReservation);
+        }
+
+        private static void DropStoredProcedures(MigrationBuilder migrationBuilder)
+        {
+            foreach (var name in new[]
+                     {
+                         "sp_ReleaseExternalIdReservation", "sp_ComputeGenerationDiff", "sp_RollbackToGeneration",
+                         "sp_PublishGeneration", "sp_ValidateDraft", "sp_RegisterNodeGenerationApplied",
+                         "sp_GetGenerationContent", "sp_GetCurrentGenerationForCluster",
+                     })
+            {
+                migrationBuilder.Sql($"IF OBJECT_ID(N'dbo.{name}', N'P') IS NOT NULL DROP PROCEDURE dbo.{name};");
+            }
+        }
+
+        private static void CreateAuthorizationGrants(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+IF DATABASE_PRINCIPAL_ID('OtOpcUaNode') IS NULL
+    CREATE ROLE OtOpcUaNode;
+IF DATABASE_PRINCIPAL_ID('OtOpcUaAdmin') IS NULL
+    CREATE ROLE OtOpcUaAdmin;
+");
+
+            migrationBuilder.Sql(@"
+GRANT EXECUTE ON OBJECT::dbo.sp_GetCurrentGenerationForCluster TO OtOpcUaNode;
+GRANT EXECUTE ON OBJECT::dbo.sp_GetGenerationContent            TO OtOpcUaNode;
+GRANT EXECUTE ON OBJECT::dbo.sp_RegisterNodeGenerationApplied   TO OtOpcUaNode;
+
+GRANT EXECUTE ON OBJECT::dbo.sp_GetCurrentGenerationForCluster TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_GetGenerationContent            TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_ValidateDraft                   TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_PublishGeneration               TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_RollbackToGeneration            TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_ComputeGenerationDiff           TO OtOpcUaAdmin;
+GRANT EXECUTE ON OBJECT::dbo.sp_ReleaseExternalIdReservation    TO OtOpcUaAdmin;
+
+DENY UPDATE, DELETE, INSERT ON SCHEMA::dbo TO OtOpcUaNode;
+DENY UPDATE, DELETE, INSERT ON SCHEMA::dbo TO OtOpcUaAdmin;
+DENY SELECT ON SCHEMA::dbo TO OtOpcUaNode;
+-- Admins may SELECT for reporting views in the future — grant views explicitly, not the schema.
+DENY SELECT ON SCHEMA::dbo TO OtOpcUaAdmin;
+");
+        }
+
+        private static void DropAuthorizationGrants(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+IF DATABASE_PRINCIPAL_ID('OtOpcUaNode') IS NOT NULL
+    DROP ROLE OtOpcUaNode;
+IF DATABASE_PRINCIPAL_ID('OtOpcUaAdmin') IS NOT NULL
+    DROP ROLE OtOpcUaAdmin;
+");
+        }
+
+        // ------------------------------------------------------------------------------------------
+        // v3 retirement stubs. The generation model is gone (see class remarks); these preserve the
+        // authorization surface + the AuthorizationTests behaviors while referencing only v3 tables.
+        // ------------------------------------------------------------------------------------------
+
+        private const string GetCurrentGenerationForCluster = @"
+CREATE OR ALTER PROCEDURE dbo.sp_GetCurrentGenerationForCluster
+    @NodeId    nvarchar(64),
+    @ClusterId nvarchar(64)
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    -- Auth surface retained verbatim (ClusterNodeCredential + ClusterNode are v3 tables). An
+    -- unbound caller still gets 'Unauthorized', which AuthorizationTests asserts.
+    DECLARE @Caller nvarchar(128) = SUSER_SNAME();
+
+    IF NOT EXISTS (
+        SELECT 1 FROM dbo.ClusterNodeCredential
+        WHERE NodeId = @NodeId AND Value = @Caller AND Enabled = 1)
+    BEGIN
+        RAISERROR('Unauthorized: caller %s is not bound to NodeId %s', 16, 1, @Caller, @NodeId);
+        RETURN;
+    END
+
+    IF NOT EXISTS (
+        SELECT 1 FROM dbo.ClusterNode
+        WHERE NodeId = @NodeId AND ClusterId = @ClusterId AND Enabled = 1)
+    BEGIN
+        RAISERROR('Forbidden: NodeId %s does not belong to ClusterId %s', 16, 1, @NodeId, @ClusterId);
+        RETURN;
+    END
+
+    RAISERROR('sp_GetCurrentGenerationForCluster is retired under v3: config/deploy state moved to the C# ControlPlane (Deployment table).', 16, 1);
+END
+";
+
+        private const string GetGenerationContent = @"
+CREATE OR ALTER PROCEDURE dbo.sp_GetGenerationContent
+    @NodeId       nvarchar(64),
+    @GenerationId bigint
+AS
+BEGIN
+    SET NOCOUNT ON;
+    RAISERROR('sp_GetGenerationContent is retired under v3: generation content is sealed into Deployment.ArtifactBlob by the C# ControlPlane.', 16, 1);
+END
+";
+
+        private const string RegisterNodeGenerationApplied = @"
+CREATE OR ALTER PROCEDURE dbo.sp_RegisterNodeGenerationApplied
+    @NodeId       nvarchar(64),
+    @GenerationId bigint,
+    @Status       nvarchar(16),
+    @Error        nvarchar(max) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON;
+    RAISERROR('sp_RegisterNodeGenerationApplied is retired under v3: node-apply state is tracked in NodeDeploymentState by the C# ControlPlane.', 16, 1);
+END
+";
+
+        private const string ValidateDraft = @"
+CREATE OR ALTER PROCEDURE dbo.sp_ValidateDraft
+    @DraftGenerationId bigint
+AS
+BEGIN
+    SET NOCOUNT ON;
+    RAISERROR('sp_ValidateDraft is retired under v3: draft validation runs in the managed DraftValidator (Configuration.Validation).', 16, 1);
+END
+";
+
+        private const string PublishGeneration = @"
+CREATE OR ALTER PROCEDURE dbo.sp_PublishGeneration
+    @ClusterId         nvarchar(64),
+    @DraftGenerationId bigint,
+    @Notes             nvarchar(1024) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON;
+    -- Message intentionally omits the word 'permission' so AuthorizationTests can distinguish a
+    -- grant failure (Node role) from a body-level error (Admin role reaching the proc body).
+    RAISERROR('sp_PublishGeneration is retired under v3: publishing is done by the C# ControlPlane (ConfigComposer + Deployment).', 16, 1);
+END
+";
+
+        private const string RollbackToGeneration = @"
+CREATE OR ALTER PROCEDURE dbo.sp_RollbackToGeneration
+    @ClusterId          nvarchar(64),
+    @TargetGenerationId bigint,
+    @Notes              nvarchar(1024) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON;
+    RAISERROR('sp_RollbackToGeneration is retired under v3: rollback is a C# ControlPlane operation over the Deployment history.', 16, 1);
+END
+";
+
+        // Rewritten to the v3 schema. There is no GenerationId to diff (the per-generation table model
+        // was dropped in v2), so this emits a current-state signature inventory across the v3 tables —
+        // referencing RawFolder, DriverInstance, Device, TagGroup, Tag, Equipment, UnsTagReference, and
+        // NodeAcl. The genuine generation-to-generation diff now lives in the C# ControlPlane
+        // (AddressSpaceChangeClassifier); this proc is retained only to carry the OtOpcUaAdmin EXECUTE
+        // grant and to keep the v3 table surface referenced from SQL.
+        private const string ComputeGenerationDiff = @"
+CREATE OR ALTER PROCEDURE dbo.sp_ComputeGenerationDiff
+    @FromGenerationId bigint,
+    @ToGenerationId   bigint
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    -- @FromGenerationId / @ToGenerationId are ignored: the v3 config tables are single live-state
+    -- (no GenerationId column). Emit a current-state signature per row so the shape (TableName,
+    -- LogicalId, Sig) still round-trips through any legacy caller.
+    SELECT TableName, LogicalId, Sig FROM (
+        SELECT 'RawFolder'      AS TableName, RawFolderId       AS LogicalId, CHECKSUM(ClusterId, ParentRawFolderId, Name, SortOrder) AS Sig FROM dbo.RawFolder
+        UNION ALL
+        SELECT 'DriverInstance', DriverInstanceId, CHECKSUM(ClusterId, RawFolderId, Name, DriverType, Enabled, CONVERT(varchar(max), DriverConfig)) FROM dbo.DriverInstance
+        UNION ALL
+        SELECT 'Device',         DeviceId,         CHECKSUM(DriverInstanceId, Name, Enabled, CONVERT(varchar(max), DeviceConfig)) FROM dbo.Device
+        UNION ALL
+        SELECT 'TagGroup',       TagGroupId,       CHECKSUM(DeviceId, ParentTagGroupId, Name, SortOrder) FROM dbo.TagGroup
+        UNION ALL
+        SELECT 'Tag',            TagId,            CHECKSUM(DeviceId, TagGroupId, PollGroupId, Name, DataType, AccessLevel, WriteIdempotent, CONVERT(varchar(max), TagConfig)) FROM dbo.Tag
+        UNION ALL
+        SELECT 'Equipment',      EquipmentId,      CHECKSUM(EquipmentUuid, UnsLineId, Name, MachineCode, ZTag, SAPID, EquipmentClassRef, Manufacturer, Model, SerialNumber) FROM dbo.Equipment
+        UNION ALL
+        SELECT 'UnsTagReference', UnsTagReferenceId, CHECKSUM(EquipmentId, TagId, DisplayNameOverride, SortOrder) FROM dbo.UnsTagReference
+        UNION ALL
+        SELECT 'NodeAcl',        NodeAclId,        CHECKSUM(ClusterId, LdapGroup, ScopeKind, ScopeId, PermissionFlags, Notes) FROM dbo.NodeAcl
+    ) AS inventory;
+END
+";
+
+        // Ported verbatim — touches only retained tables (ExternalIdReservation, ConfigAuditLog).
+        private const string ReleaseExternalIdReservation = @"
+CREATE OR ALTER PROCEDURE dbo.sp_ReleaseExternalIdReservation
+    @Kind           nvarchar(16),
+    @Value          nvarchar(64),
+    @ReleaseReason  nvarchar(512)
+AS
+BEGIN
+    SET NOCOUNT ON;
+    SET XACT_ABORT ON;
+
+    IF @ReleaseReason IS NULL OR LEN(@ReleaseReason) = 0
+    BEGIN
+        RAISERROR('ReleaseReason is required', 16, 1);
+        RETURN;
+    END
+
+    UPDATE dbo.ExternalIdReservation
+    SET    ReleasedAt     = SYSUTCDATETIME(),
+           ReleasedBy     = SUSER_SNAME(),
+           ReleaseReason  = @ReleaseReason
+    WHERE  Kind = @Kind AND Value = @Value AND ReleasedAt IS NULL;
+
+    IF @@ROWCOUNT = 0
+    BEGIN
+        RAISERROR('No active reservation found for (%s, %s)', 16, 1, @Kind, @Value);
+        RETURN;
+    END
+
+    -- Escape both caller-supplied values via STRING_ESCAPE so quotes/backslashes cannot break the
+    -- JSON document or inject additional structure into the audit record.
+    INSERT dbo.ConfigAuditLog (Principal, EventType, DetailsJson)
+    VALUES (SUSER_SNAME(), 'ExternalIdReleased',
+            CONCAT('{""kind"":""', STRING_ESCAPE(@Kind, 'json'),
+                   '"",""value"":""', STRING_ESCAPE(@Value, 'json'), '""}'));
+END
+";
+    }
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.cs
new file mode 100644
index 00000000..d5224cab
--- /dev/null
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/20260715230637_V3Initial.cs
@@ -0,0 +1,1135 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
+{
+    /// <inheritdoc />
+    public partial class V3Initial : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ConfigAuditLog",
+                columns: table => new
+                {
+                    AuditId = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Timestamp = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    Principal = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    EventType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    GenerationId = table.Column<long>(type: "bigint", nullable: true),
+                    DetailsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    EventId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CorrelationId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Outcome = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ConfigAuditLog", x => x.AuditId);
+                    table.CheckConstraint("CK_ConfigAuditLog_DetailsJson_IsJson", "DetailsJson IS NULL OR ISJSON(DetailsJson) = 1");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ConfigEdit",
+                columns: table => new
+                {
+                    EditId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    EntityType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    FieldsJson = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    ExecutionId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    EditedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    EditedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    SourceNode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ConfigEdit", x => x.EditId);
+                    table.CheckConstraint("CK_ConfigEdit_FieldsJson_IsJson", "ISJSON(FieldsJson) = 1");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "DataProtectionKeys",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    FriendlyName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Xml = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Deployment",
+                columns: table => new
+                {
+                    DeploymentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    RevisionHash = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    CreatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    ArtifactBlob = table.Column<byte[]>(type: "varbinary(max)", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false),
+                    FailureReason = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
+                    SealedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Deployment", x => x.DeploymentId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Device",
+                columns: table => new
+                {
+                    DeviceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    DeviceConfig = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Device", x => x.DeviceRowId);
+                    table.CheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "DriverHostStatus",
+                columns: table => new
+                {
+                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    HostName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    State = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    StateChangedUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
+                    LastSeenUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
+                    Detail = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DriverHostStatus", x => new { x.NodeId, x.DriverInstanceId, x.HostName });
+                });
+
+            migrationBuilder.CreateTable(
+                name: "DriverInstanceResilienceStatus",
+                columns: table => new
+                {
+                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    HostName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    LastCircuitBreakerOpenUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    ConsecutiveFailures = table.Column<int>(type: "int", nullable: false),
+                    CurrentBulkheadDepth = table.Column<int>(type: "int", nullable: false),
+                    LastRecycleUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    BaselineFootprintBytes = table.Column<long>(type: "bigint", nullable: false),
+                    CurrentFootprintBytes = table.Column<long>(type: "bigint", nullable: false),
+                    LastSampledUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DriverInstanceResilienceStatus", x => new { x.DriverInstanceId, x.HostName });
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Equipment",
+                columns: table => new
+                {
+                    EquipmentRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    EquipmentUuid = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    UnsLineId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    MachineCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ZTag = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    SAPID = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Manufacturer = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Model = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    SerialNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    HardwareRevision = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true),
+                    SoftwareRevision = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true),
+                    YearOfConstruction = table.Column<short>(type: "smallint", nullable: true),
+                    AssetLocation = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    ManufacturerUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    DeviceManualUri = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    EquipmentClassRef = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Equipment", x => x.EquipmentRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ExternalIdReservation",
+                columns: table => new
+                {
+                    ReservationId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    Kind = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    Value = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EquipmentUuid = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    FirstPublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    FirstPublishedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    LastPublishedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    ReleasedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    ReleasedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    ReleaseReason = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ExternalIdReservation", x => x.ReservationId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "NodeAcl",
+                columns: table => new
+                {
+                    NodeAclRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    NodeAclId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    LdapGroup = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    ScopeKind = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    ScopeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    PermissionFlags = table.Column<int>(type: "int", nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_NodeAcl", x => x.NodeAclRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "PollGroup",
+                columns: table => new
+                {
+                    PollGroupRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    PollGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    IntervalMs = table.Column<int>(type: "int", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PollGroup", x => x.PollGroupRowId);
+                    table.CheckConstraint("CK_PollGroup_IntervalMs_Min", "IntervalMs >= 50");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Script",
+                columns: table => new
+                {
+                    ScriptRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    ScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    SourceCode = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    SourceHash = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Language = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Script", x => x.ScriptRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ScriptedAlarm",
+                columns: table => new
+                {
+                    ScriptedAlarmRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    ScriptedAlarmId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    AlarmType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Severity = table.Column<int>(type: "int", nullable: false),
+                    MessageTemplate = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: false),
+                    PredicateScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    HistorizeToAveva = table.Column<bool>(type: "bit", nullable: false),
+                    Retain = table.Column<bool>(type: "bit", nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ScriptedAlarm", x => x.ScriptedAlarmRowId);
+                    table.CheckConstraint("CK_ScriptedAlarm_AlarmType", "AlarmType IN ('AlarmCondition','LimitAlarm','OffNormalAlarm','DiscreteAlarm')");
+                    table.CheckConstraint("CK_ScriptedAlarm_Severity_Range", "Severity BETWEEN 1 AND 1000");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ScriptedAlarmState",
+                columns: table => new
+                {
+                    ScriptedAlarmId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EnabledState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    AckedState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    ConfirmedState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    ShelvingState = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    ShelvingExpiresUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    LastAckUser = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    LastAckComment = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
+                    LastAckUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    LastConfirmUser = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    LastConfirmComment = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
+                    LastConfirmUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    CommentsJson = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    UpdatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ScriptedAlarmState", x => x.ScriptedAlarmId);
+                    table.CheckConstraint("CK_ScriptedAlarmState_CommentsJson_IsJson", "ISJSON(CommentsJson) = 1");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ServerCluster",
+                columns: table => new
+                {
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Enterprise = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Site = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    NodeCount = table.Column<byte>(type: "tinyint", nullable: false),
+                    RedundancyMode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ModifiedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    ModifiedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServerCluster", x => x.ClusterId);
+                    table.CheckConstraint("CK_ServerCluster_RedundancyMode_NodeCount", "((NodeCount = 1 AND RedundancyMode = 'None') OR (NodeCount = 2 AND RedundancyMode IN ('Warm', 'Hot')))");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Tag",
+                columns: table => new
+                {
+                    TagRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    TagId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    TagGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    DataType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    AccessLevel = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
+                    WriteIdempotent = table.Column<bool>(type: "bit", nullable: false),
+                    PollGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    TagConfig = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Tag", x => x.TagRowId);
+                    table.CheckConstraint("CK_Tag_TagConfig_IsJson", "ISJSON(TagConfig) = 1");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "TagGroup",
+                columns: table => new
+                {
+                    TagGroupRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    TagGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    DeviceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ParentTagGroupId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    SortOrder = table.Column<int>(type: "int", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TagGroup", x => x.TagGroupRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "UnsLine",
+                columns: table => new
+                {
+                    UnsLineRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    UnsLineId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    UnsAreaId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UnsLine", x => x.UnsLineRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "UnsTagReference",
+                columns: table => new
+                {
+                    UnsTagReferenceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    UnsTagReferenceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    TagId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    DisplayNameOverride = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
+                    SortOrder = table.Column<int>(type: "int", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UnsTagReference", x => x.UnsTagReferenceRowId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "VirtualTag",
+                columns: table => new
+                {
+                    VirtualTagRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    VirtualTagId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    EquipmentId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    DataType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    ScriptId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ChangeTriggered = table.Column<bool>(type: "bit", nullable: false),
+                    TimerIntervalMs = table.Column<int>(type: "int", nullable: true),
+                    Historize = table.Column<bool>(type: "bit", nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_VirtualTag", x => x.VirtualTagRowId);
+                    table.CheckConstraint("CK_VirtualTag_TimerInterval_Min", "TimerIntervalMs IS NULL OR TimerIntervalMs >= 50");
+                    table.CheckConstraint("CK_VirtualTag_Trigger_AtLeastOne", "ChangeTriggered = 1 OR TimerIntervalMs IS NOT NULL");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ClusterNode",
+                columns: table => new
+                {
+                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Host = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: false),
+                    OpcUaPort = table.Column<int>(type: "int", nullable: false),
+                    DashboardPort = table.Column<int>(type: "int", nullable: false),
+                    ApplicationUri = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
+                    ServiceLevelBase = table.Column<byte>(type: "tinyint", nullable: false),
+                    DriverConfigOverridesJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    LastSeenAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ClusterNode", x => x.NodeId);
+                    table.ForeignKey(
+                        name: "FK_ClusterNode_ServerCluster_ClusterId",
+                        column: x => x.ClusterId,
+                        principalTable: "ServerCluster",
+                        principalColumn: "ClusterId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "DriverInstance",
+                columns: table => new
+                {
+                    DriverInstanceRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    DriverInstanceId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    RawFolderId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    DriverType = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    DriverConfig = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    ResilienceConfig = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DriverInstance", x => x.DriverInstanceRowId);
+                    table.CheckConstraint("CK_DriverInstance_DriverConfig_IsJson", "ISJSON(DriverConfig) = 1");
+                    table.CheckConstraint("CK_DriverInstance_ResilienceConfig_IsJson", "ResilienceConfig IS NULL OR ISJSON(ResilienceConfig) = 1");
+                    table.ForeignKey(
+                        name: "FK_DriverInstance_ServerCluster_ClusterId",
+                        column: x => x.ClusterId,
+                        principalTable: "ServerCluster",
+                        principalColumn: "ClusterId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "LdapGroupRoleMapping",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LdapGroup = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
+                    Role = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    IsSystemWide = table.Column<bool>(type: "bit", nullable: false),
+                    CreatedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LdapGroupRoleMapping", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_LdapGroupRoleMapping_ServerCluster_ClusterId",
+                        column: x => x.ClusterId,
+                        principalTable: "ServerCluster",
+                        principalColumn: "ClusterId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "RawFolder",
+                columns: table => new
+                {
+                    RawFolderRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    RawFolderId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    ParentRawFolderId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    SortOrder = table.Column<int>(type: "int", nullable: false),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RawFolder", x => x.RawFolderRowId);
+                    table.ForeignKey(
+                        name: "FK_RawFolder_ServerCluster_ClusterId",
+                        column: x => x.ClusterId,
+                        principalTable: "ServerCluster",
+                        principalColumn: "ClusterId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "UnsArea",
+                columns: table => new
+                {
+                    UnsAreaRowId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    UnsAreaId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    ClusterId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UnsArea", x => x.UnsAreaRowId);
+                    table.ForeignKey(
+                        name: "FK_UnsArea_ServerCluster_ClusterId",
+                        column: x => x.ClusterId,
+                        principalTable: "ServerCluster",
+                        principalColumn: "ClusterId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ClusterNodeCredential",
+                columns: table => new
+                {
+                    CredentialId = table.Column<Guid>(type: "uniqueidentifier", nullable: false, defaultValueSql: "NEWSEQUENTIALID()"),
+                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    Kind = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false),
+                    Value = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    RotatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    CreatedBy = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ClusterNodeCredential", x => x.CredentialId);
+                    table.ForeignKey(
+                        name: "FK_ClusterNodeCredential_ClusterNode_NodeId",
+                        column: x => x.NodeId,
+                        principalTable: "ClusterNode",
+                        principalColumn: "NodeId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "NodeDeploymentState",
+                columns: table => new
+                {
+                    NodeId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    DeploymentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    StartedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: false, defaultValueSql: "SYSUTCDATETIME()"),
+                    AppliedAtUtc = table.Column<DateTime>(type: "datetime2(3)", nullable: true),
+                    FailureReason = table.Column<string>(type: "nvarchar(2048)", maxLength: 2048, nullable: true),
+                    RowVersion = table.Column<byte[]>(type: "rowversion", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_NodeDeploymentState", x => new { x.NodeId, x.DeploymentId });
+                    table.ForeignKey(
+                        name: "FK_NodeDeploymentState_ClusterNode_NodeId",
+                        column: x => x.NodeId,
+                        principalTable: "ClusterNode",
+                        principalColumn: "NodeId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_NodeDeploymentState_Deployment_DeploymentId",
+                        column: x => x.DeploymentId,
+                        principalTable: "Deployment",
+                        principalColumn: "DeploymentId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ClusterNode_ClusterId",
+                table: "ClusterNode",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ClusterNode_ApplicationUri",
+                table: "ClusterNode",
+                column: "ApplicationUri",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ClusterNodeCredential_NodeId",
+                table: "ClusterNodeCredential",
+                columns: new[] { "NodeId", "Enabled" });
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ClusterNodeCredential_Value",
+                table: "ClusterNodeCredential",
+                columns: new[] { "Kind", "Value" },
+                unique: true,
+                filter: "[Enabled] = 1");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ConfigAuditLog_Cluster_Time",
+                table: "ConfigAuditLog",
+                columns: new[] { "ClusterId", "Timestamp" },
+                descending: new[] { false, true });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ConfigAuditLog_Generation",
+                table: "ConfigAuditLog",
+                column: "GenerationId",
+                filter: "[GenerationId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ConfigAuditLog_EventId",
+                table: "ConfigAuditLog",
+                column: "EventId",
+                unique: true,
+                filter: "[EventId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ConfigEdit_EditedAt",
+                table: "ConfigEdit",
+                column: "EditedAtUtc");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ConfigEdit_Entity",
+                table: "ConfigEdit",
+                columns: new[] { "EntityType", "EntityId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ConfigEdit_Execution",
+                table: "ConfigEdit",
+                column: "ExecutionId",
+                filter: "[ExecutionId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Deployment_CreatedAt",
+                table: "Deployment",
+                column: "CreatedAtUtc");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Deployment_Status",
+                table: "Deployment",
+                column: "Status");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Device_Driver",
+                table: "Device",
+                column: "DriverInstanceId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Device_Driver_Name",
+                table: "Device",
+                columns: new[] { "DriverInstanceId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Device_LogicalId",
+                table: "Device",
+                column: "DeviceId",
+                unique: true,
+                filter: "[DeviceId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DriverHostStatus_LastSeen",
+                table: "DriverHostStatus",
+                column: "LastSeenUtc");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DriverHostStatus_Node",
+                table: "DriverHostStatus",
+                column: "NodeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DriverInstance_Cluster",
+                table: "DriverInstance",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DriverInstance_RawFolder",
+                table: "DriverInstance",
+                column: "RawFolderId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_DriverInstance_ClusterRoot_Name",
+                table: "DriverInstance",
+                columns: new[] { "ClusterId", "Name" },
+                unique: true,
+                filter: "[RawFolderId] IS NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_DriverInstance_Folder_Name",
+                table: "DriverInstance",
+                columns: new[] { "ClusterId", "RawFolderId", "Name" },
+                unique: true,
+                filter: "[RawFolderId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_DriverInstance_LogicalId",
+                table: "DriverInstance",
+                column: "DriverInstanceId",
+                unique: true,
+                filter: "[DriverInstanceId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_DriverResilience_LastSampled",
+                table: "DriverInstanceResilienceStatus",
+                column: "LastSampledUtc");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Equipment_Line",
+                table: "Equipment",
+                column: "UnsLineId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Equipment_MachineCode",
+                table: "Equipment",
+                column: "MachineCode");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Equipment_SAPID",
+                table: "Equipment",
+                column: "SAPID",
+                filter: "[SAPID] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Equipment_ZTag",
+                table: "Equipment",
+                column: "ZTag",
+                filter: "[ZTag] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Equipment_LinePath",
+                table: "Equipment",
+                columns: new[] { "UnsLineId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Equipment_LogicalId",
+                table: "Equipment",
+                column: "EquipmentId",
+                unique: true,
+                filter: "[EquipmentId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Equipment_Uuid",
+                table: "Equipment",
+                column: "EquipmentUuid",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ExternalIdReservation_Equipment",
+                table: "ExternalIdReservation",
+                column: "EquipmentUuid");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ExternalIdReservation_KindValue_Active",
+                table: "ExternalIdReservation",
+                columns: new[] { "Kind", "Value" },
+                unique: true,
+                filter: "[ReleasedAt] IS NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LdapGroupRoleMapping_ClusterId",
+                table: "LdapGroupRoleMapping",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LdapGroupRoleMapping_Group",
+                table: "LdapGroupRoleMapping",
+                column: "LdapGroup");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_LdapGroupRoleMapping_Group_Cluster",
+                table: "LdapGroupRoleMapping",
+                columns: new[] { "LdapGroup", "ClusterId" },
+                unique: true,
+                filter: "[ClusterId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NodeAcl_Cluster",
+                table: "NodeAcl",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NodeAcl_Group",
+                table: "NodeAcl",
+                column: "LdapGroup");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NodeAcl_Scope",
+                table: "NodeAcl",
+                columns: new[] { "ScopeKind", "ScopeId" },
+                filter: "[ScopeId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_NodeAcl_GroupScope",
+                table: "NodeAcl",
+                columns: new[] { "ClusterId", "LdapGroup", "ScopeKind", "ScopeId" },
+                unique: true,
+                filter: "[ScopeId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_NodeAcl_LogicalId",
+                table: "NodeAcl",
+                column: "NodeAclId",
+                unique: true,
+                filter: "[NodeAclId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NodeDeploymentState_Deployment",
+                table: "NodeDeploymentState",
+                column: "DeploymentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_NodeDeploymentState_Status",
+                table: "NodeDeploymentState",
+                column: "Status");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PollGroup_Driver",
+                table: "PollGroup",
+                column: "DriverInstanceId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_PollGroup_LogicalId",
+                table: "PollGroup",
+                column: "PollGroupId",
+                unique: true,
+                filter: "[PollGroupId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RawFolder_Cluster",
+                table: "RawFolder",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_RawFolder_ClusterRoot_Name",
+                table: "RawFolder",
+                columns: new[] { "ClusterId", "Name" },
+                unique: true,
+                filter: "[ParentRawFolderId] IS NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_RawFolder_LogicalId",
+                table: "RawFolder",
+                column: "RawFolderId",
+                unique: true,
+                filter: "[RawFolderId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_RawFolder_Parent_Name",
+                table: "RawFolder",
+                columns: new[] { "ClusterId", "ParentRawFolderId", "Name" },
+                unique: true,
+                filter: "[ParentRawFolderId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Script_SourceHash",
+                table: "Script",
+                column: "SourceHash");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Script_LogicalId",
+                table: "Script",
+                column: "ScriptId",
+                unique: true,
+                filter: "[ScriptId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ScriptedAlarm_Script",
+                table: "ScriptedAlarm",
+                column: "PredicateScriptId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ScriptedAlarm_EquipmentPath",
+                table: "ScriptedAlarm",
+                columns: new[] { "EquipmentId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ScriptedAlarm_LogicalId",
+                table: "ScriptedAlarm",
+                column: "ScriptedAlarmId",
+                unique: true,
+                filter: "[ScriptedAlarmId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServerCluster_Site",
+                table: "ServerCluster",
+                column: "Site");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_ServerCluster_Name",
+                table: "ServerCluster",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Tag_Device",
+                table: "Tag",
+                columns: new[] { "DeviceId", "TagGroupId" });
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Tag_Device_Name",
+                table: "Tag",
+                columns: new[] { "DeviceId", "Name" },
+                unique: true,
+                filter: "[TagGroupId] IS NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Tag_Group_Name",
+                table: "Tag",
+                columns: new[] { "DeviceId", "TagGroupId", "Name" },
+                unique: true,
+                filter: "[TagGroupId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_Tag_LogicalId",
+                table: "Tag",
+                column: "TagId",
+                unique: true,
+                filter: "[TagId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TagGroup_Device",
+                table: "TagGroup",
+                column: "DeviceId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_TagGroup_DeviceRoot_Name",
+                table: "TagGroup",
+                columns: new[] { "DeviceId", "Name" },
+                unique: true,
+                filter: "[ParentTagGroupId] IS NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_TagGroup_LogicalId",
+                table: "TagGroup",
+                column: "TagGroupId",
+                unique: true,
+                filter: "[TagGroupId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_TagGroup_Parent_Name",
+                table: "TagGroup",
+                columns: new[] { "DeviceId", "ParentTagGroupId", "Name" },
+                unique: true,
+                filter: "[ParentTagGroupId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UnsArea_Cluster",
+                table: "UnsArea",
+                column: "ClusterId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsArea_ClusterName",
+                table: "UnsArea",
+                columns: new[] { "ClusterId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsArea_LogicalId",
+                table: "UnsArea",
+                column: "UnsAreaId",
+                unique: true,
+                filter: "[UnsAreaId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UnsLine_Area",
+                table: "UnsLine",
+                column: "UnsAreaId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsLine_AreaName",
+                table: "UnsLine",
+                columns: new[] { "UnsAreaId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsLine_LogicalId",
+                table: "UnsLine",
+                column: "UnsLineId",
+                unique: true,
+                filter: "[UnsLineId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UnsTagReference_Equipment",
+                table: "UnsTagReference",
+                column: "EquipmentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UnsTagReference_Tag",
+                table: "UnsTagReference",
+                column: "TagId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsTagReference_Equip_Tag",
+                table: "UnsTagReference",
+                columns: new[] { "EquipmentId", "TagId" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_UnsTagReference_LogicalId",
+                table: "UnsTagReference",
+                column: "UnsTagReferenceId",
+                unique: true,
+                filter: "[UnsTagReferenceId] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_VirtualTag_Script",
+                table: "VirtualTag",
+                column: "ScriptId");
+
+            migrationBuilder.CreateIndex(
+                name: "UX_VirtualTag_EquipmentPath",
+                table: "VirtualTag",
+                columns: new[] { "EquipmentId", "Name" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "UX_VirtualTag_LogicalId",
+                table: "VirtualTag",
+                column: "VirtualTagId",
+                unique: true,
+                filter: "[VirtualTagId] IS NOT NULL");
+
+            // Hand-authored SQL squashed in from the retired per-migration proc + grant files
+            // (see V3Initial.StoredProcedures.cs for the full rationale + the v3 rewrites).
+            CreateStoredProcedures(migrationBuilder);
+            CreateAuthorizationGrants(migrationBuilder);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            DropAuthorizationGrants(migrationBuilder);
+            DropStoredProcedures(migrationBuilder);
+
+            migrationBuilder.DropTable(
+                name: "ClusterNodeCredential");
+
+            migrationBuilder.DropTable(
+                name: "ConfigAuditLog");
+
+            migrationBuilder.DropTable(
+                name: "ConfigEdit");
+
+            migrationBuilder.DropTable(
+                name: "DataProtectionKeys");
+
+            migrationBuilder.DropTable(
+                name: "Device");
+
+            migrationBuilder.DropTable(
+                name: "DriverHostStatus");
+
+            migrationBuilder.DropTable(
+                name: "DriverInstance");
+
+            migrationBuilder.DropTable(
+                name: "DriverInstanceResilienceStatus");
+
+            migrationBuilder.DropTable(
+                name: "Equipment");
+
+            migrationBuilder.DropTable(
+                name: "ExternalIdReservation");
+
+            migrationBuilder.DropTable(
+                name: "LdapGroupRoleMapping");
+
+            migrationBuilder.DropTable(
+                name: "NodeAcl");
+
+            migrationBuilder.DropTable(
+                name: "NodeDeploymentState");
+
+            migrationBuilder.DropTable(
+                name: "PollGroup");
+
+            migrationBuilder.DropTable(
+                name: "RawFolder");
+
+            migrationBuilder.DropTable(
+                name: "Script");
+
+            migrationBuilder.DropTable(
+                name: "ScriptedAlarm");
+
+            migrationBuilder.DropTable(
+                name: "ScriptedAlarmState");
+
+            migrationBuilder.DropTable(
+                name: "Tag");
+
+            migrationBuilder.DropTable(
+                name: "TagGroup");
+
+            migrationBuilder.DropTable(
+                name: "UnsArea");
+
+            migrationBuilder.DropTable(
+                name: "UnsLine");
+
+            migrationBuilder.DropTable(
+                name: "UnsTagReference");
+
+            migrationBuilder.DropTable(
+                name: "VirtualTag");
+
+            migrationBuilder.DropTable(
+                name: "ClusterNode");
+
+            migrationBuilder.DropTable(
+                name: "Deployment");
+
+            migrationBuilder.DropTable(
+                name: "ServerCluster");
+        }
+    }
+}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/OtOpcUaConfigDbContextModelSnapshot.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/OtOpcUaConfigDbContextModelSnapshot.cs
index 0d9924f3..b5522bd5 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/OtOpcUaConfigDbContextModelSnapshot.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Migrations/OtOpcUaConfigDbContextModelSnapshot.cs
@@ -373,6 +373,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.HasIndex("DriverInstanceId")
                         .HasDatabaseName("IX_Device_Driver");
 
+                    b.HasIndex("DriverInstanceId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_Device_Driver_Name");
+
                     b.ToTable("Device", null, t =>
                         {
                             t.HasCheckConstraint("CK_Device_DeviceConfig_IsJson", "ISJSON(DeviceConfig) = 1");
@@ -452,8 +456,7 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(128)
                         .HasColumnType("nvarchar(128)");
 
-                    b.Property<string>("NamespaceId")
-                        .IsRequired()
+                    b.Property<string>("RawFolderId")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
@@ -476,8 +479,18 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasDatabaseName("UX_DriverInstance_LogicalId")
                         .HasFilter("[DriverInstanceId] IS NOT NULL");
 
-                    b.HasIndex("NamespaceId")
-                        .HasDatabaseName("IX_DriverInstance_Namespace");
+                    b.HasIndex("RawFolderId")
+                        .HasDatabaseName("IX_DriverInstance_RawFolder");
+
+                    b.HasIndex("ClusterId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_DriverInstance_ClusterRoot_Name")
+                        .HasFilter("[RawFolderId] IS NULL");
+
+                    b.HasIndex("ClusterId", "RawFolderId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_DriverInstance_Folder_Name")
+                        .HasFilter("[RawFolderId] IS NOT NULL");
 
                     b.ToTable("DriverInstance", null, t =>
                         {
@@ -537,18 +550,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasMaxLength(256)
                         .HasColumnType("nvarchar(256)");
 
-                    b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<string>("DeviceManualUri")
                         .HasMaxLength(512)
                         .HasColumnType("nvarchar(512)");
 
-                    b.Property<string>("DriverInstanceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("Enabled")
                         .HasColumnType("bit");
 
@@ -621,9 +626,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 
                     b.HasKey("EquipmentRowId");
 
-                    b.HasIndex("DriverInstanceId")
-                        .HasDatabaseName("IX_Equipment_Driver");
-
                     b.HasIndex("EquipmentId")
                         .IsUnique()
                         .HasDatabaseName("UX_Equipment_LogicalId")
@@ -654,148 +656,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("Equipment", (string)null);
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<string>("CreatedBy")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<DateTime?>("FinalisedAtUtc")
-                        .HasColumnType("datetime2(3)");
-
-                    b.Property<int>("RowsAccepted")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsRejected")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RowsStaged")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CreatedBy", "FinalisedAtUtc")
-                        .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-
-                    b.ToTable("EquipmentImportBatch", (string)null);
-                });
-
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("AssetLocation")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<Guid>("BatchId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("DeviceManualUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("EquipmentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("EquipmentUuid")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("HardwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("IsAccepted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("LineNumberInFile")
-                        .HasColumnType("int");
-
-                    b.Property<string>("MachineCode")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Manufacturer")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("ManufacturerUri")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("Model")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("RejectReason")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
-                    b.Property<string>("SAPID")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("SerialNumber")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("SoftwareRevision")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsAreaName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("UnsLineName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("YearOfConstruction")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("ZTag")
-                        .IsRequired()
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BatchId")
-                        .HasDatabaseName("IX_EquipmentImportRow_Batch");
-
-                    b.ToTable("EquipmentImportRow", (string)null);
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ExternalIdReservation", b =>
                 {
                     b.Property<Guid>("ReservationId")
@@ -905,66 +765,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("LdapGroupRoleMapping", (string)null);
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.Property<Guid>("NamespaceRowId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier")
-                        .HasDefaultValueSql("NEWSEQUENTIALID()");
-
-                    b.Property<string>("ClusterId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<bool>("Enabled")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Kind")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("nvarchar(32)");
-
-                    b.Property<string>("NamespaceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("NamespaceUri")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)");
-
-                    b.Property<byte[]>("RowVersion")
-                        .IsConcurrencyToken()
-                        .IsRequired()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("rowversion");
-
-                    b.HasKey("NamespaceRowId");
-
-                    b.HasIndex("ClusterId")
-                        .HasDatabaseName("IX_Namespace_Cluster");
-
-                    b.HasIndex("NamespaceId")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_LogicalId")
-                        .HasFilter("[NamespaceId] IS NOT NULL");
-
-                    b.HasIndex("NamespaceUri")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_NamespaceUri");
-
-                    b.HasIndex("ClusterId", "Kind")
-                        .IsUnique()
-                        .HasDatabaseName("UX_Namespace_Cluster_Kind");
-
-                    b.ToTable("Namespace", (string)null);
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeAcl", b =>
                 {
                     b.Property<Guid>("NodeAclRowId")
@@ -1120,6 +920,63 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         });
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.RawFolder", b =>
+                {
+                    b.Property<Guid>("RawFolderRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("ClusterId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentRawFolderId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("RawFolderId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.HasKey("RawFolderRowId");
+
+                    b.HasIndex("ClusterId")
+                        .HasDatabaseName("IX_RawFolder_Cluster");
+
+                    b.HasIndex("RawFolderId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_LogicalId")
+                        .HasFilter("[RawFolderId] IS NOT NULL");
+
+                    b.HasIndex("ClusterId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_ClusterRoot_Name")
+                        .HasFilter("[ParentRawFolderId] IS NULL");
+
+                    b.HasIndex("ClusterId", "ParentRawFolderId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_RawFolder_Parent_Name")
+                        .HasFilter("[ParentRawFolderId] IS NOT NULL");
+
+                    b.ToTable("RawFolder", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Script", b =>
                 {
                     b.Property<Guid>("ScriptRowId")
@@ -1399,22 +1256,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .HasColumnType("nvarchar(32)");
 
                     b.Property<string>("DeviceId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("DriverInstanceId")
                         .IsRequired()
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("EquipmentId")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("FolderPath")
-                        .HasMaxLength(512)
-                        .HasColumnType("nvarchar(512)");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(128)
@@ -1434,6 +1279,10 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("TagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("TagId")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -1443,27 +1292,23 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
 
                     b.HasKey("TagRowId");
 
-                    b.HasIndex("EquipmentId")
-                        .HasDatabaseName("IX_Tag_Equipment")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
-
                     b.HasIndex("TagId")
                         .IsUnique()
                         .HasDatabaseName("UX_Tag_LogicalId")
                         .HasFilter("[TagId] IS NOT NULL");
 
-                    b.HasIndex("DriverInstanceId", "DeviceId")
-                        .HasDatabaseName("IX_Tag_Driver_Device");
-
-                    b.HasIndex("EquipmentId", "Name")
+                    b.HasIndex("DeviceId", "Name")
                         .IsUnique()
-                        .HasDatabaseName("UX_Tag_EquipmentPath")
-                        .HasFilter("[EquipmentId] IS NOT NULL");
+                        .HasDatabaseName("UX_Tag_Device_Name")
+                        .HasFilter("[TagGroupId] IS NULL");
 
-                    b.HasIndex("DriverInstanceId", "FolderPath", "Name")
+                    b.HasIndex("DeviceId", "TagGroupId")
+                        .HasDatabaseName("IX_Tag_Device");
+
+                    b.HasIndex("DeviceId", "TagGroupId", "Name")
                         .IsUnique()
-                        .HasDatabaseName("UX_Tag_FolderPath")
-                        .HasFilter("[EquipmentId] IS NULL");
+                        .HasDatabaseName("UX_Tag_Group_Name")
+                        .HasFilter("[TagGroupId] IS NOT NULL");
 
                     b.ToTable("Tag", null, t =>
                         {
@@ -1471,6 +1316,63 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                         });
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.TagGroup", b =>
+                {
+                    b.Property<Guid>("TagGroupRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ParentTagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TagGroupId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.HasKey("TagGroupRowId");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("IX_TagGroup_Device");
+
+                    b.HasIndex("TagGroupId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_LogicalId")
+                        .HasFilter("[TagGroupId] IS NOT NULL");
+
+                    b.HasIndex("DeviceId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_DeviceRoot_Name")
+                        .HasFilter("[ParentTagGroupId] IS NULL");
+
+                    b.HasIndex("DeviceId", "ParentTagGroupId", "Name")
+                        .IsUnique()
+                        .HasDatabaseName("UX_TagGroup_Parent_Name")
+                        .HasFilter("[ParentTagGroupId] IS NOT NULL");
+
+                    b.ToTable("TagGroup", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
                 {
                     b.Property<Guid>("UnsAreaRowId")
@@ -1567,6 +1469,60 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.ToTable("UnsLine", (string)null);
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsTagReference", b =>
+                {
+                    b.Property<Guid>("UnsTagReferenceRowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier")
+                        .HasDefaultValueSql("NEWSEQUENTIALID()");
+
+                    b.Property<string>("DisplayNameOverride")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("EquipmentId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<byte[]>("RowVersion")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("rowversion");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TagId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("UnsTagReferenceId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.HasKey("UnsTagReferenceRowId");
+
+                    b.HasIndex("EquipmentId")
+                        .HasDatabaseName("IX_UnsTagReference_Equipment");
+
+                    b.HasIndex("TagId")
+                        .HasDatabaseName("IX_UnsTagReference_Tag");
+
+                    b.HasIndex("UnsTagReferenceId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_UnsTagReference_LogicalId")
+                        .HasFilter("[UnsTagReferenceId] IS NOT NULL");
+
+                    b.HasIndex("EquipmentId", "TagId")
+                        .IsUnique()
+                        .HasDatabaseName("UX_UnsTagReference_Equip_Tag");
+
+                    b.ToTable("UnsTagReference", (string)null);
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.VirtualTag", b =>
                 {
                     b.Property<Guid>("VirtualTagRowId")
@@ -1671,17 +1627,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Cluster");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportRow", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", "Batch")
-                        .WithMany("Rows")
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.LdapGroupRoleMapping", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
@@ -1692,17 +1637,6 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Cluster");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Namespace", b =>
-                {
-                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
-                        .WithMany("Namespaces")
-                        .HasForeignKey("ClusterId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Cluster");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.NodeDeploymentState", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.Deployment", "Deployment")
@@ -1722,6 +1656,15 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Node");
                 });
 
+            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.RawFolder", b =>
+                {
+                    b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", null)
+                        .WithMany("RawFolders")
+                        .HasForeignKey("ClusterId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.UnsArea", b =>
                 {
                     b.HasOne("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", "Cluster")
@@ -1738,16 +1681,11 @@ namespace ZB.MOM.WW.OtOpcUa.Configuration.Migrations
                     b.Navigation("Credentials");
                 });
 
-            modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.EquipmentImportBatch", b =>
-                {
-                    b.Navigation("Rows");
-                });
-
             modelBuilder.Entity("ZB.MOM.WW.OtOpcUa.Configuration.Entities.ServerCluster", b =>
                 {
-                    b.Navigation("Namespaces");
-
                     b.Navigation("Nodes");
+
+                    b.Navigation("RawFolders");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs
index dbc97b3e..defa00de 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs
@@ -18,8 +18,12 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
     public DbSet<ClusterNode> ClusterNodes => Set<ClusterNode>();
     /// <summary>Gets the DbSet of cluster node credentials.</summary>
     public DbSet<ClusterNodeCredential> ClusterNodeCredentials => Set<ClusterNodeCredential>();
-    /// <summary>Gets the DbSet of namespaces.</summary>
-    public DbSet<Namespace> Namespaces => Set<Namespace>();
+    /// <summary>Gets the DbSet of v3 Raw-tree driver-organizing folders.</summary>
+    public DbSet<RawFolder> RawFolders => Set<RawFolder>();
+    /// <summary>Gets the DbSet of v3 Raw-tree tag groups (nestable under a device).</summary>
+    public DbSet<TagGroup> TagGroups => Set<TagGroup>();
+    /// <summary>Gets the DbSet of v3 UNS tag references (equipment → raw tag projection).</summary>
+    public DbSet<UnsTagReference> UnsTagReferences => Set<UnsTagReference>();
     /// <summary>Gets the DbSet of UNS areas.</summary>
     public DbSet<UnsArea> UnsAreas => Set<UnsArea>();
     /// <summary>Gets the DbSet of UNS lines.</summary>
@@ -46,10 +50,6 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
     public DbSet<DriverInstanceResilienceStatus> DriverInstanceResilienceStatuses => Set<DriverInstanceResilienceStatus>();
     /// <summary>Gets the DbSet of LDAP group role mappings.</summary>
     public DbSet<LdapGroupRoleMapping> LdapGroupRoleMappings => Set<LdapGroupRoleMapping>();
-    /// <summary>Gets the DbSet of equipment import batches.</summary>
-    public DbSet<EquipmentImportBatch> EquipmentImportBatches => Set<EquipmentImportBatch>();
-    /// <summary>Gets the DbSet of equipment import rows.</summary>
-    public DbSet<EquipmentImportRow> EquipmentImportRows => Set<EquipmentImportRow>();
     /// <summary>Gets the DbSet of scripts.</summary>
     public DbSet<Script> Scripts => Set<Script>();
     /// <summary>Gets the DbSet of virtual tags.</summary>
@@ -79,13 +79,15 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
         ConfigureServerCluster(modelBuilder);
         ConfigureClusterNode(modelBuilder);
         ConfigureClusterNodeCredential(modelBuilder);
-        ConfigureNamespace(modelBuilder);
+        ConfigureRawFolder(modelBuilder);
         ConfigureUnsArea(modelBuilder);
         ConfigureUnsLine(modelBuilder);
         ConfigureDriverInstance(modelBuilder);
         ConfigureDevice(modelBuilder);
+        ConfigureTagGroup(modelBuilder);
         ConfigureEquipment(modelBuilder);
         ConfigureTag(modelBuilder);
+        ConfigureUnsTagReference(modelBuilder);
         ConfigurePollGroup(modelBuilder);
         ConfigureNodeAcl(modelBuilder);
         ConfigureConfigAuditLog(modelBuilder);
@@ -93,7 +95,6 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
         ConfigureDriverHostStatus(modelBuilder);
         ConfigureDriverInstanceResilienceStatus(modelBuilder);
         ConfigureLdapGroupRoleMapping(modelBuilder);
-        ConfigureEquipmentImportBatch(modelBuilder);
         ConfigureScript(modelBuilder);
         ConfigureVirtualTag(modelBuilder);
         ConfigureScriptedAlarm(modelBuilder);
@@ -183,32 +184,39 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
         });
     }
 
-    private static void ConfigureNamespace(ModelBuilder modelBuilder)
+    private static void ConfigureRawFolder(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<Namespace>(e =>
+        modelBuilder.Entity<RawFolder>(e =>
         {
-            e.ToTable("Namespace");
-            e.HasKey(x => x.NamespaceRowId);
-            e.Property(x => x.NamespaceRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
-            e.Property(x => x.NamespaceId).HasMaxLength(64);
+            e.ToTable("RawFolder");
+            e.HasKey(x => x.RawFolderRowId);
+            e.Property(x => x.RawFolderRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
+            e.Property(x => x.RawFolderId).HasMaxLength(64);
             e.Property(x => x.ClusterId).HasMaxLength(64);
-            e.Property(x => x.Kind).HasConversion<string>().HasMaxLength(32);
-            e.Property(x => x.NamespaceUri).HasMaxLength(256);
-            e.Property(x => x.Notes).HasMaxLength(1024);
+            e.Property(x => x.ParentRawFolderId).HasMaxLength(64);
+            e.Property(x => x.Name).HasMaxLength(128);
             e.Property(x => x.RowVersion).IsRowVersion();
 
-            e.HasOne(x => x.Cluster).WithMany(c => c.Namespaces)
+            // Cluster-rooted. Restrict so a cluster with folders cannot be deleted out from under
+            // them (matches the OnDelete(Restrict) convention across the config schema). Child FKs
+            // (DriverInstance.RawFolderId, RawFolder.ParentRawFolderId) are logical-only, so
+            // non-empty-folder-delete is enforced at the service layer in later batches.
+            e.HasOne<ServerCluster>().WithMany(c => c.RawFolders)
                 .HasForeignKey(x => x.ClusterId)
                 .OnDelete(DeleteBehavior.Restrict);
 
-            e.HasIndex(x => new { x.ClusterId, x.Kind }).IsUnique()
-                .HasDatabaseName("UX_Namespace_Cluster_Kind");
-            e.HasIndex(x => x.NamespaceUri).IsUnique()
-                .HasDatabaseName("UX_Namespace_NamespaceUri");
-            e.HasIndex(x => x.NamespaceId).IsUnique()
-                .HasDatabaseName("UX_Namespace_LogicalId");
-            e.HasIndex(x => x.ClusterId)
-                .HasDatabaseName("IX_Namespace_Cluster");
+            e.HasIndex(x => x.RawFolderId).IsUnique().HasDatabaseName("UX_RawFolder_LogicalId");
+            e.HasIndex(x => x.ClusterId).HasDatabaseName("IX_RawFolder_Cluster");
+
+            // Sibling-name uniqueness. Two filtered indexes cover the nullable ParentRawFolderId:
+            // one for nested folders (Parent NOT NULL), one for cluster-root folders (Parent NULL),
+            // mirroring the Tag filtered-index convention.
+            e.HasIndex(x => new { x.ClusterId, x.ParentRawFolderId, x.Name }).IsUnique()
+                .HasFilter("[ParentRawFolderId] IS NOT NULL")
+                .HasDatabaseName("UX_RawFolder_Parent_Name");
+            e.HasIndex(x => new { x.ClusterId, x.Name }).IsUnique()
+                .HasFilter("[ParentRawFolderId] IS NULL")
+                .HasDatabaseName("UX_RawFolder_ClusterRoot_Name");
         });
     }
 
@@ -267,7 +275,7 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
             e.Property(x => x.DriverInstanceRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
             e.Property(x => x.DriverInstanceId).HasMaxLength(64);
             e.Property(x => x.ClusterId).HasMaxLength(64);
-            e.Property(x => x.NamespaceId).HasMaxLength(64);
+            e.Property(x => x.RawFolderId).HasMaxLength(64);
             e.Property(x => x.Name).HasMaxLength(128);
             e.Property(x => x.DriverType).HasMaxLength(32);
             e.Property(x => x.DriverConfig).HasColumnType("nvarchar(max)");
@@ -277,8 +285,18 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
             e.HasOne(x => x.Cluster).WithMany().HasForeignKey(x => x.ClusterId).OnDelete(DeleteBehavior.Restrict);
 
             e.HasIndex(x => x.ClusterId).HasDatabaseName("IX_DriverInstance_Cluster");
-            e.HasIndex(x => x.NamespaceId).HasDatabaseName("IX_DriverInstance_Namespace");
+            e.HasIndex(x => x.RawFolderId).HasDatabaseName("IX_DriverInstance_RawFolder");
             e.HasIndex(x => x.DriverInstanceId).IsUnique().HasDatabaseName("UX_DriverInstance_LogicalId");
+
+            // v3 sibling-name uniqueness (a RawPath segment). Two filtered indexes cover the nullable
+            // RawFolderId: nested drivers keyed by (ClusterId, RawFolderId, Name), cluster-root drivers
+            // by (ClusterId, Name).
+            e.HasIndex(x => new { x.ClusterId, x.RawFolderId, x.Name }).IsUnique()
+                .HasFilter("[RawFolderId] IS NOT NULL")
+                .HasDatabaseName("UX_DriverInstance_Folder_Name");
+            e.HasIndex(x => new { x.ClusterId, x.Name }).IsUnique()
+                .HasFilter("[RawFolderId] IS NULL")
+                .HasDatabaseName("UX_DriverInstance_ClusterRoot_Name");
         });
     }
 
@@ -300,6 +318,38 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
 
             e.HasIndex(x => x.DriverInstanceId).HasDatabaseName("IX_Device_Driver");
             e.HasIndex(x => x.DeviceId).IsUnique().HasDatabaseName("UX_Device_LogicalId");
+            // v3 sibling-name uniqueness within a driver (a RawPath segment).
+            e.HasIndex(x => new { x.DriverInstanceId, x.Name }).IsUnique()
+                .HasDatabaseName("UX_Device_Driver_Name");
+        });
+    }
+
+    private static void ConfigureTagGroup(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<TagGroup>(e =>
+        {
+            e.ToTable("TagGroup");
+            e.HasKey(x => x.TagGroupRowId);
+            e.Property(x => x.TagGroupRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
+            e.Property(x => x.TagGroupId).HasMaxLength(64);
+            e.Property(x => x.DeviceId).HasMaxLength(64);
+            e.Property(x => x.ParentTagGroupId).HasMaxLength(64);
+            e.Property(x => x.Name).HasMaxLength(128);
+            e.Property(x => x.RowVersion).IsRowVersion();
+
+            e.HasIndex(x => x.TagGroupId).IsUnique().HasDatabaseName("UX_TagGroup_LogicalId");
+            e.HasIndex(x => x.DeviceId).HasDatabaseName("IX_TagGroup_Device");
+
+            // Sibling-name uniqueness. Two filtered indexes cover the nullable ParentTagGroupId:
+            // nested groups keyed by (DeviceId, ParentTagGroupId, Name), device-root groups by
+            // (DeviceId, Name). DeviceId/ParentTagGroupId are logical FKs (no navigation); non-empty
+            // group deletes are blocked at the service layer in later batches.
+            e.HasIndex(x => new { x.DeviceId, x.ParentTagGroupId, x.Name }).IsUnique()
+                .HasFilter("[ParentTagGroupId] IS NOT NULL")
+                .HasDatabaseName("UX_TagGroup_Parent_Name");
+            e.HasIndex(x => new { x.DeviceId, x.Name }).IsUnique()
+                .HasFilter("[ParentTagGroupId] IS NULL")
+                .HasDatabaseName("UX_TagGroup_DeviceRoot_Name");
         });
     }
 
@@ -311,8 +361,6 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
             e.HasKey(x => x.EquipmentRowId);
             e.Property(x => x.EquipmentRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
             e.Property(x => x.EquipmentId).HasMaxLength(64);
-            e.Property(x => x.DriverInstanceId).HasMaxLength(64);
-            e.Property(x => x.DeviceId).HasMaxLength(64);
             e.Property(x => x.UnsLineId).HasMaxLength(64);
             e.Property(x => x.Name).HasMaxLength(32);
             e.Property(x => x.MachineCode).HasMaxLength(64);
@@ -329,7 +377,6 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
             e.Property(x => x.EquipmentClassRef).HasMaxLength(128);
             e.Property(x => x.RowVersion).IsRowVersion();
 
-            e.HasIndex(x => x.DriverInstanceId).HasDatabaseName("IX_Equipment_Driver");
             e.HasIndex(x => x.UnsLineId).HasDatabaseName("IX_Equipment_Line");
             e.HasIndex(x => x.EquipmentId).IsUnique().HasDatabaseName("UX_Equipment_LogicalId");
             e.HasIndex(x => new { x.UnsLineId, x.Name }).IsUnique().HasDatabaseName("UX_Equipment_LinePath");
@@ -351,28 +398,29 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
             e.HasKey(x => x.TagRowId);
             e.Property(x => x.TagRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
             e.Property(x => x.TagId).HasMaxLength(64);
-            e.Property(x => x.DriverInstanceId).HasMaxLength(64);
-            e.Property(x => x.DeviceId).HasMaxLength(64);
-            e.Property(x => x.EquipmentId).HasMaxLength(64);
+            // v3: raw-only tag. Required DeviceId FK; nullable TagGroupId. EquipmentId/FolderPath/
+            // DriverInstanceId are retired — identity is the RawPath (device + optional group + name).
+            e.Property(x => x.DeviceId).HasMaxLength(64).IsRequired();
+            e.Property(x => x.TagGroupId).HasMaxLength(64);
             e.Property(x => x.Name).HasMaxLength(128);
-            e.Property(x => x.FolderPath).HasMaxLength(512);
             e.Property(x => x.DataType).HasMaxLength(32);
             e.Property(x => x.AccessLevel).HasConversion<string>().HasMaxLength(16);
             e.Property(x => x.PollGroupId).HasMaxLength(64);
             e.Property(x => x.TagConfig).HasColumnType("nvarchar(max)");
             e.Property(x => x.RowVersion).IsRowVersion();
 
-            e.HasIndex(x => new { x.DriverInstanceId, x.DeviceId }).HasDatabaseName("IX_Tag_Driver_Device");
-            e.HasIndex(x => x.EquipmentId)
-                .HasFilter("[EquipmentId] IS NOT NULL")
-                .HasDatabaseName("IX_Tag_Equipment");
+            e.HasIndex(x => new { x.DeviceId, x.TagGroupId }).HasDatabaseName("IX_Tag_Device");
             e.HasIndex(x => x.TagId).IsUnique().HasDatabaseName("UX_Tag_LogicalId");
-            e.HasIndex(x => new { x.EquipmentId, x.Name }).IsUnique()
-                .HasFilter("[EquipmentId] IS NOT NULL")
-                .HasDatabaseName("UX_Tag_EquipmentPath");
-            e.HasIndex(x => new { x.DriverInstanceId, x.FolderPath, x.Name }).IsUnique()
-                .HasFilter("[EquipmentId] IS NULL")
-                .HasDatabaseName("UX_Tag_FolderPath");
+
+            // Sibling-name uniqueness (a RawPath segment). Two filtered indexes cover the nullable
+            // TagGroupId: grouped tags keyed by (DeviceId, TagGroupId, Name), device-root tags by
+            // (DeviceId, Name).
+            e.HasIndex(x => new { x.DeviceId, x.TagGroupId, x.Name }).IsUnique()
+                .HasFilter("[TagGroupId] IS NOT NULL")
+                .HasDatabaseName("UX_Tag_Group_Name");
+            e.HasIndex(x => new { x.DeviceId, x.Name }).IsUnique()
+                .HasFilter("[TagGroupId] IS NULL")
+                .HasDatabaseName("UX_Tag_Device_Name");
         });
     }
 
@@ -567,51 +615,28 @@ public sealed class OtOpcUaConfigDbContext(DbContextOptions<OtOpcUaConfigDbConte
         });
     }
 
-    private static void ConfigureEquipmentImportBatch(ModelBuilder modelBuilder)
+    private static void ConfigureUnsTagReference(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<EquipmentImportBatch>(e =>
+        modelBuilder.Entity<UnsTagReference>(e =>
         {
-            e.ToTable("EquipmentImportBatch");
-            e.HasKey(x => x.Id);
-            e.Property(x => x.ClusterId).HasMaxLength(64);
-            e.Property(x => x.CreatedBy).HasMaxLength(128);
-            e.Property(x => x.CreatedAtUtc).HasColumnType("datetime2(3)");
-            e.Property(x => x.FinalisedAtUtc).HasColumnType("datetime2(3)");
-
-            // Admin preview modal filters by user; finalise / drop both hit this index.
-            e.HasIndex(x => new { x.CreatedBy, x.FinalisedAtUtc })
-                .HasDatabaseName("IX_EquipmentImportBatch_Creator_Finalised");
-        });
-
-        modelBuilder.Entity<EquipmentImportRow>(e =>
-        {
-            e.ToTable("EquipmentImportRow");
-            e.HasKey(x => x.Id);
-            e.Property(x => x.ZTag).HasMaxLength(128);
-            e.Property(x => x.MachineCode).HasMaxLength(128);
-            e.Property(x => x.SAPID).HasMaxLength(128);
+            e.ToTable("UnsTagReference");
+            e.HasKey(x => x.UnsTagReferenceRowId);
+            e.Property(x => x.UnsTagReferenceRowId).HasDefaultValueSql("NEWSEQUENTIALID()");
+            e.Property(x => x.UnsTagReferenceId).HasMaxLength(64);
             e.Property(x => x.EquipmentId).HasMaxLength(64);
-            e.Property(x => x.EquipmentUuid).HasMaxLength(64);
-            e.Property(x => x.Name).HasMaxLength(128);
-            e.Property(x => x.UnsAreaName).HasMaxLength(64);
-            e.Property(x => x.UnsLineName).HasMaxLength(64);
-            e.Property(x => x.Manufacturer).HasMaxLength(256);
-            e.Property(x => x.Model).HasMaxLength(256);
-            e.Property(x => x.SerialNumber).HasMaxLength(256);
-            e.Property(x => x.HardwareRevision).HasMaxLength(64);
-            e.Property(x => x.SoftwareRevision).HasMaxLength(64);
-            e.Property(x => x.YearOfConstruction).HasMaxLength(8);
-            e.Property(x => x.AssetLocation).HasMaxLength(512);
-            e.Property(x => x.ManufacturerUri).HasMaxLength(512);
-            e.Property(x => x.DeviceManualUri).HasMaxLength(512);
-            e.Property(x => x.RejectReason).HasMaxLength(512);
+            e.Property(x => x.TagId).HasMaxLength(64);
+            e.Property(x => x.DisplayNameOverride).HasMaxLength(128);
+            e.Property(x => x.RowVersion).IsRowVersion();
 
-            e.HasOne(x => x.Batch)
-                .WithMany(b => b.Rows)
-                .HasForeignKey(x => x.BatchId)
-                .OnDelete(DeleteBehavior.Cascade);
+            e.HasIndex(x => x.UnsTagReferenceId).IsUnique().HasDatabaseName("UX_UnsTagReference_LogicalId");
+            e.HasIndex(x => x.EquipmentId).HasDatabaseName("IX_UnsTagReference_Equipment");
+            e.HasIndex(x => x.TagId).HasDatabaseName("IX_UnsTagReference_Tag");
 
-            e.HasIndex(x => x.BatchId).HasDatabaseName("IX_EquipmentImportRow_Batch");
+            // One reference per (equipment, raw tag). EquipmentId/TagId are logical FKs (no
+            // navigation); the "raw-tag delete blocked while referenced" rule is enforced at the
+            // service layer in later batches.
+            e.HasIndex(x => new { x.EquipmentId, x.TagId }).IsUnique()
+                .HasDatabaseName("UX_UnsTagReference_Equip_Tag");
         });
     }
 
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshot.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshot.cs
index 45e711e3..9fa9dad7 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshot.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshot.cs
@@ -25,24 +25,36 @@ public sealed class DraftSnapshot
     /// </summary>
     public string? Site { get; init; }
 
-    /// <summary>Gets the list of OPC UA namespaces.</summary>
-    public IReadOnlyList<Namespace> Namespaces { get; init; } = [];
+    // v3: the Namespace entity is retired (the two OPC UA namespaces are implicit). The Raw tree
+    // (RawFolders → DriverInstances → Devices → TagGroups → Tags) + the UNS projection
+    // (UnsTagReferences) feed the v3 validator rules (raw-name charset, historized-tagname length, UNS
+    // effective-leaf uniqueness).
+    /// <summary>Gets the list of Raw-tree folders (drive the raw-name charset rule + RawPath computation).</summary>
+    public IReadOnlyList<RawFolder> RawFolders { get; init; } = [];
     /// <summary>Gets the list of driver instances.</summary>
     public IReadOnlyList<DriverInstance> DriverInstances { get; init; } = [];
     /// <summary>Gets the list of devices.</summary>
     public IReadOnlyList<Device> Devices { get; init; } = [];
+    /// <summary>Gets the list of tag-groups (drive the raw-name charset rule + RawPath computation).</summary>
+    public IReadOnlyList<TagGroup> TagGroups { get; init; } = [];
     /// <summary>Gets the list of UNS areas.</summary>
     public IReadOnlyList<UnsArea> UnsAreas { get; init; } = [];
     /// <summary>Gets the list of UNS lines.</summary>
     public IReadOnlyList<UnsLine> UnsLines { get; init; } = [];
     /// <summary>Gets the list of equipment.</summary>
     public IReadOnlyList<Equipment> Equipment { get; init; } = [];
-    /// <summary>Gets the list of tags.</summary>
+    /// <summary>Gets the list of raw tags.</summary>
     public IReadOnlyList<Tag> Tags { get; init; } = [];
 
-    /// <summary>Equipment-bound VirtualTags (script-derived signals). Shares the equipment NodeId space
-    /// with Tags; the collision rule checks both.</summary>
+    /// <summary>Gets the UNS tag references (raw tag → equipment projection). Drives the UNS effective-leaf
+    /// uniqueness rule (effective name = DisplayNameOverride else the backing raw tag's Name).</summary>
+    public IReadOnlyList<UnsTagReference> UnsTagReferences { get; init; } = [];
+
+    /// <summary>Equipment-bound VirtualTags (script-derived signals). Part of the UNS effective-leaf
+    /// uniqueness set within an equipment (references + VirtualTags + ScriptedAlarms).</summary>
     public IReadOnlyList<VirtualTag> VirtualTags { get; init; } = [];
+    /// <summary>Equipment-bound scripted alarms. Part of the UNS effective-leaf uniqueness set.</summary>
+    public IReadOnlyList<ScriptedAlarm> ScriptedAlarms { get; init; } = [];
     /// <summary>Gets the list of poll groups.</summary>
     public IReadOnlyList<PollGroup> PollGroups { get; init; } = [];
 
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshotFactory.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshotFactory.cs
index cddee7af..2325944d 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshotFactory.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftSnapshotFactory.cs
@@ -36,14 +36,20 @@ public static class DraftSnapshotFactory
             // EquipmentUuid checks run in separate validator passes — no rule here reads these fields.
             GenerationId = 0,            // generation model dropped; placeholder (no rule reads it)
             ClusterId = string.Empty,    // global snapshot; rules compare entity ClusterId fields, not this
-            Namespaces         = await db.Namespaces.AsNoTracking().ToListAsync(ct),
+            // v3: Namespace entity retired — no namespace list to materialize. The Raw tree
+            // (RawFolders/TagGroups) + UnsTagReferences feed the v3 rules (charset, tagname length,
+            // effective-leaf uniqueness).
+            RawFolders         = await db.RawFolders.AsNoTracking().ToListAsync(ct),
             DriverInstances    = await db.DriverInstances.AsNoTracking().ToListAsync(ct),
             Devices            = await db.Devices.AsNoTracking().ToListAsync(ct),
+            TagGroups          = await db.TagGroups.AsNoTracking().ToListAsync(ct),
             UnsAreas           = await db.UnsAreas.AsNoTracking().ToListAsync(ct),
             UnsLines           = await db.UnsLines.AsNoTracking().ToListAsync(ct),
             Equipment          = await db.Equipment.AsNoTracking().ToListAsync(ct),
             Tags               = await db.Tags.AsNoTracking().ToListAsync(ct),
+            UnsTagReferences   = await db.UnsTagReferences.AsNoTracking().ToListAsync(ct),
             VirtualTags        = await db.VirtualTags.AsNoTracking().ToListAsync(ct),
+            ScriptedAlarms     = await db.ScriptedAlarms.AsNoTracking().ToListAsync(ct),
             PollGroups         = await db.PollGroups.AsNoTracking().ToListAsync(ct),
             PriorEquipment     = [],   // intentional: no prior-generation table to diff against at this level
             ActiveReservations = await db.ExternalIdReservations
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftValidator.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftValidator.cs
index e1c18e8e..097f56d1 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftValidator.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftValidator.cs
@@ -30,57 +30,112 @@ public static class DraftValidator
         ValidateUnsSegments(draft, errors);
         ValidatePathLength(draft, errors);
         ValidateEquipmentUuidImmutability(draft, errors);
-        ValidateSameClusterNamespaceBinding(draft, errors);
         ValidateReservationPreflight(draft, errors);
         ValidateEquipmentIdDerivation(draft, errors);
-        ValidateNoEquipmentSignalNameCollision(draft, errors);
-        ValidateGalaxyTagFullName(draft, errors);
 
+        // v3 rules (WP4). The retired rules ValidateSameClusterNamespaceBinding (Namespace entity gone)
+        // and ValidateGalaxyTagFullName (blob-as-identity gone) are replaced by:
+        ValidateRawNameCharset(draft, errors);
+        ValidateHistorizedTagnameLength(draft, errors);
+        ValidateUnsEffectiveLeafUniqueness(draft, errors);
         return errors;
     }
 
-    private static void ValidateGalaxyTagFullName(DraftSnapshot draft, List<ValidationError> errors)
+    /// <summary>Builds the shared <see cref="RawPathResolver"/> from the draft's raw topology so the
+    /// tagname-length rule computes the SAME RawPath the deploy artifact injects into drivers.</summary>
+    private static RawPathResolver BuildRawPathResolver(DraftSnapshot draft)
     {
-        var typeByDriver = draft.DriverInstances
-            .ToDictionary(d => d.DriverInstanceId, d => d.DriverType, StringComparer.Ordinal);
+        var folders = draft.RawFolders.GroupBy(f => f.RawFolderId, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => ((string?)g.First().ParentRawFolderId, g.First().Name), StringComparer.Ordinal);
+        var drivers = draft.DriverInstances.GroupBy(d => d.DriverInstanceId, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => ((string?)g.First().RawFolderId, g.First().Name), StringComparer.Ordinal);
+        var devices = draft.Devices.GroupBy(d => d.DeviceId, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => (g.First().DriverInstanceId, g.First().Name), StringComparer.Ordinal);
+        var groups = draft.TagGroups.GroupBy(t => t.TagGroupId, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => ((string?)g.First().ParentTagGroupId, g.First().Name), StringComparer.Ordinal);
+        return new RawPathResolver(folders, drivers, devices, groups);
+    }
+
+    /// <summary>v3: every raw Name (RawFolder / DriverInstance / Device / TagGroup / Tag) must be a legal
+    /// RawPath segment — no <c>/</c>, no leading/trailing whitespace, non-empty — because <c>/</c> is the
+    /// RawPath separator and would corrupt the NodeId. Uses <see cref="RawPaths.ValidateSegment"/>, the same
+    /// charset authority the path builder enforces.</summary>
+    private static void ValidateRawNameCharset(DraftSnapshot draft, List<ValidationError> errors)
+    {
+        void Check(string kind, string id, string name)
+        {
+            var error = RawPaths.ValidateSegment(name);
+            if (error is not null)
+                errors.Add(new("RawNameInvalid", $"{kind} name '{name}' is not a legal RawPath segment: {error}", id));
+        }
+
+        foreach (var f in draft.RawFolders) Check("RawFolder", f.RawFolderId, f.Name);
+        foreach (var d in draft.DriverInstances) Check("DriverInstance", d.DriverInstanceId, d.Name);
+        foreach (var d in draft.Devices) Check("Device", d.DeviceId, d.Name);
+        foreach (var g in draft.TagGroups) Check("TagGroup", g.TagGroupId, g.Name);
+        foreach (var t in draft.Tags) Check("Tag", t.TagId, t.Name);
+    }
+
+    /// <summary>v3: a historized tag's EFFECTIVE historian tagname (the <c>historianTagname</c> override
+    /// else the tag's RawPath) must be ≤ 255 chars — the live-verified AVEVA historian limit (256 rejected).
+    /// A longer name is a deploy error telling the author to set a shorter <c>historianTagname</c> override,
+    /// never a silent truncation.</summary>
+    private static void ValidateHistorizedTagnameLength(DraftSnapshot draft, List<ValidationError> errors)
+    {
+        const int MaxHistorianTagname = 255;
+        var resolver = BuildRawPathResolver(draft);
         foreach (var t in draft.Tags)
         {
-            if (t.EquipmentId is null) continue;
-            if (!typeByDriver.TryGetValue(t.DriverInstanceId, out var dtype) || dtype != "GalaxyMxGateway")
-                continue;
-            // The Galaxy rule wants the EXPLICIT reference, not the raw-blob fallback — so it reads
-            // TagConfigIntent.ExplicitFullName (the "FullName" property only when present-and-string,
-            // else null), preserving the historical null-on-absent semantics by construction (R2-11).
-            if (string.IsNullOrWhiteSpace(TagConfigIntent.Parse(t.TagConfig).ExplicitFullName))
-                errors.Add(new("GalaxyTagMissingReference",
-                    $"Galaxy tag '{t.TagId}' on equipment '{t.EquipmentId}' is missing a Galaxy reference (TagConfig.FullName)",
-                    t.TagId));
+            var intent = TagConfigIntent.Parse(t.TagConfig);
+            if (!intent.IsHistorized) continue;
+            // Effective tagname = explicit override else the computed RawPath (null when the chain is broken —
+            // a separate rule/charset check flags that; nothing to length-check here).
+            var effective = intent.HistorianTagname ?? resolver.TryBuildTagPath(t.DeviceId, t.TagGroupId, t.Name);
+            if (effective is null || effective.Length <= MaxHistorianTagname) continue;
+            errors.Add(new("HistorianTagnameTooLong",
+                $"tag '{t.TagId}' historized effective tagname is {effective.Length} chars (max {MaxHistorianTagname}); " +
+                "set a shorter 'historianTagname' override in its TagConfig",
+                t.TagId));
         }
     }
 
-    private static void ValidateNoEquipmentSignalNameCollision(DraftSnapshot draft, List<ValidationError> errors)
+    /// <summary>v3: within an equipment, the EFFECTIVE leaf name must be unique across its UnsTagReferences
+    /// (DisplayNameOverride else the backing raw tag's Name), its VirtualTags (Name), and its ScriptedAlarms
+    /// (Name) — the three share the equipment's UNS NodeId space (<c>{EquipmentId}/{EffectiveName}</c>).
+    /// Enforced here at the deploy gate (as well as at authoring) so a raw-tag rename that induces a clash the
+    /// authoring check never saw is caught before it ships.</summary>
+    private static void ValidateUnsEffectiveLeafUniqueness(DraftSnapshot draft, List<ValidationError> errors)
     {
-        // Materialiser NodeId key: "{EquipmentId}[/{FolderPath}]/{Name}". Tag (EquipmentId != null) and
-        // VirtualTag share this space with no DB cross-table uniqueness, so the same key from both collides.
-        static string Key(string eq, string? folder, string name) =>
-            string.IsNullOrWhiteSpace(folder) ? $"{eq}/{name}" : $"{eq}/{folder}/{name}";
+        var tagNameById = draft.Tags.GroupBy(t => t.TagId, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => g.First().Name, StringComparer.Ordinal);
 
-        var signals = draft.Tags
-            .Where(t => t.EquipmentId is not null)
-            .Select(t => (Key: Key(t.EquipmentId!, t.FolderPath, t.Name), Eq: t.EquipmentId!, t.Name))
-            // VirtualTag has no FolderPath column today — null is correct here; update if it ever gains one.
-            .Concat(draft.VirtualTags
-                .Select(v => (Key: Key(v.EquipmentId, null, v.Name), Eq: v.EquipmentId, v.Name)));
-
-        foreach (var g in signals.GroupBy(s => s.Key, StringComparer.Ordinal))
+        // (EquipmentId, EffectiveName) → source descriptions, so a collision names both sources.
+        var byLeaf = new Dictionary<(string Eq, string Name), List<string>>();
+        void Add(string equipmentId, string? effectiveName, string source)
         {
-            var items = g.ToList();
-            if (items.Count <= 1) continue;
-            var f = items[0];
-            errors.Add(new("EquipmentSignalNameCollision",
-                $"{items.Count} signals collide on OPC UA NodeId '{g.Key}' (equipment '{f.Eq}', name '{f.Name}'); " +
-                "a Name must be unique across Tag and VirtualTag within an equipment+folder",
-                f.Eq));
+            if (string.IsNullOrEmpty(effectiveName)) return;
+            var key = (equipmentId, effectiveName);
+            if (!byLeaf.TryGetValue(key, out var list)) byLeaf[key] = list = new List<string>();
+            list.Add(source);
+        }
+
+        foreach (var r in draft.UnsTagReferences)
+        {
+            var effective = r.DisplayNameOverride ?? (tagNameById.TryGetValue(r.TagId, out var n) ? n : null);
+            Add(r.EquipmentId, effective, $"reference '{r.UnsTagReferenceId}'");
+        }
+        foreach (var v in draft.VirtualTags)
+            Add(v.EquipmentId, v.Name, $"VirtualTag '{v.VirtualTagId}'");
+        foreach (var a in draft.ScriptedAlarms)
+            Add(a.EquipmentId, a.Name, $"ScriptedAlarm '{a.ScriptedAlarmId}'");
+
+        foreach (var ((eq, name), sources) in byLeaf)
+        {
+            if (sources.Count <= 1) continue;
+            errors.Add(new("UnsEffectiveNameCollision",
+                $"{sources.Count} UNS signals collide on effective name '{name}' within equipment '{eq}': " +
+                string.Join(", ", sources) + "; effective names must be unique across references, VirtualTags, and ScriptedAlarms",
+                eq));
         }
     }
 
@@ -149,27 +204,6 @@ public static class DraftValidator
         }
     }
 
-    private static void ValidateSameClusterNamespaceBinding(DraftSnapshot draft, List<ValidationError> errors)
-    {
-        var nsById = draft.Namespaces.ToDictionary(n => n.NamespaceId);
-
-        foreach (var di in draft.DriverInstances)
-        {
-            if (!nsById.TryGetValue(di.NamespaceId, out var ns))
-            {
-                errors.Add(new("NamespaceUnresolved",
-                    $"DriverInstance '{di.DriverInstanceId}' references unknown NamespaceId '{di.NamespaceId}'",
-                    di.DriverInstanceId));
-                continue;
-            }
-
-            if (ns.ClusterId != di.ClusterId)
-                errors.Add(new("BadCrossClusterNamespaceBinding",
-                    $"DriverInstance '{di.DriverInstanceId}' is in cluster '{di.ClusterId}' but references namespace in cluster '{ns.ClusterId}'",
-                    di.DriverInstanceId));
-        }
-    }
-
     private static void ValidateReservationPreflight(DraftSnapshot draft, List<ValidationError> errors)
     {
         var activeByKindValue = draft.ActiveReservations
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs
index 9d622322..ac3e43fc 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs
@@ -84,7 +84,6 @@ public sealed class DriverTypeRegistry
 
 /// <summary>Per-driver-type metadata used by the Core, validator, and Admin UI.</summary>
 /// <param name="TypeName">Driver type name (matches <c>DriverInstance.DriverType</c> column values).</param>
-/// <param name="AllowedNamespaceKinds">Which namespace kinds this driver type may be bound to.</param>
 /// <param name="DriverConfigJsonSchema">JSON Schema (Draft 2020-12) the driver's <c>DriverConfig</c> column must validate against.</param>
 /// <param name="DeviceConfigJsonSchema">JSON Schema for <c>DeviceConfig</c> (multi-device drivers); null if the driver has no device layer.</param>
 /// <param name="TagConfigJsonSchema">JSON Schema for <c>TagConfig</c>; required for every driver since every driver has tags.</param>
@@ -95,24 +94,11 @@ public sealed class DriverTypeRegistry
 ///     hybrid-formula constants, and whether process-level <c>MemoryRecycle</c> / scheduled-
 ///     recycle protections apply (Tier C only). Every registered driver type must declare one.
 /// </param>
+// v3: AllowedNamespaceKinds retired with the Namespace entity — the two OPC UA namespaces (Raw/UNS)
+// are implicit, so a driver type no longer declares a namespace-kind compatibility bitmask.
 public sealed record DriverTypeMetadata(
     string TypeName,
-    NamespaceKindCompatibility AllowedNamespaceKinds,
     string DriverConfigJsonSchema,
     string? DeviceConfigJsonSchema,
     string TagConfigJsonSchema,
     DriverTier Tier);
-
-/// <summary>Bitmask of namespace kinds a driver type may populate.</summary>
-[Flags]
-public enum NamespaceKindCompatibility
-{
-    /// <summary>Driver does not populate any namespace (invalid; should never appear in registry).</summary>
-    None = 0,
-
-    /// <summary>Driver may populate Equipment-kind namespaces (UNS path, Equipment rows).</summary>
-    Equipment = 1,
-
-    /// <summary>Driver may populate the future Simulated namespace (replay driver — not in v2.0).</summary>
-    Simulated = 4,
-}
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/EquipmentTagRefResolver.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/EquipmentTagRefResolver.cs
index d95bafb7..500b31f0 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/EquipmentTagRefResolver.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/EquipmentTagRefResolver.cs
@@ -1,53 +1,66 @@
-using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 
 namespace ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 /// <summary>
-///     Resolves a driver subscription/read/write <c>fullReference</c> to a driver tag-definition,
-///     bridging the two authoring models: a legacy authored tag-table entry (looked up by name)
-///     OR an equipment tag whose reference is its raw <c>TagConfig</c> JSON (parsed on first use
-///     and cached). Negative results are cached too, so a genuinely-unknown reference is parsed once.
+///     v3: resolves a driver subscription/read/write reference — which is now always a
+///     <c>RawPath</c> — to the driver's internal tag-definition. The lookup is a single authored-table
+///     hit: each deploy hands the driver its authored raw tags keyed by RawPath (see
+///     <see cref="RawTagEntry"/>), the driver builds a <c>RawPath → TDef</c> table from them, and this
+///     resolver wraps that table's lookup. The pre-v3 blob-parse fallback (an equipment tag whose
+///     reference WAS its raw <c>TagConfig</c> JSON) is retired: a miss is a miss — <see cref="TryResolve"/>
+///     returns <see langword="false"/> and the driver surfaces Bad quality, never a parse attempt.
 /// </summary>
 /// <typeparam name="TDef">The driver's internal tag-definition type.</typeparam>
 public sealed class EquipmentTagRefResolver<TDef> where TDef : class
 {
-    private readonly Func<string, TDef?> _byName;
-    private readonly Func<string, TDef?> _parseRef;
-    private readonly ConcurrentDictionary<string, TDef?> _cache = new(StringComparer.Ordinal);
+    private readonly Func<string, TDef?> _byRawPath;
 
     /// <summary>Initializes a new instance of the <see cref="EquipmentTagRefResolver{TDef}"/> class.</summary>
-    /// <param name="byName">Authored tag-table lookup (returns null on miss).</param>
-    /// <param name="parseRef">Parses an equipment-tag reference (TagConfig JSON) into a transient def, or null.</param>
-    public EquipmentTagRefResolver(Func<string, TDef?> byName, Func<string, TDef?> parseRef)
+    /// <param name="byRawPath">The driver's authored-table lookup (RawPath → definition; null on miss).</param>
+    public EquipmentTagRefResolver(Func<string, TDef?> byRawPath)
     {
-        ArgumentNullException.ThrowIfNull(byName);
-        ArgumentNullException.ThrowIfNull(parseRef);
-        _byName = byName;
-        _parseRef = parseRef;
+        ArgumentNullException.ThrowIfNull(byRawPath);
+        _byRawPath = byRawPath;
     }
 
-    /// <summary>True when <paramref name="fullReference"/> resolves to a def (authored or equipment).</summary>
-    /// <param name="fullReference">The wire reference handed to the driver.</param>
+    /// <summary>True when <paramref name="rawPath"/> resolves to an authored tag-definition.</summary>
+    /// <param name="rawPath">The RawPath wire reference handed to the driver.</param>
     /// <param name="def">
     ///     The resolved tag-definition when this returns <see langword="true"/>. When this returns
     ///     <see langword="false"/> the value is undefined — callers must not use it.
-    ///     <c>[MaybeNullWhen(false)]</c> informs the nullable-reference-types (NRT) analyser so
-    ///     callers in NRT-enabled contexts do not need to suppress warnings.
     /// </param>
     /// <returns><see langword="true"/> when a definition was found.</returns>
-    public bool TryResolve(string fullReference, [MaybeNullWhen(false)] out TDef def)
+    public bool TryResolve(string rawPath, [MaybeNullWhen(false)] out TDef def)
     {
-        var authored = _byName(fullReference);
-        if (authored is not null) { def = authored; return true; }
-
-        var resolved = _cache.GetOrAdd(fullReference, _parseRef);
-        if (resolved is not null) { def = resolved; return true; }
-
-        def = default;
-        return false;
+        def = _byRawPath(rawPath);
+        return def is not null;
     }
 
-    /// <summary>Drops the transient-parse cache (call on driver reinitialise so a config change re-parses).</summary>
-    public void Clear() => _cache.Clear();
+    /// <summary>
+    ///     No-op retained for call-site compatibility. v3 holds no transient parse cache — the driver
+    ///     rebuilds its authored <c>RawPath → TDef</c> table on reinitialise, and this resolver reads
+    ///     the driver's live table by closure, so there is nothing to clear here.
+    /// </summary>
+    public void Clear()
+    {
+    }
 }
+
+/// <summary>
+///     The unit of tag delivery from the deploy artifact to a driver: one authored raw
+///     <c>Tag</c>, identified by its <see cref="RawPath"/> (the v3 identity), carrying the
+///     driver-specific address blob (<see cref="TagConfig"/>) the driver dials and the platform flags
+///     the driver needs. A driver maps each entry to its typed definition (keyed by RawPath) via its
+///     own <c>TagConfig → definition</c> factory at table-build time.
+/// </summary>
+/// <param name="RawPath">The tag's cluster-scoped RawPath — the driver wire reference / identity.</param>
+/// <param name="TagConfig">The tag's schemaless driver-specific <c>TagConfig</c> JSON (the dialled address).</param>
+/// <param name="WriteIdempotent">Whether writes to this tag are safe to replay (R2 resilience contract).</param>
+/// <param name="DeviceName">
+///     The name of the <c>Device</c> this tag lives under (the RawPath's device segment). Multi-device
+///     drivers route the tag to its device/connection by this name; single-device drivers ignore it.
+///     Populated by the deploy artifact (which built the RawPath and therefore knows the device);
+///     defaults to empty for callers that don't need device routing.
+/// </param>
+public sealed record RawTagEntry(string RawPath, string TagConfig, bool WriteIdempotent, string DeviceName = "");
diff --git a/src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs b/src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs
index 96eacf2b..5360df87 100644
--- a/src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs
+++ b/src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs
@@ -1,80 +1,37 @@
-using ZB.MOM.WW.OtOpcUa.Commons.Types;
 using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Core.OpcUa;
 
 /// <summary>
-///     Materializes the canonical Unified Namespace browse tree for an Equipment-kind
-///     <see cref="Configuration.Entities.Namespace"/> from the Config DB's
-///     <c>UnsArea</c> / <c>UnsLine</c> / <c>Equipment</c> / <c>Tag</c> rows. Runs during
-///     address-space build per <see cref="IDriver"/> whose
-///     <c>Namespace.Kind = Equipment</c>; non-Equipment namespaces are
-///     exempt and reach this walker only indirectly through
-///     <see cref="ITagDiscovery.DiscoverAsync"/>.
+///     Materializes the canonical Unified Namespace browse tree (Area → Line → Equipment) for a
+///     cluster from its <c>UnsArea</c> / <c>UnsLine</c> / <c>Equipment</c> rows, plus the
+///     per-equipment VirtualTag + ScriptedAlarm nodes.
+///     <para>
+///     <b>v3:</b> equipment no longer binds a driver or authors tags. Raw tags are surfaced into
+///     equipment by <c>UnsTagReference</c> and materialized as the UNS-namespace fan-out of their
+///     backing raw nodes — that projection lands with the dual-namespace address space (Batch 4),
+///     NOT here. This walker therefore emits the equipment hierarchy + VirtualTags + ScriptedAlarms
+///     only; raw-tag reference variables are intentionally absent (the address space is deliberately
+///     dark until Batch 4). It remains a pure, SDK-free helper retained for unit-test support; real
+///     server deployments compose through the <c>AddressSpaceComposer → Applier → Sink → NodeManager</c>
+///     chain.
+///     </para>
 /// </summary>
-/// <remarks>
-///     <para>
-///         <b>Composition strategy.</b> Accepted Option A — Config
-///         primary. The walker treats the supplied <see cref="EquipmentNamespaceContent"/>
-///         snapshot as the authoritative published surface. Every Equipment row becomes a
-///         folder node at the UNS level-5 segment; every <see cref="Tag"/> bound to an
-///         Equipment (non-null <see cref="Tag.EquipmentId"/>) becomes a variable node under
-///         it. Driver-discovered tags that have no Config-DB row are not added by this
-///         walker — the ITagDiscovery path continues to exist for FolderPath-scoped tags +
-///         for enrichment, but Equipment-kind composition is fully Tag-row-driven.
-///     </para>
-///
-///     <para>
-///         <b>Under each Equipment node.</b> Five identifier properties
-///         (<c>EquipmentId</c>, <c>EquipmentUuid</c>, <c>MachineCode</c>, <c>ZTag</c>,
-///         <c>SAPID</c>) are added as OPC UA properties — external systems (ERP, SAP PM)
-///         resolve equipment by whichever identifier they natively use without a sidecar.
-///         <see cref="IdentificationFolderBuilder.Build"/> materializes the OPC 40010
-///         Identification sub-folder with the nine fields when at least one
-///         is non-null; when all nine are null the sub-folder is omitted rather than
-///         appearing empty.
-///     </para>
-///
-///     <para>
-///         <b>Address resolution.</b> Variable nodes carry the driver-side full reference
-///         in <see cref="DriverAttributeInfo.FullName"/> copied from <c>Tag.TagConfig</c>
-///         (the wire-level address JSON blob whose interpretation is driver-specific). At
-///         runtime the dispatch layer routes Read/Write calls through the configured
-///         capability invoker; an unreachable address surfaces as an OPC UA Bad status via
-///         the natural driver-read failure path, NOT as a build-time reject. The ADR calls
-///         this "BadNotFound placeholder" behavior — legible to operators via their Admin
-///         UI + OPC UA client inspection of node status.
-///     </para>
-///
-///     <para>
-///         <b>Pure function.</b> This class has no dependency on the OPC UA SDK, no
-///         Config-DB access, no state. It consumes pre-loaded EF Core rows + streams calls
-///         into the supplied <see cref="IAddressSpaceBuilder"/>. The server-side wiring
-///         (load snapshot → invoke walker → per-tag capability probe) lives in the Task B
-///         PR alongside <c>NodeScopeResolver</c>'s Config-DB join.
-///     </para>
-/// </remarks>
 public static class EquipmentNodeWalker
 {
     /// <summary>
-    ///     Walk <paramref name="content"/> into <paramref name="namespaceBuilder"/>.
-    ///     The builder is scoped to the Equipment-kind namespace root; the walker emits
-    ///     Area → Line → Equipment folders under it, then identifier properties + the
-    ///     Identification sub-folder + variable nodes per bound Tag under each Equipment.
+    ///     Walk <paramref name="content"/> into <paramref name="namespaceBuilder"/>: Area → Line →
+    ///     Equipment folders, identifier properties + the OPC 40010 Identification sub-folder per
+    ///     equipment, and the equipment's VirtualTag + ScriptedAlarm variable nodes.
     /// </summary>
-    /// <param name="namespaceBuilder">
-    ///     The builder scoped to the Equipment-kind namespace root. Caller is responsible for
-    ///     creating this (e.g. <c>rootBuilder.Folder(namespace.NamespaceId, namespace.NamespaceUri)</c>).
-    /// </param>
-    /// <param name="content">Pre-loaded + pre-filtered rows for a single published generation.</param>
+    /// <param name="namespaceBuilder">The builder scoped to the UNS namespace root.</param>
+    /// <param name="content">Pre-loaded + pre-filtered rows for a single cluster.</param>
     public static void Walk(IAddressSpaceBuilder namespaceBuilder, EquipmentNamespaceContent content)
     {
         ArgumentNullException.ThrowIfNull(namespaceBuilder);
         ArgumentNullException.ThrowIfNull(content);
 
-        // Group lines by area + equipment by line + tags by equipment up-front. Avoids an
-        // O(N·M) re-scan at each UNS level on large fleets.
         var linesByArea = content.Lines
             .GroupBy(l => l.UnsAreaId, StringComparer.OrdinalIgnoreCase)
             .ToDictionary(g => g.Key, g => g.OrderBy(l => l.Name, StringComparer.Ordinal).ToList(), StringComparer.OrdinalIgnoreCase);
@@ -83,11 +40,6 @@ public static class EquipmentNodeWalker
             .GroupBy(e => e.UnsLineId, StringComparer.OrdinalIgnoreCase)
             .ToDictionary(g => g.Key, g => g.OrderBy(e => e.Name, StringComparer.Ordinal).ToList(), StringComparer.OrdinalIgnoreCase);
 
-        var tagsByEquipment = content.Tags
-            .Where(t => !string.IsNullOrEmpty(t.EquipmentId))
-            .GroupBy(t => t.EquipmentId!, StringComparer.OrdinalIgnoreCase)
-            .ToDictionary(g => g.Key, g => g.OrderBy(t => t.Name, StringComparer.Ordinal).ToList(), StringComparer.OrdinalIgnoreCase);
-
         var virtualTagsByEquipment = (content.VirtualTags ?? [])
             .Where(v => v.Enabled)
             .GroupBy(v => v.EquipmentId, StringComparer.OrdinalIgnoreCase)
@@ -114,10 +66,6 @@ public static class EquipmentNodeWalker
                     AddIdentifierProperties(equipmentBuilder, equipment);
                     IdentificationFolderBuilder.Build(equipmentBuilder, equipment);
 
-                    if (tagsByEquipment.TryGetValue(equipment.EquipmentId, out var equipmentTags))
-                        foreach (var tag in equipmentTags)
-                            AddTagVariable(equipmentBuilder, tag);
-
                     if (virtualTagsByEquipment.TryGetValue(equipment.EquipmentId, out var vTags))
                         foreach (var vtag in vTags)
                             AddVirtualTagVariable(equipmentBuilder, vtag);
@@ -131,11 +79,9 @@ public static class EquipmentNodeWalker
     }
 
     /// <summary>
-    ///     Adds the five operator-facing identifiers as OPC UA properties
-    ///     on the Equipment node. EquipmentId + EquipmentUuid are always populated;
-    ///     MachineCode is required per <see cref="Equipment"/>; ZTag + SAPID are nullable in
-    ///     the data model so they're skipped when null to avoid empty-string noise in the
-    ///     browse tree.
+    ///     Adds the operator-facing identifiers as OPC UA properties on the Equipment node.
+    ///     EquipmentId + EquipmentUuid + MachineCode are always populated; ZTag + SAPID are skipped
+    ///     when null to avoid empty-string noise in the browse tree.
     /// </summary>
     private static void AddIdentifierProperties(IAddressSpaceBuilder equipmentBuilder, Equipment equipment)
     {
@@ -149,67 +95,13 @@ public static class EquipmentNodeWalker
     }
 
     /// <summary>
-    ///     Emit a single Tag row as an <see cref="IAddressSpaceBuilder.Variable"/>. The driver
-    ///     full reference lives in <c>Tag.TagConfig</c> (wire-level address, driver-specific
-    ///     JSON blob); the variable node's data type derives from <c>Tag.DataType</c>.
-    ///     Unreachable-address behavior: the variable is created; the
-    ///     driver's natural Read failure surfaces an OPC UA Bad status at runtime.
-    /// </summary>
-    private static void AddTagVariable(IAddressSpaceBuilder equipmentBuilder, Tag tag)
-    {
-        // SecurityClass and IsHistorized are intentionally not extracted from TagConfig here.
-        // In production, EquipmentNodeWalker.Walk is superseded by the
-        // AddressSpaceComposer → AddressSpaceApplier → Sink → NodeManager chain, which reads
-        // both fields from TagConfig JSON directly (via DeploymentArtifact.ExtractTagHistorize
-        // and the SecurityClassification column). This walker is retained for unit-test support
-        // only; real server deployments never invoke Walk to build live nodes.
-        var attr = new DriverAttributeInfo(
-            FullName: ExtractFullName(tag.TagConfig),
-            DriverDataType: ParseDriverDataType(tag.DataType),
-            IsArray: false,
-            ArrayDim: null,
-            SecurityClass: SecurityClassification.FreeAccess,
-            IsHistorized: false);
-        equipmentBuilder.Variable(tag.Name, tag.Name, attr);
-    }
-
-    /// <summary>
-    ///     Cross-driver TagConfig convention — the Config DB's <c>CK_Tag_TagConfig_IsJson</c>
-    ///     check constraint requires TagConfig to be a JSON object, and every shipped driver
-    ///     (Galaxy / Modbus / AB CIP / S7 / FOCAS / TwinCAT / ABLegacy) stores the wire-level
-    ///     address in a top-level <c>FullName</c> field. Extracting it here keeps the walker
-    ///     driver-agnostic while giving the driver the plain address string its backend
-    ///     expects at read-time — the raw JSON would otherwise be passed verbatim to
-    ///     <c>IReadable.ReadAsync</c> and the driver would fail to resolve the tag.
-    /// </summary>
-    /// <remarks>
-    ///     Falls back to the raw <paramref name="tagConfig"/> if it doesn't parse as JSON or
-    ///     the <c>FullName</c> field is absent. This preserves the pre-refactor behaviour for
-    ///     any legacy row that slipped past the check constraint or any future driver that
-    ///     wants an opaque non-JSON reference.
-    /// </remarks>
-    /// <param name="tagConfig">The tag configuration JSON or string.</param>
-    /// <returns>The extracted <c>FullName</c> value, or the raw <paramref name="tagConfig"/> if it can't be extracted.</returns>
-    internal static string ExtractFullName(string tagConfig) =>
-        TagConfigIntent.Parse(tagConfig).FullName;
-
-    /// <summary>
-    ///     Parse <see cref="Tag.DataType"/> (stored as the <see cref="DriverDataType"/> enum
-    ///     name string) into the enum value. Unknown names fall back to
-    ///     <see cref="DriverDataType.String"/> so a one-off driver-specific type doesn't
-    ///     abort the whole walk; the underlying driver still sees the original TagConfig
-    ///     address + can surface its own typed value via the OPC UA variant at read time.
+    ///     Parse a data-type name (stored as the <see cref="DriverDataType"/> enum name) into the
+    ///     enum value; unknown names fall back to <see cref="DriverDataType.String"/>.
     /// </summary>
     private static DriverDataType ParseDriverDataType(string raw) =>
         Enum.TryParse<DriverDataType>(raw, ignoreCase: true, out var parsed) ? parsed : DriverDataType.String;
 
-    /// <summary>
-    ///     Emit a <see cref="VirtualTag"/> row as a <see cref="NodeSourceKind.Virtual"/>
-    ///     variable node. <c>FullName</c> doubles as the UNS path Phase 7's VirtualTagEngine
-    ///     addresses its engine-side entries by. The <c>VirtualTagId</c> discriminator lets
-    ///     the DriverNodeManager dispatch Reads/Subscribes to the engine rather than any
-    ///     driver.
-    /// </summary>
+    /// <summary>Emit a <see cref="VirtualTag"/> row as a <see cref="NodeSourceKind.Virtual"/> variable node.</summary>
     private static void AddVirtualTagVariable(IAddressSpaceBuilder equipmentBuilder, VirtualTag vtag)
     {
         var attr = new DriverAttributeInfo(
@@ -227,14 +119,7 @@ public static class EquipmentNodeWalker
         equipmentBuilder.Variable(vtag.Name, vtag.Name, attr);
     }
 
-    /// <summary>
-    ///     Emit a <see cref="ScriptedAlarm"/> row as a <see cref="NodeSourceKind.ScriptedAlarm"/>
-    ///     variable node. The OPC UA Part 9 alarm-condition materialization happens at the
-    ///     node-manager level (which wires the concrete <c>AlarmConditionState</c> subclass
-    ///     per <see cref="ScriptedAlarm.AlarmType"/>); this walker provides the browse-level
-    ///     anchor + the <see cref="DriverAttributeInfo.IsAlarm"/> flag that triggers that
-    ///     materialization path.
-    /// </summary>
+    /// <summary>Emit a <see cref="ScriptedAlarm"/> row as a <see cref="NodeSourceKind.ScriptedAlarm"/> variable node.</summary>
     private static void AddScriptedAlarmVariable(IAddressSpaceBuilder equipmentBuilder, ScriptedAlarm alarm)
     {
         var attr = new DriverAttributeInfo(
@@ -254,15 +139,14 @@ public static class EquipmentNodeWalker
 }
 
 /// <summary>
-///     Pre-loaded + pre-filtered snapshot of one Equipment-kind namespace's worth of Config
-///     DB rows. All four collections are scoped to the same
-///     <see cref="Configuration.Entities.Namespace"/> row. The walker assumes this filter
-///     was applied by the caller + does no cross-namespace validation.
+///     Pre-loaded + pre-filtered snapshot of one cluster's UNS content (Area / Line / Equipment +
+///     per-equipment VirtualTags / ScriptedAlarms). v3: raw-tag references (<c>UnsTagReference</c>)
+///     are materialized by the Batch-4 dual-namespace fan-out, not by this walker, so they are not
+///     part of this snapshot.
 /// </summary>
 public sealed record EquipmentNamespaceContent(
     IReadOnlyList<UnsArea> Areas,
     IReadOnlyList<UnsLine> Lines,
     IReadOnlyList<Equipment> Equipment,
-    IReadOnlyList<Tag> Tags,
     IReadOnlyList<VirtualTag>? VirtualTags = null,
     IReadOnlyList<ScriptedAlarm>? ScriptedAlarms = null);
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/AbCipCommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/AbCipCommandBase.cs
index 5631d413..c69d04b1 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/AbCipCommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/AbCipCommandBase.cs
@@ -1,4 +1,5 @@
 using CliFx.Attributes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli;
@@ -48,7 +49,10 @@ public abstract class AbCipCommandBase : DriverCommandBase
     /// <summary>
     ///     Build an <see cref="AbCipDriverOptions"/> with the device + tag list a subclass
     ///     supplies. Probe + alarm projection are disabled — CLI runs are one-shot; the
-    ///     probe loop would race the operator's own reads.
+    ///     probe loop would race the operator's own reads. Each typed tag is serialised to the v3
+    ///     <see cref="RawTagEntry"/> shape (RawPath = tag name, TagConfig blob via
+    ///     <see cref="AbCipTagDefinitionFactory.ToTagConfig"/>, DeviceName = the tag's device routing key)
+    ///     — the same seam the deploy artifact uses.
     /// </summary>
     /// <param name="tags">The list of tag definitions to include in the options.</param>
     /// <returns>The constructed <see cref="AbCipDriverOptions"/>.</returns>
@@ -58,7 +62,11 @@ public abstract class AbCipCommandBase : DriverCommandBase
             HostAddress: Gateway,
             PlcFamily: Family,
             DeviceName: $"cli-{Family}")],
-        Tags = tags,
+        RawTags = [.. tags.Select(t => new RawTagEntry(
+            RawPath: t.Name,
+            TagConfig: AbCipTagDefinitionFactory.ToTagConfig(t),
+            WriteIdempotent: t.WriteIdempotent,
+            DeviceName: t.DeviceHostAddress))],
         Timeout = Timeout,
         Probe = new AbCipProbeOptions { Enabled = false },
         EnableControllerBrowse = false,
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/AbLegacyCommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/AbLegacyCommandBase.cs
index 9f006aaf..49b4dfcd 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/AbLegacyCommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/AbLegacyCommandBase.cs
@@ -1,4 +1,5 @@
 using CliFx.Attributes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.PlcFamilies;
 using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
 
@@ -37,7 +38,12 @@ public abstract class AbLegacyCommandBase : DriverCommandBase
 
     /// <summary>
     ///     Build an <see cref="AbLegacyDriverOptions"/> with the device + tag list a subclass
-    ///     supplies. Probe disabled for CLI one-shot runs.
+    ///     supplies. The CLI authors typed <see cref="AbLegacyTagDefinition"/>s from operator flags;
+    ///     v3 delivers tags to the driver as <see cref="RawTagEntry"/> records, so each typed def is
+    ///     serialised back to its <c>TagConfig</c> blob via
+    ///     <see cref="AbLegacyTagDefinitionFactory.ToTagConfig"/> (RawPath = the def's <c>Name</c>,
+    ///     DeviceName = the def's <c>DeviceHostAddress</c> — the CLI's single device). Probe disabled
+    ///     for CLI one-shot runs.
     /// </summary>
     /// <param name="tags">The tag definitions to include in the options.</param>
     /// <returns>Configured AB Legacy driver options.</returns>
@@ -47,7 +53,8 @@ public abstract class AbLegacyCommandBase : DriverCommandBase
             HostAddress: Gateway,
             PlcFamily: PlcType,
             DeviceName: $"cli-{PlcType}")],
-        Tags = tags,
+        RawTags = [.. tags.Select(t => new RawTagEntry(
+            t.Name, AbLegacyTagDefinitionFactory.ToTagConfig(t), t.WriteIdempotent, DeviceName: t.DeviceHostAddress))],
         Timeout = Timeout,
         Probe = new AbLegacyProbeOptions { Enabled = false },
     };
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/FocasCommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/FocasCommandBase.cs
index bc994a50..62965d52 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/FocasCommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/FocasCommandBase.cs
@@ -1,4 +1,5 @@
 using CliFx.Attributes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli;
@@ -54,7 +55,11 @@ public abstract class FocasCommandBase : DriverCommandBase
             HostAddress: HostAddress,
             DeviceName: $"cli-{CncHost}:{CncPort}",
             Series: Series)],
-        Tags = tags,
+        // v3: turn each typed def into the RawTagEntry delivery unit — TagConfig blob via
+        // FocasTagDefinitionFactory.ToTagConfig, keyed by the def's synthesised name (RawPath), routed to
+        // the device by the def's DeviceHostAddress (which the driver matches against Devices).
+        RawTags = [.. tags.Select(t => new RawTagEntry(
+            t.Name, FocasTagDefinitionFactory.ToTagConfig(t), t.WriteIdempotent, t.DeviceHostAddress))],
         Timeout = Timeout,
         Probe = new FocasProbeOptions { Enabled = false },
     };
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ModbusCommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ModbusCommandBase.cs
index be974669..19ca4d72 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ModbusCommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ModbusCommandBase.cs
@@ -1,5 +1,6 @@
 using CliFx.Attributes;
 using CliFx.Exceptions;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli;
@@ -43,9 +44,12 @@ public abstract class ModbusCommandBase : DriverCommandBase
 
     /// <summary>
     ///     Construct a <see cref="ModbusDriverOptions"/> with the endpoint fields this base
-    ///     collected + whatever <paramref name="tags"/> the subclass declares. Probe is
-    ///     disabled — CLI runs are one-shot, the probe loop would race the operator's
-    ///     command against its own keep-alive reads.
+    ///     collected + whatever <paramref name="tags"/> the subclass declares. The CLI holds typed
+    ///     definitions (synthesised from operator flags), so each is serialised back to a
+    ///     <see cref="RawTagEntry"/> — the v3 delivery unit — via
+    ///     <see cref="ModbusTagDefinitionFactory.ToTagConfig"/>, keyed by the def's synthesised name as
+    ///     its RawPath. Probe is disabled — CLI runs are one-shot, the probe loop would race the
+    ///     operator's command against its own keep-alive reads.
     /// </summary>
     /// <param name="tags">The tag definitions to include in the options.</param>
     /// <returns>A <see cref="ModbusDriverOptions"/> ready to hand to the driver constructor.</returns>
@@ -56,7 +60,7 @@ public abstract class ModbusCommandBase : DriverCommandBase
         UnitId = UnitId,
         Timeout = Timeout,
         AutoReconnect = !DisableAutoReconnect,
-        Tags = tags,
+        RawTags = [.. tags.Select(t => new RawTagEntry(t.Name, ModbusTagDefinitionFactory.ToTagConfig(t), t.WriteIdempotent))],
         Probe = new ModbusProbeOptions { Enabled = false },
     };
 
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/S7CommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/S7CommandBase.cs
index f25180c3..06f1c677 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/S7CommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/S7CommandBase.cs
@@ -1,5 +1,6 @@
 using CliFx.Attributes;
 using CliFx.Exceptions;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Cli;
@@ -48,8 +49,11 @@ public abstract class S7CommandBase : DriverCommandBase
 
     /// <summary>
     ///     Build an <see cref="S7DriverOptions"/> with the endpoint fields this base
-    ///     collected + whatever <paramref name="tags"/> the subclass declares. Probe
-    ///     disabled — CLI runs are one-shot.
+    ///     collected + whatever <paramref name="tags"/> the subclass declares. Each typed
+    ///     definition is serialised to its <c>TagConfig</c> blob via
+    ///     <see cref="S7TagDefinitionFactory.ToTagConfig"/> and packaged as a
+    ///     <see cref="RawTagEntry"/> (RawPath = the def's <c>Name</c>) — the v3 delivery shape the
+    ///     driver rebuilds definitions from. Probe disabled — CLI runs are one-shot.
     /// </summary>
     /// <param name="tags">The tag definitions to include in the options.</param>
     /// <returns>The constructed <see cref="S7DriverOptions"/>.</returns>
@@ -61,7 +65,7 @@ public abstract class S7CommandBase : DriverCommandBase
         Rack = Rack,
         Slot = Slot,
         Timeout = Timeout,
-        Tags = tags,
+        RawTags = [.. tags.Select(t => new RawTagEntry(t.Name, S7TagDefinitionFactory.ToTagConfig(t), t.WriteIdempotent))],
         Probe = new S7ProbeOptions { Enabled = false },
     };
 
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/Commands/BrowseCommand.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/Commands/BrowseCommand.cs
index 8eb29b04..cfc8a36b 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/Commands/BrowseCommand.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/Commands/BrowseCommand.cs
@@ -45,7 +45,7 @@ public sealed class BrowseCommand : TwinCATCommandBase
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Gateway, $"cli-{AmsNetId}:{AmsPort}")],
-            Tags = [],
+            RawTags = [],
             Timeout = Timeout,
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = true,
diff --git a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/TwinCATTagCommandBase.cs b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/TwinCATTagCommandBase.cs
index c7adb225..a962c7e8 100644
--- a/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/TwinCATTagCommandBase.cs
+++ b/src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/TwinCATTagCommandBase.cs
@@ -1,4 +1,5 @@
 using CliFx.Attributes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli;
 
@@ -20,8 +21,13 @@ public abstract class TwinCATTagCommandBase : TwinCATCommandBase
 
     /// <summary>
     ///     Build a <see cref="TwinCATDriverOptions"/> with the AMS target this base collected +
-    ///     the tag list a subclass supplies. Probe disabled, controller-browse disabled,
-    ///     native notifications toggled by <see cref="PollOnly"/>.
+    ///     the tag list a subclass supplies. The CLI holds typed definitions (synthesised from
+    ///     operator flags), so each is serialised back to a <see cref="RawTagEntry"/> — the v3
+    ///     delivery unit — via <see cref="TwinCATTagDefinitionFactory.ToTagConfig"/>, keyed by the
+    ///     def's synthesised name as its RawPath, with the def's <c>DeviceHostAddress</c> carried as
+    ///     the entry's <see cref="RawTagEntry.DeviceName"/> so the driver routes it to the sole
+    ///     device (matched by host). Probe disabled, controller-browse disabled, native
+    ///     notifications toggled by <see cref="PollOnly"/>.
     /// </summary>
     /// <param name="tags">Tag definitions for the driver.</param>
     /// <returns>The built <see cref="TwinCATDriverOptions"/>.</returns>
@@ -30,7 +36,8 @@ public abstract class TwinCATTagCommandBase : TwinCATCommandBase
         Devices = [new TwinCATDeviceOptions(
             HostAddress: Gateway,
             DeviceName: $"cli-{AmsNetId}:{AmsPort}")],
-        Tags = tags,
+        RawTags = [.. tags.Select(t => new RawTagEntry(
+            t.Name, TwinCATTagDefinitionFactory.ToTagConfig(t), t.WriteIdempotent, t.DeviceHostAddress))],
         Timeout = Timeout,
         Probe = new TwinCATProbeOptions { Enabled = false },
         UseNativeNotifications = !PollOnly,
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipDriverOptions.cs
index 775af04d..7c949862 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipDriverOptions.cs
@@ -1,10 +1,12 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip;
 
 /// <summary>
 ///     AB CIP / EtherNet-IP driver configuration, bound from the driver's <c>DriverConfig</c>
 ///     JSON at <c>DriverHost.RegisterAsync</c>. One instance supports N devices (PLCs) behind
-///     the same driver; per-device routing is keyed on <see cref="AbCipDeviceOptions.HostAddress"/>
-///     via <c>IPerCallHostResolver</c>.
+///     the same driver; per-device routing is keyed on the tag's device routing key (the RawPath's
+///     device segment, delivered on <see cref="RawTagEntry.DeviceName"/>).
 /// </summary>
 public sealed class AbCipDriverOptions
 {
@@ -12,14 +14,23 @@ public sealed class AbCipDriverOptions
     ///     PLCs this driver instance talks to. Each device contributes its own <see cref="AbCipHostAddress"/>
     ///     string as the <c>hostName</c> key used by resilience pipelines and the Admin UI.
     /// </summary>
+    /// <remarks>
+    ///     Wave C moves the device's live connection host into the <c>Device</c> row's <c>DeviceConfig</c>;
+    ///     for Wave B the list stays bound from <c>DriverConfig</c> as today, and a tag routes to its device
+    ///     by matching <see cref="RawTagEntry.DeviceName"/> against the device's name (<see cref="AbCipDeviceOptions.DeviceName"/>)
+    ///     or its <see cref="AbCipDeviceOptions.HostAddress"/>.
+    /// </remarks>
     public IReadOnlyList<AbCipDeviceOptions> Devices { get; init; } = [];
 
     /// <summary>
-    ///     Pre-declared tag map across all devices. Pre-declared tags always emit during
-    ///     discovery; opt in to controller-side discovery via
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag + DeviceName routing key); the driver maps each through
+    ///     <see cref="AbCipTagDefinitionFactory.FromTagConfig"/> into its RawPath → definition table.
+    ///     Pre-declared tags always emit during discovery; opt in to controller-side discovery via
     ///     <see cref="EnableControllerBrowse"/>.
     /// </summary>
-    public IReadOnlyList<AbCipTagDefinition> Tags { get; init; } = [];
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
 
     /// <summary>Per-device probe settings. Falls back to defaults when omitted.</summary>
     public AbCipProbeOptions Probe { get; init; } = new();
@@ -111,8 +122,13 @@ public sealed record AbCipDeviceOptions(
 /// <summary>
 ///     One AB-backed OPC UA variable. Mirrors the <c>ModbusTagDefinition</c> shape.
 /// </summary>
-/// <param name="Name">Tag name; becomes the OPC UA browse name and full reference.</param>
-/// <param name="DeviceHostAddress">Which device (<see cref="AbCipDeviceOptions.HostAddress"/>) this tag lives on.</param>
+/// <param name="Name">Tag name; becomes the OPC UA browse name and full reference (the RawPath in v3).</param>
+/// <param name="DeviceHostAddress">The tag's <b>device routing key</b> — the RawPath's device segment,
+///     threaded in from <see cref="RawTagEntry.DeviceName"/> by the driver at table-build time (the mapper
+///     leaves it empty; device placement is no longer in the TagConfig blob). Resolved against the driver's
+///     devices by matching <see cref="AbCipDeviceOptions.DeviceName"/> or <see cref="AbCipDeviceOptions.HostAddress"/>.
+///     TODO(v3 WaveC): once the connection host moves to the Device row's DeviceConfig this is a pure logical
+///     device name; the name still reads <c>DeviceHostAddress</c> to avoid churn across the driver + CLI.</param>
 /// <param name="TagPath">Logix symbolic path (controller or program scope).</param>
 /// <param name="DataType">Logix atomic type, or <see cref="AbCipDataType.Structure"/> for UDT-typed tags.</param>
 /// <param name="Writable">When <c>true</c> and the tag's ExternalAccess permits writes, IWritable routes writes here.</param>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipEquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipEquipmentTagParser.cs
deleted file mode 100644
index 82e77ee4..00000000
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipEquipmentTagParser.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System.Text.Json;
-using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip;
-
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>AbCipTagConfigModel</c>) into a transient <see cref="AbCipTagDefinition"/> whose
-/// <see cref="AbCipTagDefinition.Name"/> equals the reference string itself, so a value the
-/// driver publishes back keys the runtime's forward router correctly.</summary>
-public static class AbCipEquipmentTagParser
-{
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is an AbCip TagConfig object.</returns>
-    /// <remarks>
-    ///     <see cref="AbCipTagDefinition.Writable"/> is read from the optional <c>"writable"</c>
-    ///     boolean field in the TagConfig JSON; it defaults to <c>true</c> when the field is absent,
-    ///     matching the record's documented default and the behaviour of pre-declared tags. Operators
-    ///     who need a read-only OPC UA surface can author <c>"writable":false</c> in the TagConfig;
-    ///     the PLC's ExternalAccess attribute remains the effective write gate at the wire level.
-    /// </remarks>
-    public static bool TryParse(string reference, out AbCipTagDefinition def)
-    {
-        def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            // AbCip is a symbolic driver: the mandatory addressing field is the Logix tag path.
-            if (root.ValueKind != JsonValueKind.Object
-                || !root.TryGetProperty("tagPath", out var tagPathEl)
-                || tagPathEl.ValueKind != JsonValueKind.String)
-                return false;
-            var tagPath = tagPathEl.GetString();
-            if (string.IsNullOrWhiteSpace(tagPath)) return false;
-
-            var deviceHostAddress = ReadString(root, "deviceHostAddress");
-            // A "dataType":"Structure" input is accepted and produces a Structure-typed definition
-            // with Members:null. The driver treats this as a black-box dotted-path read: libplctag
-            // resolves the full tag path (e.g. "Motor.Speed") without enumerating UDT members.
-            // The address space emits a placeholder String variable; UDT member declarations are
-            // not supported in the equipment-tag flow.
-            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
-            // instead of silently defaulting to a wrong-width Good.
-            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", AbCipDataType.DInt, out var dataType)) return false;
-            // Review I-1 — an equipment tag is an ARRAY ⟺ isArray:true AND arrayLength >= 1. A
-            // 1-element array (isArray:true, arrayLength:1) is a VALID 1-element array — the
-            // foundation materialises a [1] OPC UA array node — so it must read as an array, not a
-            // scalar. ElementCount can't carry the signal (a scalar and a 1-element array both
-            // have a count of 1), so the explicit IsArray flag does.
-            var (isArray, elementCount) = ReadArrayShape(root);
-            // "writable" defaults to true when absent — matches AbCipTagDefinition.Writable default.
-            // Now via the shared TagConfigJson.ReadWritable (explicit-false-only), byte-identical to the
-            // hand-rolled read it replaces.
-            var writable = TagConfigJson.ReadWritable(root);
-            def = new AbCipTagDefinition(
-                Name: reference, DeviceHostAddress: deviceHostAddress, TagPath: tagPath,
-                DataType: dataType, Writable: writable, ElementCount: elementCount, IsArray: isArray);
-            return true;
-        }
-        catch (JsonException) { return false; }
-        catch (FormatException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-
-    /// <summary>
-    ///     Resolve the 1-D array shape from an <c>isArray</c> / <c>arrayLength</c> pair (the foundation
-    ///     contract carrier). The canonical rule: the tag is an ARRAY ⟺ <c>isArray</c> is truthy AND
-    ///     <c>arrayLength</c> is a number <c>&gt;= 1</c>. Any other combination (isArray absent/false,
-    ///     or isArray:true with arrayLength missing/invalid/&lt;1) is a SCALAR and returns
-    ///     <c>(IsArray: false, ElementCount: 1)</c>. This matches every other driver (Modbus, S7,
-    ///     TwinCAT, AbLegacy) which also return scalar for that degenerate input.
-    /// </summary>
-    private static (bool IsArray, int ElementCount) ReadArrayShape(JsonElement o)
-    {
-        var isArray = o.TryGetProperty("isArray", out var a) && a.ValueKind == JsonValueKind.True;
-        if (!isArray) return (false, 1);
-        if (o.TryGetProperty("arrayLength", out var len)
-            && len.ValueKind == JsonValueKind.Number
-            && len.TryGetInt32(out var n)
-            && n >= 1)
-            return (true, n);
-        // isArray:true but arrayLength missing/invalid/<1 — canonical rule: scalar (matches all other drivers).
-        return (false, 1);
-    }
-
-    /// <summary>
-    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
-    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
-    ///     or not an equipment-tag object. Never throws.
-    /// </summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
-    /// <returns>The warnings; empty when clean.</returns>
-    public static IReadOnlyList<string> Inspect(string reference)
-    {
-        var warnings = new List<string>();
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object)
-            {
-                warnings.Add("AbCip TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
-                return warnings;
-            }
-            var w = TagConfigJson.DescribeInvalidEnum<AbCipDataType>(root, "dataType");
-            if (w is not null) warnings.Add(w);
-        }
-        catch (JsonException)
-        {
-            warnings.Add("AbCip TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
-        }
-        return warnings;
-    }
-
-    private static string ReadString(JsonElement o, string name)
-        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.String
-           ? e.GetString() ?? "" : "";
-}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipTagDefinitionFactory.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipTagDefinitionFactory.cs
new file mode 100644
index 00000000..eaeaa4fb
--- /dev/null
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Contracts/AbCipTagDefinitionFactory.cs
@@ -0,0 +1,226 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip;
+
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>AbCipTagConfigModel</c>) into an <see cref="AbCipTagDefinition"/>. Under v3 a tag's
+///     identity is its <b>RawPath</b> (a cluster-scoped slash path), not the address blob — so the
+///     produced definition's <see cref="AbCipTagDefinition.Name"/> is the RawPath the driver was handed,
+///     which is exactly the wire reference the driver's <c>RawPath → def</c> resolver keys on. The driver
+///     builds that table by mapping each <see cref="RawTagEntry"/> the deploy artifact delivers through
+///     <see cref="FromTagConfig"/>; <see cref="ToTagConfig"/> is the inverse, used by authoring paths (the
+///     Client CLI + the driver-test <c>AbCipRawTags</c> helper) that hold a typed definition and need to
+///     synthesise the <c>TagConfig</c> blob for a <see cref="RawTagEntry"/>.
+/// </summary>
+/// <remarks>
+///     <para>
+///         <b>Device placement is NOT in the blob.</b> The pre-v3 parser read a <c>deviceHostAddress</c>
+///         key off the TagConfig; v3 drops it — a tag's device is the RawPath's device segment, delivered
+///         out-of-band on <see cref="RawTagEntry.DeviceName"/> and threaded onto the definition's
+///         <see cref="AbCipTagDefinition.DeviceHostAddress"/> (the device routing key) by the driver at
+///         table-build time. <see cref="FromTagConfig"/> therefore leaves that field empty.
+///     </para>
+///     <para>
+///         <b>Array / member / safety round-trip.</b> Today's production authoring surface
+///         (<c>AbCipTagConfigModel</c>) emits only <c>tagPath</c> / <c>dataType</c> / <c>writable</c>, so a
+///         real equipment tag maps to a scalar atomic definition. The additional <c>isArray</c> /
+///         <c>arrayLength</c> / <c>safetyTag</c> / <c>members</c> keys are read (and emitted by
+///         <see cref="ToTagConfig"/>) so the retired pre-declared-tag coverage — arrays and declared UDT
+///         member fan-out — survives the migration to the RawPath seam. They are additive: absent keys map
+///         to the scalar / no-member / non-safety defaults.
+///     </para>
+/// </remarks>
+public static class AbCipTagDefinitionFactory
+{
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     The mandatory addressing field is the Logix <c>tagPath</c>; <c>dataType</c> is read STRICTLY — a
+    ///     present-but-invalid (typo'd) value rejects the whole tag (returns <see langword="false"/> ⇒ the
+    ///     driver surfaces <c>BadNodeIdUnknown</c>) rather than silently defaulting to a wrong-width Good.
+    ///     <see cref="AbCipTagDefinition.DeviceHostAddress"/> and <see cref="AbCipTagDefinition.WriteIdempotent"/>
+    ///     are NOT read from the blob — the driver threads them in from the tag's <see cref="RawTagEntry"/>.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid AbCip address object.</returns>
+    /// <remarks>
+    ///     <see cref="AbCipTagDefinition.Writable"/> is read from the optional <c>"writable"</c> boolean;
+    ///     it defaults to <c>true</c> when absent, matching the record's documented default. Operators who
+    ///     need a read-only OPC UA surface can author <c>"writable":false</c>; the PLC's ExternalAccess
+    ///     attribute remains the effective write gate at the wire level.
+    /// </remarks>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out AbCipTagDefinition def)
+    {
+        def = null!;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            var root = doc.RootElement;
+            // AbCip is a symbolic driver: the mandatory addressing field is the Logix tag path.
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("tagPath", out var tagPathEl)
+                || tagPathEl.ValueKind != JsonValueKind.String)
+                return false;
+            var tagPath = tagPathEl.GetString();
+            if (string.IsNullOrWhiteSpace(tagPath)) return false;
+
+            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
+            // instead of silently defaulting to a wrong-width Good.
+            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", AbCipDataType.DInt, out var dataType)) return false;
+            // Review I-1 — an equipment tag is an ARRAY ⟺ isArray:true AND arrayLength >= 1. A 1-element
+            // array is a VALID 1-element array (the foundation materialises a [1] OPC UA array node).
+            var (isArray, elementCount) = ReadArrayShape(root);
+            // "writable" defaults to true when absent — matches AbCipTagDefinition.Writable default.
+            var writable = TagConfigJson.ReadWritable(root);
+            var safetyTag = ReadBool(root, "safetyTag");
+
+            // Optional declared UDT member fan-out (round-trips the retired pre-declared coverage). A
+            // malformed member (missing name / typo'd dataType) rejects the whole tag, mirroring the
+            // strict top-level contract.
+            IReadOnlyList<AbCipStructureMember>? members = null;
+            if (root.TryGetProperty("members", out var membersEl) && membersEl.ValueKind == JsonValueKind.Array)
+            {
+                var list = new List<AbCipStructureMember>();
+                foreach (var m in membersEl.EnumerateArray())
+                {
+                    if (m.ValueKind != JsonValueKind.Object
+                        || !m.TryGetProperty("name", out var nameEl)
+                        || nameEl.ValueKind != JsonValueKind.String
+                        || string.IsNullOrWhiteSpace(nameEl.GetString()))
+                        return false;
+                    if (!TagConfigJson.TryReadEnumStrict(m, "dataType", AbCipDataType.DInt, out var memberType)) return false;
+                    var (memberIsArray, memberCount) = ReadArrayShape(m);
+                    list.Add(new AbCipStructureMember(
+                        Name: nameEl.GetString()!,
+                        DataType: memberType,
+                        Writable: ReadBoolDefaultTrue(m, "writable"),
+                        WriteIdempotent: ReadBool(m, "writeIdempotent"),
+                        ElementCount: memberCount,
+                        IsArray: memberIsArray));
+                }
+                if (list.Count > 0) members = list;
+            }
+
+            def = new AbCipTagDefinition(
+                Name: rawPath, DeviceHostAddress: "", TagPath: tagPath!,
+                DataType: dataType, Writable: writable, WriteIdempotent: false,
+                Members: members, SafetyTag: safetyTag, ElementCount: elementCount, IsArray: isArray);
+            return true;
+        }
+        catch (JsonException) { return false; }
+        catch (FormatException) { return false; }
+        catch (InvalidOperationException) { return false; }
+    }
+
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI, the driver-test
+    ///     <c>AbCipRawTags</c> helper) that construct an <see cref="AbCipTagDefinition"/> and need the
+    ///     <c>TagConfig</c> string to hand the driver as a <see cref="RawTagEntry"/>. Enum values are written
+    ///     as their name strings; optional fields are emitted only when non-default so the blob stays minimal.
+    ///     <see cref="AbCipTagDefinition.DeviceHostAddress"/> (device routing key) and
+    ///     <see cref="AbCipTagDefinition.WriteIdempotent"/> are NOT emitted — they travel on the
+    ///     <see cref="RawTagEntry"/>, not inside the blob.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(AbCipTagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["tagPath"] = def.TagPath,
+            ["dataType"] = def.DataType.ToString(),
+            ["writable"] = def.Writable,
+        };
+        if (def.IsArray)
+        {
+            o["isArray"] = true;
+            o["arrayLength"] = Math.Max(1, def.ElementCount);
+        }
+        if (def.SafetyTag) o["safetyTag"] = true;
+        if (def.Members is { Count: > 0 } members)
+        {
+            var arr = new JsonArray();
+            foreach (var m in members)
+            {
+                var mo = new JsonObject
+                {
+                    ["name"] = m.Name,
+                    ["dataType"] = m.DataType.ToString(),
+                    ["writable"] = m.Writable,
+                };
+                if (m.WriteIdempotent) mo["writeIdempotent"] = true;
+                if (m.IsArray)
+                {
+                    mo["isArray"] = true;
+                    mo["arrayLength"] = Math.Max(1, m.ElementCount);
+                }
+                arr.Add(mo);
+            }
+            o["members"] = arr;
+        }
+        return o.ToJsonString();
+    }
+
+    /// <summary>
+    ///     Resolve the 1-D array shape from an <c>isArray</c> / <c>arrayLength</c> pair (the foundation
+    ///     contract carrier). The canonical rule: the tag is an ARRAY ⟺ <c>isArray</c> is truthy AND
+    ///     <c>arrayLength</c> is a number <c>&gt;= 1</c>. Any other combination is a SCALAR and returns
+    ///     <c>(IsArray: false, ElementCount: 1)</c> — matching every other driver.
+    /// </summary>
+    private static (bool IsArray, int ElementCount) ReadArrayShape(JsonElement o)
+    {
+        var isArray = o.TryGetProperty("isArray", out var a) && a.ValueKind == JsonValueKind.True;
+        if (!isArray) return (false, 1);
+        if (o.TryGetProperty("arrayLength", out var len)
+            && len.ValueKind == JsonValueKind.Number
+            && len.TryGetInt32(out var n)
+            && n >= 1)
+            return (true, n);
+        // isArray:true but arrayLength missing/invalid/<1 — canonical rule: scalar (matches all other drivers).
+        return (false, 1);
+    }
+
+    /// <summary>
+    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
+    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
+    ///     or not an equipment-tag object. Never throws.
+    /// </summary>
+    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
+    /// <returns>The warnings; empty when clean.</returns>
+    public static IReadOnlyList<string> Inspect(string reference)
+    {
+        var warnings = new List<string>();
+        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
+        try
+        {
+            using var doc = JsonDocument.Parse(reference);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                warnings.Add("AbCip TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
+                return warnings;
+            }
+            var w = TagConfigJson.DescribeInvalidEnum<AbCipDataType>(root, "dataType");
+            if (w is not null) warnings.Add(w);
+        }
+        catch (JsonException)
+        {
+            warnings.Add("AbCip TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
+        }
+        return warnings;
+    }
+
+    private static bool ReadBool(JsonElement o, string name)
+        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.True;
+
+    private static bool ReadBoolDefaultTrue(JsonElement o, string name)
+        => !o.TryGetProperty(name, out var e) || e.ValueKind != JsonValueKind.False;
+}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriver.cs
index 8b2cd78f..05ad2904 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriver.cs
@@ -82,12 +82,23 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
         _discoveredUdtShapes[UdtShapeKey(deviceHostAddress, structName)] = shape;
 
     private readonly PollGroupEngine _poll;
+    // Devices keyed by host address — the primary registry (GetDeviceState, discovery, probe, diagnostics).
     private readonly Dictionary<string, DeviceState> _devices = new(StringComparer.OrdinalIgnoreCase);
-    private readonly Dictionary<string, AbCipTagDefinition> _tagsByName = new(StringComparer.OrdinalIgnoreCase);
+    // Tag-routing index: a tag's device routing key (DeviceName ?? HostAddress, plus the HostAddress alias)
+    // → its DeviceState. A tag resolves to its device by DeviceName-or-host so multi-device routing keys on
+    // the RawPath's device segment. TODO(v3 WaveC): collapses to a pure DeviceName index once the connection
+    // host moves into the Device row's DeviceConfig.
+    private readonly Dictionary<string, DeviceState> _devicesByRoutingKey = new(StringComparer.OrdinalIgnoreCase);
+    // v3 authored RawPath → definition table (parents + fanned-out UDT members), keyed case-sensitive
+    // ordinal. Built in InitializeAsync from _options.RawTags via the pure mapper.
+    private readonly Dictionary<string, AbCipTagDefinition> _tagsByRawPath = new(StringComparer.Ordinal);
+    // Top-level authored definitions (parents + flat tags, NOT synthesised members), in author order —
+    // the source DiscoverAsync groups by device. Members are synthesised inside the discovery/read paths.
+    private readonly List<AbCipTagDefinition> _declaredTags = new();
 
-    // Resolves a read/write/subscribe fullReference to a tag definition, bridging the two
-    // authoring models: an authored tag-table entry (by name) OR an equipment tag whose
-    // reference is its raw TagConfig JSON (parsed once via AbCipEquipmentTagParser, cached).
+    // Resolves a read/write/subscribe fullReference (always a RawPath in v3) to a tag definition by a
+    // single hit on the authored _tagsByRawPath table; a miss is a miss (the pre-v3 blob-parse fallback
+    // is retired — see EquipmentTagRefResolver).
     private readonly EquipmentTagRefResolver<AbCipTagDefinition> _resolver;
 
     private readonly ILogger<AbCipDriver> _logger;
@@ -128,8 +139,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
         _templateReaderFactory = templateReaderFactory ?? new LibplctagTemplateReaderFactory();
         _logger = logger ?? NullLogger<AbCipDriver>.Instance;
         _resolver = new EquipmentTagRefResolver<AbCipTagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            r => AbCipEquipmentTagParser.TryParse(r, out var d) ? d : null);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         _poll = new PollGroupEngine(
             reader: ReadAsync,
             onChange: (handle, tagRef, snapshot) =>
@@ -248,7 +258,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
             if (!string.IsNullOrWhiteSpace(driverConfigJson))
             {
                 var parsed = AbCipDriverFactoryExtensions.ParseOptions(_driverInstanceId, driverConfigJson);
-                if (parsed.Devices.Count > 0 || parsed.Tags.Count > 0)
+                if (parsed.Devices.Count > 0 || parsed.RawTags.Count > 0)
                 {
                     _options = parsed;
                     _alarmProjection = new AbCipAlarmProjection(this, _options.AlarmPollInterval, _logger);
@@ -261,18 +271,39 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
                     ?? throw new InvalidOperationException(
                         $"AbCip device has invalid HostAddress '{device.HostAddress}' — expected 'ab://gateway[:port]/cip-path'.");
                 var profile = AbCipPlcFamilyProfile.ForFamily(device.PlcFamily);
-                _devices[device.HostAddress] = new DeviceState(addr, device, profile);
+                var state = new DeviceState(addr, device, profile);
+                _devices[device.HostAddress] = state;
+                // Route index: a tag reaches this device by matching its DeviceName routing key OR its
+                // host address. Devices with no explicit DeviceName are identified purely by host today.
+                _devicesByRoutingKey[device.HostAddress] = state;
+                if (!string.IsNullOrEmpty(device.DeviceName))
+                    _devicesByRoutingKey[device.DeviceName] = state;
             }
-            foreach (var tag in _options.Tags)
+
+            // Build the RawPath → definition table from the authored raw tags. Each entry's TagConfig blob
+            // is mapped by the pure factory; the entry's DeviceName (routing key) + WriteIdempotent flag are
+            // threaded onto the def (they live on the RawTagEntry, not inside the blob). A mapper miss is
+            // skipped (logged), never thrown — a bad tag must not fail the whole driver init.
+            foreach (var entry in _options.RawTags)
             {
-                // Duplicate-key check: a collision means two configured tags have the same name.
+                if (!AbCipTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var mapped))
+                {
+                    _logger.LogWarning(
+                        "AbCip tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+                    continue;
+                }
+                var tag = mapped with { DeviceHostAddress = entry.DeviceName, WriteIdempotent = entry.WriteIdempotent };
+
+                // Duplicate-key check: a collision means two authored tags share the same RawPath.
                 // Fail fast at init time with a diagnostic rather than silently clobbering.
-                if (_tagsByName.TryGetValue(tag.Name, out var existingTag))
+                if (_tagsByRawPath.TryGetValue(tag.Name, out var existingTag))
                     throw new InvalidOperationException(
                         $"AbCip tag name collision: '{tag.Name}' is declared more than once. " +
                         $"Existing entry DeviceHostAddress='{existingTag.DeviceHostAddress}', " +
                         $"TagPath='{existingTag.TagPath}'. Rename or remove the duplicate.");
-                _tagsByName[tag.Name] = tag;
+                _tagsByRawPath[tag.Name] = tag;
+                _declaredTags.Add(tag);
 
                 if (tag.DataType == AbCipDataType.Structure && tag.Members is { Count: > 0 })
                 {
@@ -295,12 +326,12 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
                         // Member fan-out duplicate check: a member-path collision means two
                         // configured structure tags produce the same member path, or a member
                         // name collides with an independently-declared tag.
-                        if (_tagsByName.TryGetValue(memberTag.Name, out var existingMember))
+                        if (_tagsByRawPath.TryGetValue(memberTag.Name, out var existingMember))
                             throw new InvalidOperationException(
                                 $"AbCip tag name collision: '{memberTag.Name}' is produced by both " +
                                 $"'{tag.Name}.{member.Name}' (member fan-out) and an existing tag " +
                                 $"'{existingMember.Name}'. Rename one of the configured tags to resolve.");
-                        _tagsByName[memberTag.Name] = memberTag;
+                        _tagsByRawPath[memberTag.Name] = memberTag;
                     }
                 }
             }
@@ -383,8 +414,10 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
             state.DisposeHandles();
         }
         _devices.Clear();
-        _tagsByName.Clear();
-        _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
+        _devicesByRoutingKey.Clear();
+        _tagsByRawPath.Clear();
+        _declaredTags.Clear();
+        _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
         _health = new DriverHealth(DriverState.Unknown, _health.LastSuccessfulRead, null);
     }
 
@@ -502,19 +535,19 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
     // ---- IPerCallHostResolver ----
 
     /// <summary>
-    ///     Resolve a read/write/subscribe reference to the device host that keys its per-host
-    ///     resilience (bulkhead / circuit breaker). CONV-4: routes through
-    ///     <see cref="EquipmentTagRefResolver{TDef}"/> so an equipment-tag reference (raw TagConfig
-    ///     JSON) resolves to its OWN authored device rather than the first-device fallback — else a
-    ///     broken device B would trip device A's breaker. The resolver caches parses, so this adds
-    ///     no per-call cost after first use.
+    ///     Resolve a read/write/subscribe reference (a RawPath in v3) to the device host that keys its
+    ///     per-host resilience (bulkhead / circuit breaker). CONV-4: routes through the authored table so a
+    ///     tag resolves to its OWN device's host rather than the first-device fallback — else a broken
+    ///     device B would trip device A's breaker. The tag's device routing key is resolved to the device's
+    ///     actual host address (the resilience key), matching by DeviceName-or-host.
     /// </summary>
-    /// <param name="fullReference">The tag reference (authored name or equipment-tag JSON).</param>
+    /// <param name="fullReference">The tag RawPath reference.</param>
     /// <returns>The device host key.</returns>
     public string ResolveHost(string fullReference)
     {
-        if (_resolver.TryResolve(fullReference, out var def) && !string.IsNullOrEmpty(def.DeviceHostAddress))
-            return def.DeviceHostAddress;
+        if (_resolver.TryResolve(fullReference, out var def)
+            && _devicesByRoutingKey.TryGetValue(def.DeviceHostAddress, out var state))
+            return state.Options.HostAddress;
         return _options.Devices.FirstOrDefault()?.HostAddress ?? DriverInstanceId;
     }
 
@@ -536,7 +569,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
         // grouping is itself gated behind EnableDeclarationOnlyUdtGrouping — Studio 5000 may
         // reorder UDT members vs declaration order, so the fast path is opt-in only.
         var plan = AbCipUdtReadPlanner.Build(
-            fullReferences, _tagsByName, _options.EnableDeclarationOnlyUdtGrouping);
+            fullReferences, _tagsByRawPath, _options.EnableDeclarationOnlyUdtGrouping);
 
         foreach (var group in plan.Groups)
             await ReadGroupAsync(group, results, now, cancellationToken).ConfigureAwait(false);
@@ -564,7 +597,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
             results[fb.OriginalIndex] = new DataValueSnapshot(null, AbCipStatusMapper.BadNotSupported, null, now);
             return;
         }
-        if (!_devices.TryGetValue(def.DeviceHostAddress, out var device))
+        if (!_devicesByRoutingKey.TryGetValue(def.DeviceHostAddress, out var device))
         {
             results[fb.OriginalIndex] = new DataValueSnapshot(null, AbCipStatusMapper.BadNodeIdUnknown, null, now);
             return;
@@ -646,7 +679,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
     {
         var parent = group.ParentDefinition;
 
-        if (!_devices.TryGetValue(parent.DeviceHostAddress, out var device))
+        if (!_devicesByRoutingKey.TryGetValue(parent.DeviceHostAddress, out var device))
         {
             StampGroupStatus(group, results, now, AbCipStatusMapper.BadNodeIdUnknown);
             return;
@@ -736,7 +769,7 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
                 results[i] = new WriteResult(AbCipStatusMapper.BadNotWritable);
                 continue;
             }
-            if (!_devices.TryGetValue(def.DeviceHostAddress, out var device))
+            if (!_devicesByRoutingKey.TryGetValue(def.DeviceHostAddress, out var device))
             {
                 results[i] = new WriteResult(AbCipStatusMapper.BadNodeIdUnknown);
                 continue;
@@ -1017,9 +1050,9 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
             // Pre-declared tags — always emitted; the primary config path. UDT tags with declared
             // Members fan out into a sub-folder + one Variable per member instead of a single
             // Structure Variable (Structure has no useful scalar value + member-addressable paths
-            // are what downstream consumers actually want).
-            var preDeclared = _options.Tags.Where(t =>
-                string.Equals(t.DeviceHostAddress, device.HostAddress, StringComparison.OrdinalIgnoreCase));
+            // are what downstream consumers actually want). A tag reaches this device when its
+            // device routing key matches the device's DeviceName or its host address.
+            var preDeclared = _declaredTags.Where(t => RoutesToDevice(t, device));
             foreach (var tag in preDeclared)
             {
                 if (AbCipSystemTagFilter.IsSystemTag(tag.Name)) continue;
@@ -1235,6 +1268,14 @@ public sealed class AbCipDriver : IDriver, IReadable, IWritable, ITagDiscovery,
     // a legacy definition carrying only ElementCount > 1 stays an array for back-compat.
     private static bool IsArrayTag(AbCipTagDefinition tag) => tag.IsArray || tag.ElementCount > 1;
 
+    // A tag routes to a device when its device routing key (DeviceHostAddress, threaded from the
+    // RawTagEntry.DeviceName) matches the device's DeviceName or its host address. TODO(v3 WaveC):
+    // collapses to a DeviceName-only match once the connection host lives on the Device row's DeviceConfig.
+    private static bool RoutesToDevice(AbCipTagDefinition tag, AbCipDeviceOptions device) =>
+        string.Equals(tag.DeviceHostAddress, device.HostAddress, StringComparison.OrdinalIgnoreCase)
+        || (!string.IsNullOrEmpty(device.DeviceName)
+            && string.Equals(tag.DeviceHostAddress, device.DeviceName, StringComparison.OrdinalIgnoreCase));
+
     private static DriverAttributeInfo ToAttributeInfo(AbCipTagDefinition tag) => new(
         FullName: tag.Name,
         DriverDataType: tag.DataType.ToDriverDataType(),
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverFactoryExtensions.cs
index 5761cb95..da0fd469 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverFactoryExtensions.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using System.Text.Json.Serialization;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip;
@@ -68,9 +68,11 @@ public static class AbCipDriverFactoryExtensions
                     AllowPacking: d.AllowPacking,
                     ConnectionSize: d.ConnectionSize))]
                 : [],
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => BuildTag(t, driverInstanceId))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates RawTags with the cluster's authored raw AbCip
+            // tags (RawPath + TagConfig blob + WriteIdempotent + DeviceName). The driver maps each entry
+            // through AbCipTagDefinitionFactory.FromTagConfig at Initialize; the legacy pre-declared DTO
+            // tag path (structured Tags[] → BuildTag) is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new AbCipProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -100,32 +102,6 @@ public static class AbCipDriverFactoryExtensions
     private static TimeSpan PositiveTimeoutOrDefault(int? ms, int defaultMs) =>
         TimeSpan.FromMilliseconds(ms is int v and > 0 ? v : defaultMs);
 
-    private static AbCipTagDefinition BuildTag(AbCipTagDto t, string driverInstanceId) =>
-        new(
-            Name: t.Name ?? throw new InvalidOperationException(
-                $"AB CIP config for '{driverInstanceId}' has a tag missing Name"),
-            DeviceHostAddress: t.DeviceHostAddress ?? throw new InvalidOperationException(
-                $"AB CIP tag '{t.Name}' in '{driverInstanceId}' missing DeviceHostAddress"),
-            TagPath: t.TagPath ?? throw new InvalidOperationException(
-                $"AB CIP tag '{t.Name}' in '{driverInstanceId}' missing TagPath"),
-            DataType: ParseEnum<AbCipDataType>(t.DataType, t.Name, driverInstanceId, "DataType"),
-            Writable: t.Writable ?? true,
-            WriteIdempotent: t.WriteIdempotent ?? false,
-            Members: t.Members is { Count: > 0 }
-                ? [.. t.Members.Select(m => new AbCipStructureMember(
-                    Name: m.Name ?? throw new InvalidOperationException(
-                        $"AB CIP tag '{t.Name}' in '{driverInstanceId}' has a member missing Name"),
-                    DataType: ParseEnum<AbCipDataType>(m.DataType, t.Name, driverInstanceId,
-                        $"Members[{m.Name}].DataType"),
-                    Writable: m.Writable ?? true,
-                    WriteIdempotent: m.WriteIdempotent ?? false,
-                    ElementCount: m.ElementCount is > 0 ? m.ElementCount.Value : 1,
-                    IsArray: m.IsArray))]
-                : null,
-            SafetyTag: t.SafetyTag ?? false,
-            ElementCount: t.ElementCount is > 0 ? t.ElementCount.Value : 1,
-            IsArray: t.IsArray);
-
     private static T ParseEnum<T>(string? raw, string? tagName, string driverInstanceId, string field,
         T? fallback = null) where T : struct, Enum
     {
@@ -182,9 +158,10 @@ public static class AbCipDriverFactoryExtensions
         public List<AbCipDeviceDto>? Devices { get; init; }
 
         /// <summary>
-        /// Gets or sets the list of tags to monitor.
+        /// Gets or sets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent + DeviceName)
+        /// the deploy artifact delivers. The driver maps each through the tag-definition factory at Initialize.
         /// </summary>
-        public List<AbCipTagDto>? Tags { get; init; }
+        public List<RawTagEntry>? RawTags { get; init; }
 
         /// <summary>
         /// Gets or sets the probe configuration.
@@ -220,100 +197,6 @@ public static class AbCipDriverFactoryExtensions
         public int? ConnectionSize { get; init; }
     }
 
-    internal sealed class AbCipTagDto
-    {
-        /// <summary>
-        /// Gets or sets the tag name.
-        /// </summary>
-        public string? Name { get; init; }
-
-        /// <summary>
-        /// Gets or sets the device host address.
-        /// </summary>
-        public string? DeviceHostAddress { get; init; }
-
-        /// <summary>
-        /// Gets or sets the tag path.
-        /// </summary>
-        public string? TagPath { get; init; }
-
-        /// <summary>
-        /// Gets or sets the data type.
-        /// </summary>
-        public string? DataType { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether the tag is writable.
-        /// </summary>
-        public bool? Writable { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether write is idempotent.
-        /// </summary>
-        public bool? WriteIdempotent { get; init; }
-
-        /// <summary>
-        /// Gets or sets the list of structure members.
-        /// </summary>
-        public List<AbCipMemberDto>? Members { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether this is a safety tag.
-        /// </summary>
-        public bool? SafetyTag { get; init; }
-
-        /// <summary>
-        /// Gets or sets the explicit 1-D array signal — <c>true</c> ⟺ the tag is an array (even a
-        /// 1-element one). Mirrors <c>AbCipTagDefinition.IsArray</c>; optional (absent ⇒ scalar).
-        /// </summary>
-        [JsonPropertyName("isArray")]
-        public bool IsArray { get; init; }
-
-        /// <summary>
-        /// Gets or sets the number of elements for a 1-D array tag; <c>1</c> (or absent) for a scalar.
-        /// Mirrors <c>AbCipTagDefinition.ElementCount</c>; only positive values are honoured.
-        /// </summary>
-        [JsonPropertyName("elementCount")]
-        public int? ElementCount { get; init; }
-    }
-
-    internal sealed class AbCipMemberDto
-    {
-        /// <summary>
-        /// Gets or sets the member name.
-        /// </summary>
-        public string? Name { get; init; }
-
-        /// <summary>
-        /// Gets or sets the data type.
-        /// </summary>
-        public string? DataType { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether the member is writable.
-        /// </summary>
-        public bool? Writable { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether write is idempotent.
-        /// </summary>
-        public bool? WriteIdempotent { get; init; }
-
-        /// <summary>
-        /// Gets or sets the explicit 1-D array signal for the member — <c>true</c> ⟺ the member is
-        /// an array (even a 1-element one). Mirrors <c>AbCipStructureMember.IsArray</c>; optional.
-        /// </summary>
-        [JsonPropertyName("isArray")]
-        public bool IsArray { get; init; }
-
-        /// <summary>
-        /// Gets or sets the number of elements for a 1-D array member; <c>1</c> (or absent) for a
-        /// scalar. Mirrors <c>AbCipStructureMember.ElementCount</c>; only positive values are honoured.
-        /// </summary>
-        [JsonPropertyName("elementCount")]
-        public int? ElementCount { get; init; }
-    }
-
     internal sealed class AbCipProbeDto
     {
         /// <summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverProbe.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverProbe.cs
index 1621ecec..58e8a0ec 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverProbe.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDriverProbe.cs
@@ -89,14 +89,22 @@ public sealed class AbCipDriverProbe : IDriverProbe
         // Forward Open to confirm the remote endpoint speaks CIP, not just TCP.
         var profile = AbCipPlcFamilyProfile.ForFamily(firstDevice?.PlcFamily ?? AbCipPlcFamily.ControlLogix);
 
-        // Prefer the first declared tag path as the probe tag name (it must exist on the PLC).
-        // Fall back to a benign system attribute that is present on all ControlLogix/CompactLogix
-        // controllers (@raw_cpu_type); still returns ErrorNotFound on Micro800 / MicroLogix, which
-        // is sufficient to confirm CIP reachability.
-        var tagName = opts.Tags.FirstOrDefault(
-            t => string.Equals(t.DeviceHostAddress, firstDevice?.HostAddress, StringComparison.OrdinalIgnoreCase))
-                ?.TagPath
-            ?? opts.Tags.FirstOrDefault()?.TagPath
+        // Prefer the first authored tag path as the probe tag name (it must exist on the PLC). v3: the
+        // tags arrive as RawTagEntry blobs — map each through the pure factory to recover its TagPath +
+        // device routing key. Fall back to a benign system attribute present on all ControlLogix /
+        // CompactLogix controllers (@raw_cpu_type); still returns ErrorNotFound on Micro800 / MicroLogix,
+        // which is sufficient to confirm CIP reachability.
+        var mappedTags = opts.RawTags
+            .Select(e => AbCipTagDefinitionFactory.FromTagConfig(e.TagConfig, e.RawPath, out var d)
+                ? (Ok: true, Device: e.DeviceName, d.TagPath)
+                : (Ok: false, Device: e.DeviceName, TagPath: null!))
+            .Where(x => x.Ok)
+            .ToList();
+        var tagName = mappedTags.FirstOrDefault(
+                x => string.Equals(x.Device, firstDevice?.HostAddress, StringComparison.OrdinalIgnoreCase)
+                    || (firstDevice?.DeviceName is { } dn && string.Equals(x.Device, dn, StringComparison.OrdinalIgnoreCase)))
+                .TagPath
+            ?? mappedTags.FirstOrDefault().TagPath
             ?? "@raw_cpu_type";
 
         var p = new AbCipTagCreateParams(
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipUdtReadPlanner.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipUdtReadPlanner.cs
index fd729773..28bc181f 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipUdtReadPlanner.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipUdtReadPlanner.cs
@@ -18,9 +18,10 @@ public static class AbCipUdtReadPlanner
 {
     /// <summary>
     ///     Split <paramref name="requests"/> into whole-UDT groups + per-tag leftovers.
-    ///     <paramref name="tagsByName"/> is the driver's <c>_tagsByName</c> map — both parent
-    ///     UDT rows and their fanned-out member rows live there. Lookup is OrdinalIgnoreCase
-    ///     to match the driver's dictionary semantics. When
+    ///     <paramref name="tagsByName"/> is the driver's <c>_tagsByRawPath</c> map (RawPath → def) —
+    ///     both parent UDT rows and their fanned-out member rows live there. Tag lookup honours the
+    ///     passed dictionary's comparer (v3: case-sensitive Ordinal RawPaths); the internal
+    ///     parent-name grouping is OrdinalIgnoreCase. When
     ///     <paramref name="enableDeclarationOnlyGrouping"/> is <c>false</c> no groups are
     ///     formed — every reference goes to the per-tag fallback path so member decoding never
     ///     relies on declaration-order offsets that may not match the controller layout.
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyDriverOptions.cs
index 598fb18b..c9376a09 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyDriverOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.PlcFamilies;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy;
@@ -14,8 +15,15 @@ public sealed class AbLegacyDriverOptions
     /// <summary>Gets or sets the list of PCCC devices to connect to.</summary>
     public IReadOnlyList<AbLegacyDeviceOptions> Devices { get; init; } = [];
 
-    /// <summary>Gets or sets the list of PCCC tag definitions.</summary>
-    public IReadOnlyList<AbLegacyTagDefinition> Tags { get; init; } = [];
+    /// <summary>
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag + owning <see cref="RawTagEntry.DeviceName"/>); the driver maps each
+    ///     through <see cref="AbLegacyTagDefinitionFactory.FromTagConfig"/> into its RawPath → definition
+    ///     table, routing each to its device by <see cref="RawTagEntry.DeviceName"/>. AbLegacy has no
+    ///     discovery protocol — the driver serves exactly these.
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
 
     /// <summary>Gets or sets the probe (connectivity check) options.</summary>
     public AbLegacyProbeOptions Probe { get; init; } = new();
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyEquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyEquipmentTagParser.cs
deleted file mode 100644
index 59d20d7a..00000000
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyEquipmentTagParser.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System.Text.Json;
-using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy;
-
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>AbLegacyTagConfigModel</c>) into a transient <see cref="AbLegacyTagDefinition"/> whose
-/// <see cref="AbLegacyTagDefinition.Name"/> equals the reference string itself, so a value the
-/// driver publishes back keys the runtime's forward router correctly.</summary>
-public static class AbLegacyEquipmentTagParser
-{
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is an AbLegacy address object.</returns>
-    /// <remarks>
-    /// <para>
-    ///     When <c>isArray</c> is the JSON literal <see langword="true"/> but <c>arrayLength</c> is
-    ///     absent, zero, or negative, the result is silently a <b>scalar</b>
-    ///     (<see cref="AbLegacyTagDefinition.ArrayLength"/> is <see langword="null"/>).
-    ///     A valid positive <c>arrayLength</c> is required to produce an array tag; <c>isArray:true</c>
-    ///     alone is not sufficient.  This is intentional: a stale length behind a cleared or absent
-    ///     <c>isArray</c> flag must never produce an orphan array tag that mismatches its scalar OPC UA
-    ///     node (see in-source comment, review C-2).
-    /// </para>
-    /// </remarks>
-    public static bool TryParse(string reference, out AbLegacyTagDefinition def)
-    {
-        def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object
-                || !root.TryGetProperty("address", out var addr)
-                || addr.ValueKind != JsonValueKind.String)
-                return false;
-            var address = addr.GetString();
-            if (string.IsNullOrWhiteSpace(address)) return false;
-            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
-            // instead of silently defaulting to a wrong-width Good.
-            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", AbLegacyDataType.Int, out var dataType)) return false;
-            var deviceHostAddress = ReadString(root, "deviceHostAddress");
-            int? arrayLength = null;
-            if (IsArrayFlag(root))
-            {
-                var rawLength = ReadInt(root, "arrayLength");
-                if (rawLength >= 1)
-                    arrayLength = Math.Min(rawLength, AbLegacyArray.MaxElements);
-            }
-            // "writable" defaults to true when absent (today's value) — makes read-only equipment tags
-            // authorable (UNDER-6).
-            var writable = TagConfigJson.ReadWritable(root);
-            def = new AbLegacyTagDefinition(
-                Name: reference, DeviceHostAddress: deviceHostAddress, Address: address,
-                DataType: dataType, Writable: writable, ArrayLength: arrayLength);
-            return true;
-        }
-        catch (JsonException) { return false; }
-        catch (FormatException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-
-    /// <summary>
-    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
-    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
-    ///     or not an equipment-tag object. Never throws.
-    /// </summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
-    /// <returns>The warnings; empty when clean.</returns>
-    public static IReadOnlyList<string> Inspect(string reference)
-    {
-        var warnings = new List<string>();
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object)
-            {
-                warnings.Add("AbLegacy TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
-                return warnings;
-            }
-            var w = TagConfigJson.DescribeInvalidEnum<AbLegacyDataType>(root, "dataType");
-            if (w is not null) warnings.Add(w);
-        }
-        catch (JsonException)
-        {
-            warnings.Add("AbLegacy TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
-        }
-        return warnings;
-    }
-
-    private static string ReadString(JsonElement o, string name)
-        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.String
-           ? e.GetString() ?? "" : "";
-
-    private static int ReadInt(JsonElement o, string name)
-        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.Number
-           && e.TryGetInt32(out var v) ? v : 0;
-
-    // True only when the `isArray` property is the JSON literal true. Absent or false → scalar.
-    private static bool IsArrayFlag(JsonElement o)
-        => o.TryGetProperty("isArray", out var e) && e.ValueKind == JsonValueKind.True;
-}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyTagDefinitionFactory.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyTagDefinitionFactory.cs
new file mode 100644
index 00000000..011be526
--- /dev/null
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Contracts/AbLegacyTagDefinitionFactory.cs
@@ -0,0 +1,158 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy;
+
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>AbLegacyTagConfigModel</c>) into an <see cref="AbLegacyTagDefinition"/>. Under v3 a
+///     tag's identity is its <b>RawPath</b> (a cluster-scoped slash path), not the address blob — so the
+///     produced definition's <see cref="AbLegacyTagDefinition.Name"/> is the RawPath the driver was
+///     handed, which is exactly the wire reference the driver's <c>RawPath → def</c> resolver keys on.
+///     The driver builds that table by mapping each <see cref="RawTagEntry"/> the deploy artifact
+///     delivers through <see cref="FromTagConfig"/>; <see cref="ToTagConfig"/> is the inverse, used by
+///     authoring paths (the Client CLI) that hold a typed definition and need to synthesise the
+///     <c>TagConfig</c> blob for a <see cref="RawTagEntry"/>.
+/// </summary>
+/// <remarks>
+///     <para>
+///         <b>Device routing is out of band.</b> The AB Legacy driver is multi-device, but a tag's
+///         device no longer travels inside the <c>TagConfig</c> blob — the <c>deviceHostAddress</c> key
+///         is DROPPED here. The deploy artifact carries the tag's device on the
+///         <see cref="RawTagEntry.DeviceName"/> segment instead; the driver threads that name onto the
+///         definition (resolving it to a configured device) at table-build time.
+///     </para>
+/// </remarks>
+public static class AbLegacyTagDefinitionFactory
+{
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     The <c>dataType</c> enum is read STRICTLY — a present-but-invalid (typo'd) value rejects the whole
+    ///     tag (returns <see langword="false"/> ⇒ the driver surfaces <c>BadNodeIdUnknown</c>) rather than
+    ///     silently defaulting to a wrong-width Good. <see cref="AbLegacyTagDefinition.WriteIdempotent"/> is
+    ///     NOT read from the blob — it is a platform flag the caller threads in from the tag's
+    ///     <see cref="RawTagEntry.WriteIdempotent"/>. <see cref="AbLegacyTagDefinition.DeviceHostAddress"/>
+    ///     is left empty here — device routing travels on <see cref="RawTagEntry.DeviceName"/> and the driver
+    ///     resolves it at table-build time.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid AbLegacy address object.</returns>
+    /// <remarks>
+    /// <para>
+    ///     When <c>isArray</c> is the JSON literal <see langword="true"/> but <c>arrayLength</c> is
+    ///     absent, zero, or negative, the result is silently a <b>scalar</b>
+    ///     (<see cref="AbLegacyTagDefinition.ArrayLength"/> is <see langword="null"/>).
+    ///     A valid positive <c>arrayLength</c> is required to produce an array tag; <c>isArray:true</c>
+    ///     alone is not sufficient.  This is intentional: a stale length behind a cleared or absent
+    ///     <c>isArray</c> flag must never produce an orphan array tag that mismatches its scalar OPC UA
+    ///     node (see in-source comment, review C-2).
+    /// </para>
+    /// </remarks>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out AbLegacyTagDefinition def)
+    {
+        def = null!;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("address", out var addr)
+                || addr.ValueKind != JsonValueKind.String)
+                return false;
+            var address = addr.GetString();
+            if (string.IsNullOrWhiteSpace(address)) return false;
+            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
+            // instead of silently defaulting to a wrong-width Good.
+            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", AbLegacyDataType.Int, out var dataType)) return false;
+            int? arrayLength = null;
+            if (IsArrayFlag(root))
+            {
+                var rawLength = ReadInt(root, "arrayLength");
+                if (rawLength >= 1)
+                    arrayLength = Math.Min(rawLength, AbLegacyArray.MaxElements);
+            }
+            // "writable" defaults to true when absent (today's value) — makes read-only equipment tags
+            // authorable (UNDER-6).
+            var writable = TagConfigJson.ReadWritable(root);
+            def = new AbLegacyTagDefinition(
+                Name: rawPath, DeviceHostAddress: "", Address: address,
+                DataType: dataType, Writable: writable, WriteIdempotent: false, ArrayLength: arrayLength);
+            return true;
+        }
+        catch (JsonException) { return false; }
+        catch (FormatException) { return false; }
+        catch (InvalidOperationException) { return false; }
+    }
+
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI) that construct
+    ///     an <see cref="AbLegacyTagDefinition"/> from operator flags and need the <c>TagConfig</c> string
+    ///     to hand the driver as a <see cref="RawTagEntry"/>. The enum value is written as its name string;
+    ///     the optional array fields are emitted only for a real array tag. <c>WriteIdempotent</c> and
+    ///     <c>deviceHostAddress</c> are NOT emitted — they travel on the <see cref="RawTagEntry"/>
+    ///     (<see cref="RawTagEntry.WriteIdempotent"/> / <see cref="RawTagEntry.DeviceName"/>), not inside
+    ///     the blob.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(AbLegacyTagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["address"] = def.Address,
+            ["dataType"] = def.DataType.ToString(),
+            ["writable"] = def.Writable,
+        };
+        if (def.ArrayLength is { } len)
+        {
+            o["isArray"] = true;
+            o["arrayLength"] = len;
+        }
+        return o.ToJsonString();
+    }
+
+    /// <summary>
+    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
+    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
+    ///     or not an equipment-tag object. Never throws.
+    /// </summary>
+    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
+    /// <returns>The warnings; empty when clean.</returns>
+    public static IReadOnlyList<string> Inspect(string reference)
+    {
+        var warnings = new List<string>();
+        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
+        try
+        {
+            using var doc = JsonDocument.Parse(reference);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                warnings.Add("AbLegacy TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
+                return warnings;
+            }
+            var w = TagConfigJson.DescribeInvalidEnum<AbLegacyDataType>(root, "dataType");
+            if (w is not null) warnings.Add(w);
+        }
+        catch (JsonException)
+        {
+            warnings.Add("AbLegacy TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
+        }
+        return warnings;
+    }
+
+    private static int ReadInt(JsonElement o, string name)
+        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.Number
+           && e.TryGetInt32(out var v) ? v : 0;
+
+    // True only when the `isArray` property is the JSON literal true. Absent or false → scalar.
+    private static bool IsArrayFlag(JsonElement o)
+        => o.TryGetProperty("isArray", out var e) && e.ValueKind == JsonValueKind.True;
+}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs
index 5c7caf65..94add6bd 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs
@@ -19,11 +19,13 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
     private readonly ILogger<AbLegacyDriver> _logger;
     private readonly PollGroupEngine _poll;
     private readonly Dictionary<string, DeviceState> _devices = new(StringComparer.OrdinalIgnoreCase);
-    private readonly Dictionary<string, AbLegacyTagDefinition> _tagsByName = new(StringComparer.OrdinalIgnoreCase);
 
-    // Resolves a read/write/subscribe fullReference to a tag definition, bridging the two
-    // authoring models: an authored tag-table entry (by name) OR an equipment tag whose
-    // reference is its raw TagConfig JSON (parsed once via AbLegacyEquipmentTagParser, cached).
+    // v3 authored-tag table, keyed by RawPath (the tag identity + driver wire reference). RawPath is
+    // case-sensitive ordinal. Built in InitializeAsync from _options.RawTags via the pure mapper.
+    private readonly Dictionary<string, AbLegacyTagDefinition> _tagsByRawPath = new(StringComparer.Ordinal);
+
+    // Resolves a read/write/subscribe RawPath reference to its tag definition via a single hit on the
+    // authored _tagsByRawPath table (v3: the reference is always a RawPath; a miss is a miss).
     private readonly EquipmentTagRefResolver<AbLegacyTagDefinition> _resolver;
 
     // volatile: _health is read by GetHealth() on any thread while ReadAsync / WriteAsync /
@@ -60,8 +62,7 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
         _tagFactory = tagFactory ?? new LibplctagLegacyTagFactory();
         _logger = logger ?? NullLogger<AbLegacyDriver>.Instance;
         _resolver = new EquipmentTagRefResolver<AbLegacyTagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            r => AbLegacyEquipmentTagParser.TryParse(r, out var d) ? d : null);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         _poll = new PollGroupEngine(
             reader: ReadAsync,
             onChange: (handle, tagRef, snapshot) =>
@@ -107,13 +108,32 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
                 var profile = AbLegacyPlcFamilyProfile.ForFamily(device.PlcFamily);
                 _devices[device.HostAddress] = new DeviceState(addr, device, profile);
             }
-            foreach (var tag in _options.Tags) _tagsByName[tag.Name] = tag;
+            // Build the RawPath → definition table from the authored raw tags. Each entry's TagConfig
+            // blob is mapped by the pure factory; the entry's WriteIdempotent flag is threaded onto the
+            // def (it lives on the RawTagEntry, not inside the blob), and its DeviceName is resolved to
+            // the owning device's host so the existing DeviceHostAddress-keyed routing continues to work.
+            // A mapper miss is skipped (logged), never thrown — a bad tag must not fail the whole init.
+            foreach (var entry in _options.RawTags)
+            {
+                if (!AbLegacyTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def))
+                {
+                    _logger.LogWarning(
+                        "AbLegacy tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+                    continue;
+                }
+                _tagsByRawPath[entry.RawPath] = def with
+                {
+                    WriteIdempotent = entry.WriteIdempotent,
+                    DeviceHostAddress = ResolveDeviceHost(entry.DeviceName),
+                };
+            }
 
             // Validate tag types against their device's family profile. Long (32-bit integer)
             // and String (ST-file) are not supported by all PCCC families; reject them early
             // so a misconfigured tag fails at init time with a clear message rather than
             // surfacing an opaque comms error at runtime.
-            foreach (var tag in _options.Tags)
+            foreach (var tag in _tagsByRawPath.Values)
             {
                 if (!_devices.TryGetValue(tag.DeviceHostAddress, out var deviceForTag)) continue;
                 var profile = deviceForTag.Profile;
@@ -157,7 +177,7 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
                 state.DisposeRuntimes();
             }
             _devices.Clear();
-            _tagsByName.Clear();
+            _tagsByRawPath.Clear();
             _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
             throw;
         }
@@ -183,7 +203,7 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
             state.DisposeRuntimes();
         }
         _devices.Clear();
-        _tagsByName.Clear();
+        _tagsByRawPath.Clear();
         _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
         _health = new DriverHealth(DriverState.Unknown, _health.LastSuccessfulRead, null);
     }
@@ -415,7 +435,7 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
         {
             var label = device.DeviceName ?? device.HostAddress;
             var deviceFolder = root.Folder(device.HostAddress, label);
-            var tagsForDevice = _options.Tags.Where(t =>
+            var tagsForDevice = _tagsByRawPath.Values.Where(t =>
                 string.Equals(t.DeviceHostAddress, device.HostAddress, StringComparison.OrdinalIgnoreCase));
             foreach (var tag in tagsForDevice)
             {
@@ -522,6 +542,42 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
             new HostStatusChangedEventArgs(state.Options.HostAddress, old, newState));
     }
 
+    /// <summary>
+    ///     Resolve the <see cref="RawTagEntry.DeviceName"/> a raw tag carries to the host-address key of
+    ///     the device it should route to. The AB Legacy driver is multi-device and keys its
+    ///     <c>_devices</c> table by <c>HostAddress</c>, so this maps the tag's owning device name to that
+    ///     key: it matches the name against each configured <see cref="AbLegacyDeviceOptions"/> by its
+    ///     <see cref="AbLegacyDeviceOptions.DeviceName"/> first, then by <c>HostAddress</c> as a fallback,
+    ///     and returns the matched device's <c>HostAddress</c>. When the name matches nothing but the
+    ///     driver has exactly one device, that sole device is used (single-device deployments never need
+    ///     to name their tag's device). Otherwise returns empty — the tag is unroutable and its
+    ///     read/write surfaces <c>BadNodeIdUnknown</c>.
+    /// </summary>
+    /// <remarks>
+    ///     TODO(v3 WaveC): the live device host address must ultimately come from the owning
+    ///     <c>Device</c> row's <c>DeviceConfig</c> (resolved by the deploy artifact / bootstrapper) rather
+    ///     than from a configured <see cref="AbLegacyDriverOptions.Devices"/> entry. Until Wave C threads
+    ///     the Device row through, the best available option is to route by matching the delivered
+    ///     <see cref="RawTagEntry.DeviceName"/> against <c>_options.Devices</c> and reusing that entry's
+    ///     <c>HostAddress</c> as the connection key.
+    /// </remarks>
+    /// <param name="deviceName">The owning device name delivered on the <see cref="RawTagEntry"/>.</param>
+    /// <returns>The matched device's <c>HostAddress</c>; empty when unroutable.</returns>
+    private string ResolveDeviceHost(string deviceName)
+    {
+        if (!string.IsNullOrEmpty(deviceName))
+        {
+            foreach (var d in _options.Devices)
+                if (string.Equals(d.DeviceName, deviceName, StringComparison.OrdinalIgnoreCase))
+                    return d.HostAddress;
+            foreach (var d in _options.Devices)
+                if (string.Equals(d.HostAddress, deviceName, StringComparison.OrdinalIgnoreCase))
+                    return d.HostAddress;
+        }
+        // Best-available fallback: a single-device driver routes every tag to its sole device.
+        return _options.Devices.Count == 1 ? _options.Devices[0].HostAddress : "";
+    }
+
     // ---- IPerCallHostResolver ----
 
     /// <summary>
@@ -744,7 +800,7 @@ public sealed class AbLegacyDriver : IDriver, IReadable, IWritable, ITagDiscover
             state.DisposeRuntimes();
         }
         _devices.Clear();
-        _tagsByName.Clear();
+        _tagsByRawPath.Clear();
         _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
         _health = new DriverHealth(DriverState.Unknown, _health.LastSuccessfulRead, null);
     }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverFactoryExtensions.cs
index bd96cc71..fdd3dd57 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverFactoryExtensions.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.PlcFamilies;
 
@@ -66,19 +67,11 @@ public static class AbLegacyDriverFactoryExtensions
                         fallback: AbLegacyPlcFamily.Slc500),
                     DeviceName: d.DeviceName))]
                 : [],
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => new AbLegacyTagDefinition(
-                    Name: t.Name ?? throw new InvalidOperationException(
-                        $"AB Legacy config for '{driverInstanceId}' has a tag missing Name"),
-                    DeviceHostAddress: t.DeviceHostAddress ?? throw new InvalidOperationException(
-                        $"AB Legacy tag '{t.Name}' in '{driverInstanceId}' missing DeviceHostAddress"),
-                    Address: t.Address ?? throw new InvalidOperationException(
-                        $"AB Legacy tag '{t.Name}' in '{driverInstanceId}' missing Address"),
-                    DataType: ParseEnum<AbLegacyDataType>(t.DataType, driverInstanceId, "DataType",
-                        tagName: t.Name),
-                    Writable: t.Writable ?? true,
-                    WriteIdempotent: t.WriteIdempotent ?? false))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates rawTags with the cluster's authored raw AbLegacy
+            // tags (RawPath + TagConfig blob + WriteIdempotent + owning DeviceName). The driver maps each
+            // RawTagEntry's TagConfig blob through AbLegacyTagDefinitionFactory at Initialize and routes it
+            // to its device by DeviceName; the legacy pre-declared DTO tag path is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new AbLegacyProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -145,9 +138,11 @@ public static class AbLegacyDriverFactoryExtensions
         public List<AbLegacyDeviceDto>? Devices { get; init; }
 
         /// <summary>
-        /// Gets or sets the list of tags to monitor.
+        /// Gets or sets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent + owning
+        /// DeviceName) the deploy artifact delivers. The driver maps each through
+        /// <see cref="AbLegacyTagDefinitionFactory.FromTagConfig"/> at Initialize.
         /// </summary>
-        public List<AbLegacyTagDto>? Tags { get; init; }
+        public List<RawTagEntry>? RawTags { get; init; }
 
         /// <summary>
         /// Gets or sets the probe configuration.
@@ -173,39 +168,6 @@ public static class AbLegacyDriverFactoryExtensions
         public string? DeviceName { get; init; }
     }
 
-    internal sealed class AbLegacyTagDto
-    {
-        /// <summary>
-        /// Gets or sets the tag name.
-        /// </summary>
-        public string? Name { get; init; }
-
-        /// <summary>
-        /// Gets or sets the device host address.
-        /// </summary>
-        public string? DeviceHostAddress { get; init; }
-
-        /// <summary>
-        /// Gets or sets the tag address.
-        /// </summary>
-        public string? Address { get; init; }
-
-        /// <summary>
-        /// Gets or sets the data type.
-        /// </summary>
-        public string? DataType { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether the tag is writable.
-        /// </summary>
-        public bool? Writable { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether write is idempotent.
-        /// </summary>
-        public bool? WriteIdempotent { get; init; }
-    }
-
     internal sealed class AbLegacyProbeDto
     {
         /// <summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverProbe.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverProbe.cs
index 1256540c..fadeab3a 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverProbe.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriverProbe.cs
@@ -93,10 +93,7 @@ public sealed class AbLegacyDriverProbe : IDriverProbe
         // S:0 is present on all PCCC PLCs that support the status file, so a "not found" response
         // still proves PCCC connectivity; a successful read is the happy path.
         var tagName = opts.Probe.ProbeAddress
-            ?? opts.Tags.FirstOrDefault(
-                t => string.Equals(t.DeviceHostAddress, firstDevice?.HostAddress, StringComparison.OrdinalIgnoreCase))
-                    ?.Address
-            ?? opts.Tags.FirstOrDefault()?.Address
+            ?? FirstProbeableTagAddress(opts, firstDevice)
             ?? "S:0";
 
         var p = new AbLegacyTagCreateParams(
@@ -187,4 +184,30 @@ public sealed class AbLegacyDriverProbe : IDriverProbe
         var parsed = AbLegacyHostAddress.TryParse(firstDevice.HostAddress);
         return (parsed, firstDevice);
     }
+
+    /// <summary>
+    ///     Pick a PCCC address to probe from the authored raw tags: prefer a tag owned by the device
+    ///     being probed, else any authored tag. v3 tags carry no typed address — the RawTagEntry's
+    ///     <c>TagConfig</c> blob is mapped through <see cref="AbLegacyTagDefinitionFactory.FromTagConfig"/>
+    ///     to recover the PCCC address. Returns <see langword="null"/> when no tag maps, so the caller
+    ///     falls back to the status file (<c>S:0</c>).
+    /// </summary>
+    /// <param name="opts">The deserialised driver options.</param>
+    /// <param name="firstDevice">The device being probed (matched by DeviceName / HostAddress).</param>
+    /// <returns>A probeable PCCC address, or <see langword="null"/>.</returns>
+    private static string? FirstProbeableTagAddress(AbLegacyDriverOptions opts, AbLegacyDeviceOptions? firstDevice)
+    {
+        static string? Address(RawTagEntry e) =>
+            AbLegacyTagDefinitionFactory.FromTagConfig(e.TagConfig, e.RawPath, out var d) ? d.Address : null;
+
+        foreach (var e in opts.RawTags)
+            if ((string.Equals(e.DeviceName, firstDevice?.DeviceName, StringComparison.OrdinalIgnoreCase)
+                 || string.Equals(e.DeviceName, firstDevice?.HostAddress, StringComparison.OrdinalIgnoreCase))
+                && Address(e) is { } matched)
+                return matched;
+        foreach (var e in opts.RawTags)
+            if (Address(e) is { } any)
+                return any;
+        return null;
+    }
 }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasDriverOptions.cs
index ef60b648..da05b679 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasDriverOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
 
@@ -10,8 +11,16 @@ public sealed class FocasDriverOptions
 {
     /// <summary>Gets the list of configured CNC devices.</summary>
     public IReadOnlyList<FocasDeviceOptions> Devices { get; init; } = [];
-    /// <summary>Gets the list of FOCAS tag definitions.</summary>
-    public IReadOnlyList<FocasTagDefinition> Tags { get; init; } = [];
+
+    /// <summary>
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag + <see cref="RawTagEntry.DeviceName"/>); the driver maps each through
+    ///     <see cref="FocasTagDefinitionFactory.FromTagConfig"/> into its RawPath → definition table,
+    ///     routing each tag to its device by <see cref="RawTagEntry.DeviceName"/>. FOCAS has no online
+    ///     tag-discovery for user tags — the driver serves exactly these (plus the fixed-node tree).
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
     /// <summary>Gets the probe options.</summary>
     public FocasProbeOptions Probe { get; init; } = new();
     /// <summary>Gets the timeout duration for operations.</summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasEquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasEquipmentTagParser.cs
deleted file mode 100644
index 1fe27347..00000000
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasEquipmentTagParser.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Text.Json;
-using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
-
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>FocasTagConfigModel</c>) into a transient <see cref="FocasTagDefinition"/> whose
-/// <see cref="FocasTagDefinition.Name"/> equals the reference string itself, so a value the
-/// driver publishes back keys the runtime's forward router correctly.</summary>
-public static class FocasEquipmentTagParser
-{
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is a FOCAS address object.</returns>
-    public static bool TryParse(string reference, out FocasTagDefinition def)
-    {
-        def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            // The address string is FOCAS's sole mandatory address field (FocasTagConfigModel.Validate).
-            if (root.ValueKind != JsonValueKind.Object
-                || !root.TryGetProperty("address", out var addr)
-                || addr.ValueKind != JsonValueKind.String)
-                return false;
-            var address = addr.GetString();
-            if (string.IsNullOrWhiteSpace(address)) return false;
-            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
-            // instead of silently defaulting to a wrong-width Good.
-            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", FocasDataType.Int32, out var dataType)) return false;
-            var deviceHostAddress = ReadString(root, "deviceHostAddress") ?? "";
-            def = new FocasTagDefinition(
-                Name: reference, DeviceHostAddress: deviceHostAddress, Address: address,
-                // FOCAS equipment tags are FORCED read-only (05/UNDER-1): the only wire client
-                // (WireFocasClient.cs:71-73) returns BadNotWritable for EVERY address, so advertising a
-                // writable node is a lie — a write that used to reach the backend and always fail with
-                // BadNotWritable now fails at the driver seam with the same family of Bad status (no
-                // successful operation changes). Any authored `writable:true` is ignored + warned by
-                // Inspect. Honour the key here once PMC writes ship in the wire client.
-                DataType: dataType, Writable: false);
-            return true;
-        }
-        catch (JsonException) { return false; }
-        catch (FormatException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-
-    /// <summary>
-    ///     Deploy-time inspection (05/CONV-2, 05/UNDER-1): warns on a present-but-invalid <c>dataType</c>
-    ///     (silently defaulted by the lenient runtime), on an authored <c>writable:true</c> (FOCAS writes
-    ///     are unsupported — the tag is forced read-only), and on a structurally unparseable TagConfig.
-    ///     Empty when clean or not an equipment-tag object. Never throws.
-    /// </summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
-    /// <returns>The warnings; empty when clean.</returns>
-    public static IReadOnlyList<string> Inspect(string reference)
-    {
-        var warnings = new List<string>();
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object)
-            {
-                warnings.Add("FOCAS TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
-                return warnings;
-            }
-            var w = TagConfigJson.DescribeInvalidEnum<FocasDataType>(root, "dataType");
-            if (w is not null) warnings.Add(w);
-            if (root.TryGetProperty("writable", out var wr) && wr.ValueKind == JsonValueKind.True)
-                warnings.Add("FOCAS writes unsupported — 'writable:true' is ignored; the tag is forced read-only until PMC writes exist.");
-        }
-        catch (JsonException)
-        {
-            warnings.Add("FOCAS TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
-        }
-        return warnings;
-    }
-
-    private static string? ReadString(JsonElement o, string name)
-        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.String ? e.GetString() : null;
-}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasTagDefinitionFactory.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasTagDefinitionFactory.cs
new file mode 100644
index 00000000..7bef3447
--- /dev/null
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Contracts/FocasTagDefinitionFactory.cs
@@ -0,0 +1,129 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
+
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>FocasTagConfigModel</c>) into a <see cref="FocasTagDefinition"/>. Under v3 a tag's
+///     identity is its <b>RawPath</b> (a cluster-scoped slash path), not the address blob — so the
+///     produced definition's <see cref="FocasTagDefinition.Name"/> is the RawPath the driver was handed,
+///     which is exactly the wire reference the driver's <c>RawPath → def</c> resolver keys on. The driver
+///     builds that table by mapping each <see cref="RawTagEntry"/> the deploy artifact delivers through
+///     <see cref="FromTagConfig"/>; <see cref="ToTagConfig"/> is the inverse, used by authoring paths (the
+///     Client CLI) that hold a typed definition and need to synthesise the <c>TagConfig</c> blob for a
+///     <see cref="RawTagEntry"/>.
+/// </summary>
+public static class FocasTagDefinitionFactory
+{
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     The <c>dataType</c> enum is read STRICTLY — a present-but-invalid (typo'd) value rejects the whole
+    ///     tag (returns <see langword="false"/> ⇒ the driver surfaces <c>BadNodeIdUnknown</c>) rather than
+    ///     silently defaulting to a wrong-width Good. The FOCAS TagConfig carries <b>no device host</b> — the
+    ///     driver resolves the device from the tag's <see cref="RawTagEntry.DeviceName"/>, so the produced
+    ///     definition's <see cref="FocasTagDefinition.DeviceHostAddress"/> is left empty here and filled in by
+    ///     the driver at table-build time. Writability lives on the Tag entity / node ACL (the authored FOCAS
+    ///     TagConfig has no <c>writable</c> key), so an absent key ⇒ read-only; an explicit <c>writable:true</c>
+    ///     is honoured for the driver's internal write gate (the wire itself is still read-only).
+    ///     <see cref="FocasTagDefinition.WriteIdempotent"/> is NOT read from the blob — it is a platform flag
+    ///     the caller threads in from the tag's <see cref="RawTagEntry.WriteIdempotent"/>.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid FOCAS address object.</returns>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out FocasTagDefinition def)
+    {
+        def = null!;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            var root = doc.RootElement;
+            // The address string is FOCAS's sole mandatory address field (FocasTagConfigModel.Validate).
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("address", out var addr)
+                || addr.ValueKind != JsonValueKind.String)
+                return false;
+            var address = addr.GetString();
+            if (string.IsNullOrWhiteSpace(address)) return false;
+            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
+            // instead of silently defaulting to a wrong-width Good.
+            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", FocasDataType.Int32, out var dataType)) return false;
+            // FOCAS authored tags carry no `writable` key (writability lives on the Tag entity / node ACL):
+            // absent ⇒ read-only. An explicit writable:true is honoured for the driver's internal write gate
+            // (default-false, so a missing key stays read-only — the note is preserved).
+            var writable = root.TryGetProperty("writable", out var wr) && wr.ValueKind == JsonValueKind.True;
+            def = new FocasTagDefinition(
+                Name: rawPath,
+                // The device is resolved by the driver from RawTagEntry.DeviceName; empty here.
+                DeviceHostAddress: "",
+                Address: address,
+                DataType: dataType,
+                Writable: writable,
+                WriteIdempotent: false);
+            return true;
+        }
+        catch (JsonException) { return false; }
+        catch (FormatException) { return false; }
+        catch (InvalidOperationException) { return false; }
+    }
+
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI) that construct a
+    ///     <see cref="FocasTagDefinition"/> from operator flags and need the <c>TagConfig</c> string to hand
+    ///     the driver as a <see cref="RawTagEntry"/>. The enum is written as its name string. Neither the
+    ///     device host (which travels on <see cref="RawTagEntry.DeviceName"/>) nor <c>WriteIdempotent</c>
+    ///     (which travels on the <see cref="RawTagEntry"/>) is emitted.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(FocasTagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["address"] = def.Address,
+            ["dataType"] = def.DataType.ToString(),
+            ["writable"] = def.Writable,
+        };
+        return o.ToJsonString();
+    }
+
+    /// <summary>
+    ///     Deploy-time inspection (05/CONV-2, 05/UNDER-1): warns on a present-but-invalid <c>dataType</c>
+    ///     (silently defaulted by the lenient runtime), on an authored <c>writable:true</c> (the FOCAS wire
+    ///     is read-only — <c>WriteAsync</c> always returns <c>BadNotWritable</c>), and on a structurally
+    ///     unparseable TagConfig. Empty when clean or not an equipment-tag object. Never throws.
+    /// </summary>
+    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
+    /// <returns>The warnings; empty when clean.</returns>
+    public static IReadOnlyList<string> Inspect(string reference)
+    {
+        var warnings = new List<string>();
+        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
+        try
+        {
+            using var doc = JsonDocument.Parse(reference);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                warnings.Add("FOCAS TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
+                return warnings;
+            }
+            var w = TagConfigJson.DescribeInvalidEnum<FocasDataType>(root, "dataType");
+            if (w is not null) warnings.Add(w);
+            if (root.TryGetProperty("writable", out var wr) && wr.ValueKind == JsonValueKind.True)
+                warnings.Add("FOCAS wire is read-only — an authored 'writable:true' still fails at the wire with BadNotWritable.");
+        }
+        catch (JsonException)
+        {
+            warnings.Add("FOCAS TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
+        }
+        return warnings;
+    }
+}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
index 9df8851c..1c3b654c 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
@@ -27,10 +27,11 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
     private readonly PollGroupEngine _poll;
     private readonly ILogger<FocasDriver> _logger;
     private readonly Dictionary<string, DeviceState> _devices = new(StringComparer.OrdinalIgnoreCase);
-    private readonly Dictionary<string, FocasTagDefinition> _tagsByName = new(StringComparer.OrdinalIgnoreCase);
-    // Resolves a read/write fullReference to a tag definition, bridging the two authoring
-    // models: an authored tag-table entry (by name) OR an equipment tag whose reference is
-    // its raw TagConfig JSON (parsed once via FocasEquipmentTagParser, cached).
+    // v3: RawPath → definition, case-sensitive ordinal. Built in InitializeAsync from _options.RawTags
+    // via the pure FocasTagDefinitionFactory mapper (the reference is always a RawPath).
+    private readonly Dictionary<string, FocasTagDefinition> _tagsByRawPath = new(StringComparer.Ordinal);
+    // Resolves a read/write fullReference (always a RawPath in v3) to a tag definition by a single
+    // authored-table hit. A miss is a miss — the driver surfaces BadNodeIdUnknown, never a blob-parse.
     private readonly EquipmentTagRefResolver<FocasTagDefinition> _resolver;
     // Per-tag-name cache of the FocasAddress parsed once at InitializeAsync. ReadAsync /
     // WriteAsync look up the pre-parsed value instead of re-parsing tag.Address on every hot
@@ -67,8 +68,7 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
         _clientFactory = clientFactory ?? new Wire.WireFocasClientFactory();
         _logger = logger ?? NullLogger<FocasDriver>.Instance;
         _resolver = new EquipmentTagRefResolver<FocasTagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            ResolveEquipmentTagRef);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         _poll = new PollGroupEngine(
             reader: ReadAsync,
             onChange: (handle, tagRef, snapshot) =>
@@ -118,31 +118,61 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
                         $"FOCAS device has invalid HostAddress '{device.HostAddress}' — expected 'focas://{{ip}}[:{{port}}]'.");
                 _devices[device.HostAddress] = new DeviceState(addr, device);
             }
-            // Pre-flight: validate every tag's address against the declared CNC
-            // series so misconfigured addresses fail at init (clear config error)
-            // instead of producing BadOutOfRange on every read at runtime.
-            // Series=Unknown short-circuits the matrix; pre-matrix configs stay permissive.
-            foreach (var tag in _options.Tags)
+            // Build the RawPath → definition table from the authored raw tags. Each entry's TagConfig
+            // blob is mapped by the pure factory; the entry's WriteIdempotent flag + DeviceName are
+            // threaded onto the def (they live on the RawTagEntry, not inside the blob). Per-tag misses
+            // are tolerant (skipped + logged → BadNodeIdUnknown at read, "a miss is a miss") — a single
+            // bad tag must not fail the whole driver init. The ONE hard failure is an unknown device
+            // segment: a tag routed to a device not in the Devices list is a driver-level config error
+            // that fails fast (Driver.FOCAS-003).
+            foreach (var entry in _options.RawTags)
             {
-                var parsed = FocasAddress.TryParse(tag.Address)
-                    ?? throw new InvalidOperationException(
-                        $"FOCAS tag '{tag.Name}' has invalid Address '{tag.Address}'. " +
-                        $"Expected forms: R100, R100.3, PARAM:1815/0, MACRO:500.");
-                if (!_devices.TryGetValue(tag.DeviceHostAddress, out var device))
+                if (!FocasTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def))
+                {
+                    _logger.LogWarning(
+                        "FOCAS tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+                    continue;
+                }
+                // TODO(v3 WaveC): the live device host must come from the tag's Device row's DeviceConfig
+                // (keyed by the RawPath's device segment). Until Wave C threads DeviceConfig through, recover
+                // the host by matching the entry's DeviceName against the configured Devices list.
+                var deviceHost = ResolveDeviceHost(entry.DeviceName);
+                if (deviceHost is null)
                     throw new InvalidOperationException(
-                        $"FOCAS tag '{tag.Name}' references device '{tag.DeviceHostAddress}' " +
+                        $"FOCAS tag '{entry.RawPath}' references device '{entry.DeviceName}' " +
                         $"which is not in the Devices list. Check for a typo (e.g. wrong port or hostname).");
+                if (!_devices.TryGetValue(deviceHost, out var device))
+                    throw new InvalidOperationException(
+                        $"FOCAS tag '{entry.RawPath}' references device '{entry.DeviceName}' " +
+                        $"which is not in the Devices list. Check for a typo (e.g. wrong port or hostname).");
+                // Per-tag address / capability-matrix validation is tolerant: an unparseable address or a
+                // capability-matrix violation skips the tag (→ BadNodeIdUnknown at read) rather than failing
+                // the whole init (R2-11 05/UNDER-6 — the same pre-flight, surfacing a resolver miss).
+                var parsed = FocasAddress.TryParse(def.Address);
+                if (parsed is null)
+                {
+                    _logger.LogWarning(
+                        "FOCAS tag has invalid Address '{Address}'; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        def.Address, _driverInstanceId, entry.RawPath);
+                    continue;
+                }
                 if (FocasCapabilityMatrix.Validate(device.Options.Series, parsed) is { } reason)
                 {
-                    throw new InvalidOperationException(
-                        $"FOCAS tag '{tag.Name}' ({tag.Address}) rejected by capability matrix: {reason}");
+                    _logger.LogWarning(
+                        "FOCAS tag '{RawPath}' ({Address}) rejected by capability matrix: {Reason}; skipping. Driver={DriverInstanceId}",
+                        entry.RawPath, def.Address, reason, _driverInstanceId);
+                    continue;
                 }
-                _tagsByName[tag.Name] = tag;
+                _tagsByRawPath[entry.RawPath] = def with
+                {
+                    DeviceHostAddress = deviceHost,
+                    WriteIdempotent = entry.WriteIdempotent,
+                };
                 // Cache the parsed FocasAddress so ReadAsync / WriteAsync don't re-parse on every
-                // hot-path call. The address string has already been validated
-                // by FocasAddress.TryParse above; reusing the parsed record avoids per-tick allocs
-                // on subscription pollers.
-                _parsedAddressesByTagName[tag.Name] = parsed;
+                // hot-path call. The address string has already been validated by FocasAddress.TryParse
+                // above; reusing the parsed record avoids per-tick allocs on subscription pollers.
+                _parsedAddressesByTagName[entry.RawPath] = parsed;
             }
 
             if (_options.Probe.Enabled)
@@ -223,8 +253,8 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
             state.DisposeClient();
         }
         _devices.Clear();
-        _tagsByName.Clear();
-        _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
+        _tagsByRawPath.Clear();
+        _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
         _parsedAddressesByTagName.Clear();
         Volatile.Write(ref _health, new DriverHealth(DriverState.Unknown, Volatile.Read(ref _health).LastSuccessfulRead, null));
     }
@@ -254,18 +284,22 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
     internal bool IsParsedAddressCached(string reference) =>
         _parsedAddressesByTagName.ContainsKey(reference);
 
-    // Resolves an equipment-tag TagConfig reference into a FocasTagDefinition, applying the SAME
-    // capability pre-flight authored tags get at InitializeAsync (:105-119) — R2-11 (05/UNDER-6). A
-    // reference whose address is unparseable, whose bound device is unknown, or whose address violates
-    // the device series' capability matrix returns null ⇒ resolver miss ⇒ BadNodeIdUnknown at read time,
-    // instead of a wrong-status read reaching the wire. The negative is cached by the resolver.
-    private FocasTagDefinition? ResolveEquipmentTagRef(string reference)
+    // TODO(v3 WaveC): the live device host must come from the tag's Device row's DeviceConfig (keyed by
+    // the RawPath's device segment). Until Wave C threads DeviceConfig through, recover the host by matching
+    // the RawTagEntry's DeviceName against the configured Devices list (by DeviceName, falling back to
+    // HostAddress; and, for a single-device driver, an empty DeviceName routes to the sole device). Returns
+    // null when no device matches — the caller fails the tag fast (Driver.FOCAS-003).
+    private string? ResolveDeviceHost(string deviceName)
     {
-        if (!FocasEquipmentTagParser.TryParse(reference, out var def)) return null;
-        var parsed = FocasAddress.TryParse(def.Address);
-        if (parsed is null) return null;
-        if (!_devices.TryGetValue(def.DeviceHostAddress, out var device)) return null;
-        return FocasCapabilityMatrix.Validate(device.Options.Series, parsed) is null ? def : null;
+        foreach (var d in _options.Devices)
+        {
+            if (string.Equals(d.DeviceName ?? d.HostAddress, deviceName, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(d.HostAddress, deviceName, StringComparison.OrdinalIgnoreCase))
+                return d.HostAddress;
+        }
+        if (string.IsNullOrEmpty(deviceName) && _options.Devices.Count == 1)
+            return _options.Devices[0].HostAddress;
+        return null;
     }
 
     // Resolves a tag definition to its parsed FocasAddress, caching the result so that
@@ -516,7 +550,7 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
                 }
             }
 
-            var tagsForDevice = _options.Tags.Where(t =>
+            var tagsForDevice = _tagsByRawPath.Values.Where(t =>
                 string.Equals(t.DeviceHostAddress, device.HostAddress, StringComparison.OrdinalIgnoreCase));
             foreach (var tag in tagsForDevice)
             {
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriverFactoryExtensions.cs
index e878c7a1..733e6cc8 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriverFactoryExtensions.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 using ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Wire;
 
@@ -68,18 +69,11 @@ public static class FocasDriverFactoryExtensions
                     Series: ParseSeries(d.Series ?? dto.Series),
                     PositionDecimalPlaces: d.PositionDecimalPlaces ?? 0))]
                 : [],
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => new FocasTagDefinition(
-                    Name: t.Name ?? throw new InvalidOperationException(
-                        $"FOCAS config for '{driverInstanceId}' has a tag missing Name"),
-                    DeviceHostAddress: t.DeviceHostAddress ?? throw new InvalidOperationException(
-                        $"FOCAS tag '{t.Name}' in '{driverInstanceId}' missing DeviceHostAddress"),
-                    Address: t.Address ?? throw new InvalidOperationException(
-                        $"FOCAS tag '{t.Name}' in '{driverInstanceId}' missing Address"),
-                    DataType: ParseDataType(t.DataType, t.Name!, driverInstanceId),
-                    Writable: t.Writable ?? true,
-                    WriteIdempotent: t.WriteIdempotent ?? false))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates rawTags with the cluster's authored raw FOCAS
+            // tags (RawPath + TagConfig blob + WriteIdempotent + DeviceName). The driver maps each
+            // RawTagEntry's TagConfig blob through FocasTagDefinitionFactory at Initialize and routes it to
+            // its device by DeviceName; the legacy pre-declared DTO tag path is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new FocasProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -190,18 +184,6 @@ public static class FocasDriverFactoryExtensions
                 $"FOCAS Series '{raw}' is not one of {string.Join(", ", Enum.GetNames<FocasCncSeries>())}");
     }
 
-    private static FocasDataType ParseDataType(string? raw, string tagName, string driverInstanceId)
-    {
-        if (string.IsNullOrWhiteSpace(raw))
-            throw new InvalidOperationException(
-                $"FOCAS tag '{tagName}' in '{driverInstanceId}' missing DataType");
-        return Enum.TryParse<FocasDataType>(raw, ignoreCase: true, out var dt)
-            ? dt
-            : throw new InvalidOperationException(
-                $"FOCAS tag '{tagName}' has unknown DataType '{raw}'. " +
-                $"Expected one of {string.Join(", ", Enum.GetNames<FocasDataType>())}");
-    }
-
     private static readonly JsonSerializerOptions JsonOptions = new()
     {
         PropertyNameCaseInsensitive = true,
@@ -254,8 +236,11 @@ public static class FocasDriverFactoryExtensions
         /// <summary>Gets or sets the list of CNC devices to manage.</summary>
         public List<FocasDeviceDto>? Devices { get; init; }
 
-        /// <summary>Gets or sets the list of FOCAS tags to poll.</summary>
-        public List<FocasTagDto>? Tags { get; init; }
+        /// <summary>
+        ///     Gets or sets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent + DeviceName)
+        ///     the driver serves. Bound verbatim into <see cref="FocasDriverOptions.RawTags"/>.
+        /// </summary>
+        public List<RawTagEntry>? RawTags { get; init; }
 
         /// <summary>Gets or sets the probe configuration options.</summary>
         public FocasProbeDto? Probe { get; init; }
@@ -290,27 +275,6 @@ public static class FocasDriverFactoryExtensions
         public int? PositionDecimalPlaces { get; init; }
     }
 
-    internal sealed class FocasTagDto
-    {
-        /// <summary>Gets or sets the tag name.</summary>
-        public string? Name { get; init; }
-
-        /// <summary>Gets or sets the hostname or IP address of the CNC device for this tag.</summary>
-        public string? DeviceHostAddress { get; init; }
-
-        /// <summary>Gets or sets the FOCAS address or path for this tag.</summary>
-        public string? Address { get; init; }
-
-        /// <summary>Gets or sets the data type for this tag.</summary>
-        public string? DataType { get; init; }
-
-        /// <summary>Gets or sets a value indicating whether this tag is writable.</summary>
-        public bool? Writable { get; init; }
-
-        /// <summary>Gets or sets a value indicating whether writes to this tag are idempotent.</summary>
-        public bool? WriteIdempotent { get; init; }
-    }
-
     internal sealed class FocasProbeDto
     {
         /// <summary>Gets or sets a value indicating whether probing is enabled.</summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/GalaxyDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/GalaxyDriverOptions.cs
index 594b2d77..0b8dbff9 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/GalaxyDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/GalaxyDriverOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Config;
 
@@ -26,6 +27,18 @@ public sealed record GalaxyDriverOptions(
     [Display(Name = "Probe timeout (seconds)", Description = "Connection test timeout. Default 30s.", GroupName = "Diagnostics")]
     [Range(1, 60)]
     public int ProbeTimeoutSeconds { get; init; } = 30;
+
+    /// <summary>
+    ///     v3 authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> — RawPath identity (the driver wire reference)
+    ///     + driver <c>TagConfig</c> blob (carrying the Galaxy dialled address under the camelCase
+    ///     key <c>attributeRef</c> = <c>tag_name.AttributeName</c>) + the WriteIdempotent flag. The
+    ///     driver builds a <c>RawPath → attributeRef</c> table from these: reads/writes/subscribes
+    ///     arrive keyed by RawPath and the driver dials the mapped attributeRef to MXAccess. Empty
+    ///     when no tags are authored — the driver then treats every reference as its own dialled
+    ///     address (identity), preserving pre-v3 behaviour for the live-browse discovery path.
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
 }
 
 /// <summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.csproj b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.csproj
index 3c4f01ec..6f3fa0bd 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.csproj
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Contracts.csproj
@@ -5,9 +5,13 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
-    <!-- NO ProjectReference. The only PackageReference is the logging abstraction -->
-    <!-- needed by GalaxySecretRef.ResolveApiKey's optional warning logger. -->
     <ItemGroup>
+        <!-- v3 RawPath identity: GalaxyDriverOptions.RawTags is IReadOnlyList<RawTagEntry>,
+             delivered by the deploy artifact. RawTagEntry lives in the zero-dependency
+             Core.Abstractions leaf beside EquipmentTagRefResolver — same reference Modbus.Contracts
+             takes for its RawTags. Core.Abstractions has no deps, so no cycle. -->
+        <ProjectReference Include="..\..\Core\ZB.MOM.WW.OtOpcUa.Core.Abstractions\ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj" />
+        <!-- Logging abstraction needed by GalaxySecretRef.ResolveApiKey's optional warning logger. -->
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     </ItemGroup>
 </Project>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/AlarmRefBuilder.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/AlarmRefBuilder.cs
index 9c9bb6ef..d8630ede 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/AlarmRefBuilder.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/AlarmRefBuilder.cs
@@ -32,24 +32,36 @@ internal static class AlarmRefBuilder
 
     /// <summary>
     ///     Build an <see cref="AlarmConditionInfo"/> for an alarm-bearing attribute with all
-    ///     five sub-attribute references populated. <paramref name="fullReference"/> is the
-    ///     attribute's full reference (e.g. <c>"Tank1.Level.HiHi"</c>); the convention prefixes
-    ///     each suffix to it.
+    ///     five sub-attribute references populated.
+    ///     <para>
+    ///         v3 splits identity from dialling: <paramref name="conditionReference"/> is the alarm's
+    ///         <b>RawPath</b> — the condition's stable identity, surfaced as
+    ///         <see cref="AlarmConditionInfo.SourceName"/> and matched against the
+    ///         <c>ConditionId</c> the driver reports on every transition and against the value
+    ///         fan-out key. <paramref name="dialReference"/> is the Galaxy <b>attributeRef</b>
+    ///         (<c>tag_name.AttributeName</c>, e.g. <c>"Tank1.Level.HiHi"</c>) — the address MXAccess
+    ///         understands; the five live-state / ack sub-refs prefix each suffix onto it so the
+    ///         server's <c>AlarmConditionService</c> subscribes + acks the dialled attributes. In the
+    ///         identity case (no RawPath mapping) both arguments are the same string, reproducing the
+    ///         pre-v3 shape exactly.
+    ///     </para>
     /// </summary>
-    /// <param name="fullReference">The full reference of the alarm-bearing attribute.</param>
+    /// <param name="conditionReference">The alarm condition's RawPath identity (= <see cref="AlarmConditionInfo.SourceName"/>).</param>
+    /// <param name="dialReference">The Galaxy attributeRef the five sub-refs are dialled from.</param>
     /// <param name="initialSeverity">The initial alarm severity level.</param>
     /// <param name="initialDescription">The initial alarm description.</param>
     /// <returns>The populated <see cref="AlarmConditionInfo"/> with all five sub-attribute references.</returns>
     public static AlarmConditionInfo Build(
-        string fullReference,
+        string conditionReference,
+        string dialReference,
         AlarmSeverity initialSeverity = AlarmSeverity.Medium,
         string? initialDescription = null) => new(
-            SourceName: fullReference,
+            SourceName: conditionReference,
             InitialSeverity: initialSeverity,
             InitialDescription: initialDescription,
-            InAlarmRef: fullReference + InAlarmSuffix,
-            PriorityRef: fullReference + PrioritySuffix,
-            DescAttrNameRef: fullReference + DescAttrNameSuffix,
-            AckedRef: fullReference + AckedSuffix,
-            AckMsgWriteRef: fullReference + AckMsgSuffix);
+            InAlarmRef: dialReference + InAlarmSuffix,
+            PriorityRef: dialReference + PrioritySuffix,
+            DescAttrNameRef: dialReference + DescAttrNameSuffix,
+            AckedRef: dialReference + AckedSuffix,
+            AckMsgWriteRef: dialReference + AckMsgSuffix);
 }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/GalaxyDiscoverer.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/GalaxyDiscoverer.cs
index 9caeeac2..6242351c 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/GalaxyDiscoverer.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/GalaxyDiscoverer.cs
@@ -31,11 +31,28 @@ public sealed class GalaxyDiscoverer
 {
     private readonly IGalaxyHierarchySource _source;
 
+    // v3 RawPath keying. Given a discovered Galaxy attributeRef (tag_name.AttributeName), this
+    // resolves the authored RawTagEntry the deploy artifact delivered for it (keyed by attributeRef),
+    // or null when the attribute is not authored. When present, the emitted node reference
+    // (DriverAttributeInfo.FullName) becomes the entry's RawPath — the v3 wire identity the server
+    // hands back on read/write/subscribe — and WriteIdempotent flows off the entry. When absent (no
+    // mapping, or the live-browse path with no authored tags) the reference falls back to the
+    // attributeRef, reproducing the pre-v3 shape exactly.
+    private readonly Func<string, RawTagEntry?>? _rawTagByAttributeRef;
+
     /// <summary>Initializes a new GalaxyDiscoverer with the specified hierarchy source.</summary>
     /// <param name="source">The Galaxy hierarchy source to use for discovery.</param>
-    public GalaxyDiscoverer(IGalaxyHierarchySource source)
+    /// <param name="rawTagByAttributeRef">
+    ///     Optional v3 resolver mapping a discovered Galaxy attributeRef to its authored
+    ///     <see cref="RawTagEntry"/> (RawPath + WriteIdempotent). Null (or a null return) leaves the
+    ///     emitted reference as the attributeRef — the identity / live-browse fallback.
+    /// </param>
+    public GalaxyDiscoverer(
+        IGalaxyHierarchySource source,
+        Func<string, RawTagEntry?>? rawTagByAttributeRef = null)
     {
         _source = source ?? throw new ArgumentNullException(nameof(source));
+        _rawTagByAttributeRef = rawTagByAttributeRef;
     }
 
     /// <summary>
@@ -79,12 +96,20 @@ public sealed class GalaxyDiscoverer
             {
                 if (string.IsNullOrEmpty(attr.AttributeName)) continue;
 
-                var fullReference = !string.IsNullOrEmpty(attr.FullTagReference)
+                // attributeRef = the Galaxy dialled address (tag_name.AttributeName) MXAccess reads/writes.
+                var attributeRef = !string.IsNullOrEmpty(attr.FullTagReference)
                     ? StripArraySuffix(attr.FullTagReference)
                     : obj.TagName + "." + attr.AttributeName;
 
+                // v3: the node's driver reference (FullName) is the authored RawPath when this
+                // attribute is authored; otherwise it degrades to the attributeRef (identity). The
+                // WriteIdempotent platform flag travels on the RawTagEntry, not inside the blob.
+                var entry = _rawTagByAttributeRef?.Invoke(attributeRef);
+                var rawPath = entry?.RawPath ?? attributeRef;
+                var writeIdempotent = entry?.WriteIdempotent ?? false;
+
                 var info = new DriverAttributeInfo(
-                    FullName: fullReference,
+                    FullName: rawPath,
                     DriverDataType: DataTypeMap.Map(attr.MxDataType),
                     IsArray: attr.IsArray,
                     ArrayDim: attr.IsArray && attr.ArrayDimensionPresent && attr.ArrayDimension > 0
@@ -92,15 +117,18 @@ public sealed class GalaxyDiscoverer
                         : null,
                     SecurityClass: SecurityMap.Map(attr.SecurityClassification),
                     IsHistorized: attr.IsHistorized,
-                    IsAlarm: attr.IsAlarm);
+                    IsAlarm: attr.IsAlarm,
+                    WriteIdempotent: writeIdempotent);
 
                 var handle = folder.Variable(attr.AttributeName, attr.AttributeName, info);
 
                 // Alarm-bearing attributes ship the full sub-attribute ref set so the server's
-                // AlarmConditionService can subscribe + ack-write without re-deriving the names.
+                // AlarmConditionService can subscribe + ack-write without re-deriving the names. The
+                // condition identity (SourceName / ConditionId) is the RawPath — matching the value
+                // fan-out key — while the five live-state sub-refs dial off the Galaxy attributeRef.
                 if (attr.IsAlarm)
                 {
-                    handle.MarkAsAlarmCondition(AlarmRefBuilder.Build(fullReference));
+                    handle.MarkAsAlarmCondition(AlarmRefBuilder.Build(rawPath, attributeRef));
                 }
             }
         }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriver.cs
index aacd8190..011b63ce 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriver.cs
@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.MxGateway.Client;
@@ -64,6 +65,19 @@ public sealed class GalaxyDriver
     private readonly System.Collections.Concurrent.ConcurrentDictionary<string, SecurityClassification>
         _securityByFullRef = new(StringComparer.OrdinalIgnoreCase);
 
+    // v3 RawPath keying. The server hands every read/write/subscribe reference as a RawPath; MXAccess
+    // dials the Galaxy attributeRef (tag_name.AttributeName). These two tables — built once in the ctor
+    // from options.RawTags (each entry's TagConfig carries the camelCase "attributeRef" key) — bridge the
+    // two identity domains at the driver boundary:
+    //   _attributeRefByRawPath : RawPath      -> attributeRef  (forward dial:  read/write/subscribe/ack)
+    //   _rawTagByAttributeRef  : attributeRef -> RawTagEntry    (reverse + WriteIdempotent: discovery,
+    //                                                            OnDataChange, alarm ConditionId)
+    // Both fall back to identity on a miss, so the live-browse discovery path (no authored tags) and any
+    // synthetic alarm sub-ref (attributeRef.InAlarm, never an authored RawPath) dial straight through
+    // unchanged — reproducing pre-v3 behaviour exactly.
+    private readonly Dictionary<string, string> _attributeRefByRawPath;
+    private readonly Dictionary<string, RawTagEntry> _rawTagByAttributeRef;
+
     // PR 4.4 — subscription lifecycle. The pump consumes the gw event stream and fans
     // out OnDataChange events to every registered driver subscription via the registry's
     // reverse map. The subscriber is the test seam — production uses
@@ -182,10 +196,85 @@ public sealed class GalaxyDriver
         _alarmAcknowledger = alarmAcknowledger;
         _alarmFeed = alarmFeed;
 
+        // Build the v3 RawPath ⇄ attributeRef tables from the authored raw tags. Empty when no tags
+        // are authored (live-browse path), leaving every translation an identity no-op.
+        (_attributeRefByRawPath, _rawTagByAttributeRef) = BuildRawTagTables(_options.RawTags, _logger);
+
         // Forward the aggregator's transitions through IHostConnectivityProbe.
         _hostStatuses.OnHostStatusChanged += (_, args) => OnHostStatusChanged?.Invoke(this, args);
     }
 
+    /// <summary>
+    ///     Build the RawPath → attributeRef and attributeRef → <see cref="RawTagEntry"/> tables from the
+    ///     authored raw tags. Each entry's <see cref="RawTagEntry.TagConfig"/> carries the Galaxy dialled
+    ///     address under the camelCase key <c>attributeRef</c>. Entries whose blob has no usable
+    ///     <c>attributeRef</c> are skipped (they can't be dialled). On a duplicate attributeRef (two
+    ///     authored RawPaths pointing at the same Galaxy attribute) the first entry wins the reverse map —
+    ///     the value fan-out / alarm ConditionId then surfaces under that first RawPath; the forward map
+    ///     still dials both. Case-insensitive to match the driver's reference handling.
+    /// </summary>
+    private static (Dictionary<string, string> Forward, Dictionary<string, RawTagEntry> Reverse)
+        BuildRawTagTables(IReadOnlyList<RawTagEntry> rawTags, ILogger logger)
+    {
+        var forward = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        var reverse = new Dictionary<string, RawTagEntry>(StringComparer.OrdinalIgnoreCase);
+        foreach (var entry in rawTags)
+        {
+            if (string.IsNullOrEmpty(entry.RawPath)) continue;
+            var attributeRef = TryReadAttributeRef(entry.TagConfig);
+            if (string.IsNullOrEmpty(attributeRef))
+            {
+                logger.LogWarning(
+                    "GalaxyDriver raw tag {RawPath} has no 'attributeRef' in its TagConfig — skipped (cannot dial MXAccess).",
+                    entry.RawPath);
+                continue;
+            }
+            forward[entry.RawPath] = attributeRef;
+            reverse.TryAdd(attributeRef, entry); // first-wins on a shared attributeRef
+        }
+        return (forward, reverse);
+    }
+
+    /// <summary>
+    ///     Read the Galaxy dialled address from a tag's <c>TagConfig</c> JSON — the camelCase
+    ///     <c>attributeRef</c> key (v3 rename of the pre-v3 PascalCase <c>FullName</c>). Case-insensitive
+    ///     on the property name for authoring tolerance; returns null on an absent/blank/non-string value
+    ///     or unparseable blob (the entry is then skipped, never dialled).
+    /// </summary>
+    private static string? TryReadAttributeRef(string tagConfigJson)
+    {
+        if (string.IsNullOrWhiteSpace(tagConfigJson)) return null;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfigJson);
+            if (doc.RootElement.ValueKind != JsonValueKind.Object) return null;
+            foreach (var prop in doc.RootElement.EnumerateObject())
+            {
+                if (!prop.NameEquals("attributeRef")
+                    && !string.Equals(prop.Name, "attributeRef", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+                if (prop.Value.ValueKind != JsonValueKind.String) return null;
+                var v = prop.Value.GetString();
+                return string.IsNullOrWhiteSpace(v) ? null : v;
+            }
+        }
+        catch (JsonException)
+        {
+            // Malformed blob — treat as un-dialable; BuildRawTagTables logs the skip.
+        }
+        return null;
+    }
+
+    /// <summary>RawPath → Galaxy attributeRef for MXAccess dialling; identity on a miss.</summary>
+    private string ToAttributeRef(string rawPath) =>
+        _attributeRefByRawPath.GetValueOrDefault(rawPath, rawPath);
+
+    /// <summary>Galaxy attributeRef → RawPath (the server-facing identity); identity on a miss.</summary>
+    private string ToRawPath(string attributeRef) =>
+        _rawTagByAttributeRef.TryGetValue(attributeRef, out var e) ? e.RawPath : attributeRef;
+
     /// <inheritdoc />
     public string DriverInstanceId => _driverInstanceId;
 
@@ -525,11 +614,18 @@ public sealed class GalaxyDriver
 
     /// <summary>
     ///     Compare two <see cref="GalaxyDriverOptions"/> for runtime equivalence — every
-    ///     field that drives gw session shape, address space, or reconnect behaviour
-    ///     must match. Records get value-equality from the language, so a direct
-    ///     equality check is enough.
+    ///     field that drives gw session shape or reconnect behaviour must match. Compared
+    ///     field-wise (the nested records supply value-equality) and <b>excluding
+    ///     <see cref="GalaxyDriverOptions.RawTags"/></b>: the authored tag set is address-space
+    ///     state re-applied through rediscovery, not a session-teardown trigger, and a record's
+    ///     synthesized equality would compare the two <c>RawTags</c> lists by reference anyway.
     /// </summary>
-    private static bool OptionsAreEquivalent(GalaxyDriverOptions a, GalaxyDriverOptions b) => a == b;
+    private static bool OptionsAreEquivalent(GalaxyDriverOptions a, GalaxyDriverOptions b) =>
+        a.Gateway == b.Gateway
+        && a.MxAccess == b.MxAccess
+        && a.Repository == b.Repository
+        && a.Reconnect == b.Reconnect
+        && a.ProbeTimeoutSeconds == b.ProbeTimeoutSeconds;
 
     /// <inheritdoc />
     public Task ShutdownAsync(CancellationToken cancellationToken)
@@ -596,7 +692,11 @@ public sealed class GalaxyDriver
         // newly added $WinPlatform / $AppEngine objects start advising their ScanState attribute.
         var capturingBuilder = new SecurityCapturingBuilder(builder, _securityByFullRef);
         var source = _hierarchySource ??= BuildDefaultHierarchySource();
-        var discoverer = new GalaxyDiscoverer(source);
+        // Thread the v3 reverse resolver so the discoverer emits each authored attribute's RawPath as
+        // its node reference (FullName) — the security map SecurityCapturingBuilder captures is then
+        // keyed by RawPath, matching what WriteAsync resolves against.
+        var discoverer = new GalaxyDiscoverer(
+            source, attributeRef => _rawTagByAttributeRef.GetValueOrDefault(attributeRef));
         await discoverer.DiscoverAsync(capturingBuilder, cancellationToken).ConfigureAwait(false);
 
         if (_probeWatcher is not null)
@@ -625,10 +725,16 @@ public sealed class GalaxyDriver
         ArgumentNullException.ThrowIfNull(fullReferences);
         if (fullReferences.Count == 0) return Task.FromResult<IReadOnlyList<DataValueSnapshot>>([]);
 
+        // v3: the server addresses by RawPath; translate to the Galaxy attributeRef MXAccess dials.
+        // Read returns positionally, so no reverse translation is needed on the result. An unmapped
+        // RawPath dials as-is (identity) — the gateway rejects an unknown address → Bad, same as today.
+        var dialledRefs = new string[fullReferences.Count];
+        for (var i = 0; i < fullReferences.Count; i++) dialledRefs[i] = ToAttributeRef(fullReferences[i]);
+
         if (_dataReader is not null)
         {
             // Test-only path — tests inject a canned reader via the internal ctor.
-            return _dataReader.ReadAsync(fullReferences, cancellationToken);
+            return _dataReader.ReadAsync(dialledRefs, cancellationToken);
         }
 
         if (_subscriber is null)
@@ -638,7 +744,7 @@ public sealed class GalaxyDriver
                 "Either inject a test seam via the internal ctor or call InitializeAsync against a real gateway.");
         }
 
-        return ReadViaSubscribeOnceAsync(fullReferences, cancellationToken);
+        return ReadViaSubscribeOnceAsync(dialledRefs, cancellationToken);
     }
 
     /// <summary>
@@ -800,7 +906,15 @@ public sealed class GalaxyDriver
                 "issuing writes.");
         }
 
-        return _dataWriter.WriteAsync(writes, ResolveSecurity, cancellationToken);
+        // v3: WriteRequest.FullReference is a RawPath. Translate to the Galaxy attributeRef the writer
+        // dials to MXAccess. Security was captured at discovery keyed by RawPath (= the node's FullName),
+        // so the resolver the writer invokes with the DIALLED attributeRef must reverse it back to RawPath
+        // before the lookup. Both legs are identity on a miss, so an un-authored tag behaves as before.
+        var dialledWrites = new List<WriteRequest>(writes.Count);
+        foreach (var w in writes) dialledWrites.Add(w with { FullReference = ToAttributeRef(w.FullReference) });
+
+        return _dataWriter.WriteAsync(
+            dialledWrites, attributeRef => ResolveSecurity(ToRawPath(attributeRef)), cancellationToken);
     }
 
     // ===== ISubscribable (PR 4.4) =====
@@ -830,6 +944,12 @@ public sealed class GalaxyDriver
             return new GalaxySubscriptionHandle(subscriptionId);
         }
 
+        // v3: the server subscribes by RawPath; the registry + gateway operate on the Galaxy attributeRef.
+        // Translate here (identity on a miss — a synthetic alarm sub-ref or live-browse tag dials straight
+        // through). The value fan-out reverse-translates back to RawPath in OnPumpDataChange.
+        var dialledRefs = new string[fullReferences.Count];
+        for (var i = 0; i < fullReferences.Count; i++) dialledRefs[i] = ToAttributeRef(fullReferences[i]);
+
         // PR 6.3 — when the caller doesn't set a publishing interval (TimeSpan.Zero or
         // negative), fall back to the configured MxAccess.PublishingIntervalMs. The
         // server's UA subscription publishingInterval drives this in production; tests
@@ -837,7 +957,7 @@ public sealed class GalaxyDriver
         var requested = (int)Math.Max(0, publishingInterval.TotalMilliseconds);
         var bufferedIntervalMs = requested > 0 ? requested : _options.MxAccess.PublishingIntervalMs;
         var results = await _subscriber
-            .SubscribeBulkAsync(fullReferences, bufferedIntervalMs, cancellationToken)
+            .SubscribeBulkAsync(dialledRefs, bufferedIntervalMs, cancellationToken)
             .ConfigureAwait(false);
 
         // Build the binding list in input order. Failed entries (gw rejected the tag) are
@@ -846,11 +966,13 @@ public sealed class GalaxyDriver
         // surface lands in PR 5.3's parity tests.
         // Index results once, correlate in O(1) per reference rather than
         // FirstOrDefault inside the loop (O(n²) on the 50k-tag path).
+        // Bindings key on the dialled attributeRef — that's what the gw returns as the tag address and
+        // what the EventPump fans out on. OnPumpDataChange maps it back to RawPath for public consumers.
         var resultIndex = BuildResultIndex(results);
-        var bindings = new List<TagBinding>(fullReferences.Count);
-        for (var i = 0; i < fullReferences.Count; i++)
+        var bindings = new List<TagBinding>(dialledRefs.Length);
+        for (var i = 0; i < dialledRefs.Length; i++)
         {
-            var fullRef = fullReferences[i];
+            var fullRef = dialledRefs[i];
             var hasMatch = resultIndex.TryGetValue(fullRef, out var match);
             var itemHandle = hasMatch && match is { WasSuccessful: true } ? match.ItemHandle : 0;
             bindings.Add(new TagBinding(fullRef, itemHandle));
@@ -1042,12 +1164,14 @@ public sealed class GalaxyDriver
         // worker's STA queue.
         foreach (var ack in acknowledgements)
         {
-            // ConditionId carries the alarm full reference for the Galaxy driver —
-            // SourceNodeId is the OPC UA browse path, which the gateway can't address.
-            // The server-side condition state pairs them through AlarmConditionService.
-            var alarmFullReference = !string.IsNullOrEmpty(ack.ConditionId)
+            // ConditionId carries the alarm's RawPath (v3) for the Galaxy driver — SourceNodeId is the
+            // OPC UA browse path, which the gateway can't address. Translate the RawPath back to the
+            // Galaxy attributeRef the gateway dials (identity on a miss). The server-side condition state
+            // pairs them through AlarmConditionService.
+            var conditionReference = !string.IsNullOrEmpty(ack.ConditionId)
                 ? ack.ConditionId
                 : ack.SourceNodeId;
+            var alarmFullReference = ToAttributeRef(conditionReference);
             await _alarmAcknowledger.AcknowledgeAsync(
                 alarmFullReference,
                 ack.Comment ?? string.Empty,
@@ -1091,10 +1215,16 @@ public sealed class GalaxyDriver
             transition.TransitionKind, transition.AlarmFullReference, subCount, handle is not null);
         if (handle is null) return;
 
+        // v3: the ConditionId the driver reports must be the tag's RawPath — the same key the value
+        // fan-out uses (OnPumpDataChange) and the identity the discoverer stamped as SourceName — so the
+        // server-side condition state correlates the alarm to its node and a subsequent ack round-trips
+        // back through AcknowledgeAsync. The feed reports the Galaxy attributeRef; reverse-map it (identity
+        // on a miss).
+        var conditionRawPath = ToRawPath(transition.AlarmFullReference);
         var args = new AlarmEventArgs(
             SubscriptionHandle: handle,
             SourceNodeId: transition.SourceObjectReference,
-            ConditionId: transition.AlarmFullReference,
+            ConditionId: conditionRawPath,
             AlarmType: transition.AlarmTypeName,
             Message: transition.Description,
             Severity: transition.SeverityBucket,
@@ -1132,8 +1262,19 @@ public sealed class GalaxyDriver
     /// </summary>
     private void OnPumpDataChange(object? sender, DataChangeEventArgs args)
     {
-        OnDataChange?.Invoke(this, args);
+        // v3: the pump fans out keyed by the dialled attributeRef; the server correlates values to nodes
+        // by RawPath (the node's FullName). Reverse-map before surfacing to public OnDataChange consumers.
+        // Identity on a miss, so a live-browse tag surfaces under its attributeRef unchanged.
+        var publicArgs = args;
+        var rawPath = ToRawPath(args.FullReference);
+        if (!string.Equals(rawPath, args.FullReference, StringComparison.Ordinal))
+        {
+            publicArgs = args with { FullReference = rawPath };
+        }
+        OnDataChange?.Invoke(this, publicArgs);
 
+        // Probe watching stays in the attributeRef domain — ScanState attributes are discovered platform
+        // attributes, never authored RawPaths, so use the untranslated reference here.
         if (_probeWatcher is not null
             && args.FullReference.EndsWith(PerPlatformProbeWatcher.ProbeSuffix, StringComparison.OrdinalIgnoreCase))
         {
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriverFactoryExtensions.cs
index d4f4f1d1..c8f075a7 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriverFactoryExtensions.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Config;
 
@@ -79,7 +80,13 @@ public static class GalaxyDriverFactoryExtensions
             Reconnect: new GalaxyReconnectOptions(
                 InitialBackoffMs: dto.Reconnect?.InitialBackoffMs ?? 500,
                 MaxBackoffMs: dto.Reconnect?.MaxBackoffMs ?? 30_000,
-                ReplayOnSessionLost: dto.Reconnect?.ReplayOnSessionLost ?? true));
+                ReplayOnSessionLost: dto.Reconnect?.ReplayOnSessionLost ?? true))
+        {
+            // v3: the deploy artifact delivers the authored raw tags (RawPath identity + TagConfig blob
+            // carrying the camelCase "attributeRef" + WriteIdempotent flag). The driver builds its
+            // RawPath → attributeRef table from these. Empty when the config omits them.
+            RawTags = dto.RawTags ?? [],
+        };
 
         return new GalaxyDriver(driverInstanceId, options, loggerFactory?.CreateLogger<GalaxyDriver>());
     }
@@ -102,6 +109,12 @@ public static class GalaxyDriverFactoryExtensions
         public RepositoryDto? Repository { get; init; }
         /// <summary>Gets or sets the reconnect configuration.</summary>
         public ReconnectDto? Reconnect { get; init; }
+        /// <summary>
+        ///     Gets or sets the v3 authored raw tags. Each <see cref="RawTagEntry"/> carries the RawPath
+        ///     identity, the driver <c>TagConfig</c> blob (with the Galaxy <c>attributeRef</c>), and the
+        ///     WriteIdempotent flag. Bound straight through to <see cref="GalaxyDriverOptions.RawTags"/>.
+        /// </summary>
+        public List<RawTagEntry>? RawTags { get; init; }
     }
 
     /// <summary>Gateway configuration section.</summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusDriverOptions.cs
index 04e8c917..642f1902 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusDriverOptions.cs
@@ -1,11 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus;
 
 /// <summary>
 ///     Modbus TCP driver configuration. Bound from the driver's <c>DriverConfig</c> JSON at
-///     <c>DriverHost.RegisterAsync</c>. Every register the driver exposes appears in
-///     <see cref="Tags"/>; names become the OPC UA browse name + full reference.
+///     <c>DriverHost.RegisterAsync</c>. The tags the driver serves are delivered as authored raw
+///     tags in <see cref="RawTags"/>; the driver maps each through
+///     <see cref="ModbusTagDefinitionFactory.FromTagConfig"/> to build its RawPath → definition table.
 /// </summary>
 public sealed class ModbusDriverOptions
 {
@@ -18,8 +20,14 @@ public sealed class ModbusDriverOptions
     /// <summary>Gets the communication timeout duration.</summary>
     public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(2);
 
-    /// <summary>Pre-declared tag map. Modbus has no discovery protocol — the driver returns exactly these.</summary>
-    public IReadOnlyList<ModbusTagDefinition> Tags { get; init; } = [];
+    /// <summary>
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag); the driver maps each through
+    ///     <see cref="ModbusTagDefinitionFactory.FromTagConfig"/> into its RawPath → definition table.
+    ///     Modbus has no discovery protocol — the driver serves exactly these.
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
 
     /// <summary>
     ///     Background connectivity-probe settings. When <see cref="ModbusProbeOptions.Enabled"/>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusEquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusTagDefinitionFactory.cs
similarity index 52%
rename from src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusEquipmentTagParser.cs
rename to src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusTagDefinitionFactory.cs
index 7ebc789a..7d24df85 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusEquipmentTagParser.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Contracts/ModbusTagDefinitionFactory.cs
@@ -1,26 +1,43 @@
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus;
 
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>ModbusTagConfigModel</c>) into a transient <see cref="ModbusTagDefinition"/> whose
-/// <see cref="ModbusTagDefinition.Name"/> equals the reference string itself, so a value the
-/// driver publishes back keys the runtime's forward router correctly.</summary>
-public static class ModbusEquipmentTagParser
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>ModbusTagConfigModel</c>) into a <see cref="ModbusTagDefinition"/>. Under v3 a tag's
+///     identity is its <b>RawPath</b> (a cluster-scoped slash path), not the address blob — so the
+///     produced definition's <see cref="ModbusTagDefinition.Name"/> is the RawPath the driver was handed,
+///     which is exactly the wire reference the driver's <c>RawPath → def</c> resolver keys on. The driver
+///     builds that table by mapping each <see cref="RawTagEntry"/> the deploy artifact delivers through
+///     <see cref="FromTagConfig"/>; <see cref="ToTagConfig"/> is the inverse, used by authoring paths (the
+///     Client CLI) that hold a typed definition and need to synthesise the <c>TagConfig</c> blob for a
+///     <see cref="RawTagEntry"/>.
+/// </summary>
+public static class ModbusTagDefinitionFactory
 {
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is a Modbus address object.</returns>
-    public static bool TryParse(string reference, out ModbusTagDefinition def)
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     Enum fields (<c>region</c> / <c>dataType</c> / <c>byteOrder</c> / <c>stringByteOrder</c>) are read
+    ///     STRICTLY — a present-but-invalid (typo'd) value rejects the whole tag (returns
+    ///     <see langword="false"/> ⇒ the driver surfaces <c>BadNodeIdUnknown</c>) rather than silently
+    ///     defaulting to a wrong-width Good. <see cref="ModbusTagDefinition.WriteIdempotent"/> is NOT read
+    ///     from the blob — it is a platform flag the caller threads in from the tag's
+    ///     <see cref="RawTagEntry.WriteIdempotent"/>.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid Modbus address object.</returns>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out ModbusTagDefinition def)
     {
         def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
         try
         {
-            using var doc = JsonDocument.Parse(reference);
+            using var doc = JsonDocument.Parse(tagConfig);
             var root = doc.RootElement;
             if (root.ValueKind != JsonValueKind.Object
                 || !root.TryGetProperty("region", out _)
@@ -35,13 +52,13 @@ public static class ModbusEquipmentTagParser
             if (!TagConfigJson.TryReadEnumStrict(root, "region", ModbusRegion.HoldingRegisters, out var region)) return false;
             if (!TagConfigJson.TryReadEnumStrict(root, "dataType", ModbusDataType.Int16, out var dataType)) return false;
             if (!TagConfigJson.TryReadEnumStrict(root, "byteOrder", ModbusByteOrder.BigEndian, out var byteOrder)) return false;
+            if (!TagConfigJson.TryReadEnumStrict(root, "stringByteOrder", ModbusStringByteOrder.HighByteFirst, out var stringByteOrder)) return false;
             var bitIndex = (byte)ReadInt(root, "bitIndex");
             var stringLength = (ushort)ReadInt(root, "stringLength");
             // Guard: String tags require StringLength >= 1. RegisterCount = (StringLength+1)/2,
             // so StringLength=0 → 0 registers → spec-illegal FC03/FC04 with quantity=0 → PLC
-            // returns exception 03. Reject here (analogous to ValidateStringLength
-            // in the pre-declared tag path) so the driver surfaces BadNodeIdUnknown rather than a
-            // misleading BadCommunicationError.
+            // returns exception 03. Reject here so the driver surfaces BadNodeIdUnknown rather
+            // than a misleading BadCommunicationError.
             if (dataType == ModbusDataType.String && stringLength < 1) return false;
             // Guard: BitInRegister tags require BitIndex 0–15. Shift by ≥ 16 on an int overflows
             // a ushort mask silently — reads always return false, writes have no effect.
@@ -59,12 +76,17 @@ public static class ModbusEquipmentTagParser
             var writable = TagConfigJson.ReadWritable(root);
             // CONV-4: optional per-tag unitId (0–255). Absent ⇒ null ⇒ the driver-level UnitId via
             // ModbusDriver.ResolveUnitId, so multi-unit equipment tags key their own per-host breaker.
-            // Scope: unitId ONLY — the remaining parser-strictness gaps are R2-11's.
             var unitId = ReadOptionalByte(root, "unitId");
+            // Optional per-tag encoding/planner knobs — carried on the def so a RawTagEntry round-trips
+            // the full authored definition (these have no AdminUI editor field yet; absent ⇒ default).
+            var deadband = ReadOptionalDouble(root, "deadband");
+            var coalesceProhibited = ReadBool(root, "coalesceProhibited");
             def = new ModbusTagDefinition(
-                Name: reference, Region: region, Address: (ushort)address, DataType: dataType,
+                Name: rawPath, Region: region, Address: (ushort)address, DataType: dataType,
                 Writable: writable, ByteOrder: byteOrder, BitIndex: bitIndex, StringLength: stringLength,
-                ArrayCount: arrayCount, UnitId: unitId);
+                StringByteOrder: stringByteOrder, WriteIdempotent: false,
+                ArrayCount: arrayCount, Deadband: deadband, UnitId: unitId,
+                CoalesceProhibited: coalesceProhibited);
             return true;
         }
         catch (JsonException) { return false; }
@@ -72,6 +94,41 @@ public static class ModbusEquipmentTagParser
         catch (InvalidOperationException) { return false; }
     }
 
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI) that construct a
+    ///     <see cref="ModbusTagDefinition"/> from operator flags and need the <c>TagConfig</c> string to hand
+    ///     the driver as a <see cref="RawTagEntry"/>. Enum values are written as their name strings; optional
+    ///     fields are emitted only when non-default so the blob stays minimal. <c>WriteIdempotent</c> is NOT
+    ///     emitted — it travels on the <see cref="RawTagEntry"/>, not inside the blob.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(ModbusTagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["region"] = def.Region.ToString(),
+            ["address"] = def.Address,
+            ["dataType"] = def.DataType.ToString(),
+            ["byteOrder"] = def.ByteOrder.ToString(),
+            ["bitIndex"] = def.BitIndex,
+            ["stringLength"] = def.StringLength,
+            ["stringByteOrder"] = def.StringByteOrder.ToString(),
+            ["writable"] = def.Writable,
+        };
+        if (def.ArrayCount is { } count)
+        {
+            o["isArray"] = true;
+            o["arrayLength"] = count;
+        }
+        if (def.Deadband is { } deadband) o["deadband"] = deadband;
+        if (def.UnitId is { } unitId) o["unitId"] = unitId;
+        if (def.CoalesceProhibited) o["coalesceProhibited"] = true;
+        return o.ToJsonString();
+    }
+
     /// <summary>
     ///     Deploy-time inspection of an equipment-tag <c>TagConfig</c> blob (05/CONV-2). Returns
     ///     human-readable warnings for present-but-invalid enum values (<c>region</c> / <c>dataType</c> /
@@ -119,6 +176,10 @@ public static class ModbusEquipmentTagParser
         => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.Number
            && e.TryGetInt32(out var v) && v is >= 0 and <= 255 ? (byte)v : null;
 
+    private static double? ReadOptionalDouble(JsonElement o, string name)
+        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.Number
+           && e.TryGetDouble(out var v) ? v : null;
+
     private static bool ReadBool(JsonElement o, string name)
         => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.True;
 }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs
index e522b3ef..69646220 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs
@@ -32,11 +32,12 @@ public sealed class ModbusDriver
     // the reader + on-change bridge; the engine owns the loop, interval floor, and lifecycle.
     private readonly PollGroupEngine _poll;
 
-    private readonly Dictionary<string, ModbusTagDefinition> _tagsByName = new(StringComparer.OrdinalIgnoreCase);
+    // v3 authored-tag table, keyed by RawPath (the tag identity + driver wire reference). RawPath is
+    // case-sensitive ordinal. Built in InitializeAsync from _options.RawTags via the pure mapper.
+    private readonly Dictionary<string, ModbusTagDefinition> _tagsByRawPath = new(StringComparer.Ordinal);
 
-    // Resolves a read/write/subscribe fullReference to a tag definition, bridging the two
-    // authoring models: an authored tag-table entry (by name) OR an equipment tag whose
-    // reference is its raw TagConfig JSON (parsed once via ModbusEquipmentTagParser, cached).
+    // Resolves a read/write/subscribe RawPath reference to its tag definition via a single hit on the
+    // authored _tagsByRawPath table (v3: the reference is always a RawPath; a miss is a miss).
     private readonly EquipmentTagRefResolver<ModbusTagDefinition> _resolver;
 
     // Last-published value per tag, keyed by FullReference. Used by ShouldPublish to apply
@@ -104,8 +105,7 @@ public sealed class ModbusDriver
         _driverInstanceId = driverInstanceId;
         _logger = logger ?? NullLogger<ModbusDriver>.Instance;
         _resolver = new EquipmentTagRefResolver<ModbusTagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            r => ModbusEquipmentTagParser.TryParse(r, out var d) ? d : null);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         _transportFactory = transportFactory
             ?? (o => new ModbusTcpTransport(
                 o.Host, o.Port, o.Timeout, o.AutoReconnect,
@@ -199,7 +199,19 @@ public sealed class ModbusDriver
         {
             _transport = _transportFactory(_options);
             await _transport.ConnectAsync(cancellationToken).ConfigureAwait(false);
-            foreach (var t in _options.Tags) _tagsByName[t.Name] = t;
+            // Build the RawPath → definition table from the authored raw tags. Each entry's TagConfig
+            // blob is mapped by the pure factory; the entry's WriteIdempotent flag is threaded onto the
+            // def (it lives on the RawTagEntry, not inside the blob). A mapper miss is skipped (logged),
+            // never thrown — a bad tag must not fail the whole driver init.
+            foreach (var entry in _options.RawTags)
+            {
+                if (ModbusTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def))
+                    _tagsByRawPath[entry.RawPath] = def with { WriteIdempotent = entry.WriteIdempotent };
+                else
+                    _logger.LogWarning(
+                        "Modbus tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+            }
             WriteHealth(new DriverHealth(DriverState.Healthy, DateTime.UtcNow, null));
 
             // PR 23: kick off the probe loop once the transport is up. Initial state stays
@@ -269,7 +281,9 @@ public sealed class ModbusDriver
     {
         ArgumentNullException.ThrowIfNull(builder);
         var folder = builder.Folder("Modbus", "Modbus");
-        foreach (var t in _options.Tags)
+        // Surface the authored raw tags (mapped into the RawPath → def table at Initialize). The def's
+        // Name is the RawPath, used for both the browse name and the driver FullName.
+        foreach (var t in _tagsByRawPath.Values)
         {
             folder.Variable(t.Name, t.Name, new DriverAttributeInfo(
                 FullName: t.Name,
@@ -1604,8 +1618,8 @@ public sealed class ModbusDriver
         _reprobeCts?.Dispose();
         _reprobeCts = null;
 
-        _tagsByName.Clear();
-        _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
+        _tagsByRawPath.Clear();
+        _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
         _lastPublishedByRef.Clear();
         lock (_lastWrittenLock) _lastWrittenByRef.Clear();
         lock (_autoProhibitedLock) _autoProhibited.Clear();
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriverFactoryExtensions.cs
index 70606895..5291f0cb 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriverFactoryExtensions.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus;
@@ -75,14 +76,11 @@ public static class ModbusDriverFactoryExtensions
                 : ParseEnum<MelsecFamily>(dto.MelsecSubFamily, "<driver-level>", driverInstanceId, "MelsecSubFamily"),
             AutoProhibitReprobeInterval = dto.AutoProhibitReprobeMs is { } reprobeMs ? TimeSpan.FromMilliseconds(reprobeMs) : null,
             AutoReconnect = dto.AutoReconnect ?? true,
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => BuildTag(
-                    t, driverInstanceId,
-                    dto.Family is null ? ModbusFamily.Generic
-                        : ParseEnum<ModbusFamily>(dto.Family, "<driver-level>", driverInstanceId, "Family"),
-                    dto.MelsecSubFamily is null ? MelsecFamily.Q_L_iQR
-                        : ParseEnum<MelsecFamily>(dto.MelsecSubFamily, "<driver-level>", driverInstanceId, "MelsecSubFamily")))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates rawTags with the cluster's authored raw Modbus
+            // tags. The driver maps each RawTagEntry's TagConfig blob through ModbusTagDefinitionFactory
+            // at Initialize; the legacy pre-declared DTO tag path (structured/AddressString → BuildTag)
+            // is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new ModbusProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -112,82 +110,6 @@ public static class ModbusDriverFactoryExtensions
             logger: loggerFactory?.CreateLogger<ModbusDriver>());
     }
 
-    private static ModbusTagDefinition BuildTag(ModbusTagDto t, string driverInstanceId)
-        => BuildTag(t, driverInstanceId, ModbusFamily.Generic, MelsecFamily.Q_L_iQR);
-
-    private static ModbusTagDefinition BuildTag(ModbusTagDto t, string driverInstanceId, ModbusFamily family, MelsecFamily melsecSubFamily)
-    {
-        var name = t.Name ?? throw new InvalidOperationException(
-            $"Modbus config for '{driverInstanceId}' has a tag missing Name");
-
-        // AddressString takes precedence over the structured fields (Region/Address/DataType/
-        // ByteOrder/BitIndex/StringLength/ArrayCount). Tags can mix forms freely — newer pasted
-        // rows use the grammar string, legacy rows keep the structured form. Fields not derivable
-        // from the grammar (Writable, WriteIdempotent, StringByteOrder) always come from the DTO.
-        ModbusTagDefinition tag;
-        if (!string.IsNullOrWhiteSpace(t.AddressString))
-        {
-            if (!ModbusAddressParser.TryParse(t.AddressString, family, melsecSubFamily, out var parsed, out var parseError))
-                throw new InvalidOperationException(
-                    $"Modbus tag '{name}' in '{driverInstanceId}' has invalid AddressString '{t.AddressString}': {parseError}");
-            tag = new ModbusTagDefinition(
-                Name: name,
-                Region: parsed!.Region,
-                Address: parsed.Offset,
-                DataType: parsed.DataType,
-                Writable: t.Writable ?? true,
-                ByteOrder: parsed.ByteOrder,
-                BitIndex: parsed.Bit ?? 0,
-                StringLength: parsed.StringLength,
-                StringByteOrder: t.StringByteOrder is null
-                    ? ModbusStringByteOrder.HighByteFirst
-                    : ParseEnum<ModbusStringByteOrder>(t.StringByteOrder, name, driverInstanceId, "StringByteOrder"),
-                WriteIdempotent: t.WriteIdempotent ?? false,
-                ArrayCount: parsed.ArrayCount,
-                Deadband: t.Deadband,
-                UnitId: t.UnitId);
-        }
-        else
-        {
-            tag = new ModbusTagDefinition(
-                Name: name,
-                Region: ParseEnum<ModbusRegion>(t.Region, t.Name, driverInstanceId, "Region"),
-                Address: t.Address ?? throw new InvalidOperationException(
-                    $"Modbus tag '{t.Name}' in '{driverInstanceId}' missing Address"),
-                DataType: ParseEnum<ModbusDataType>(t.DataType, t.Name, driverInstanceId, "DataType"),
-                Writable: t.Writable ?? true,
-                ByteOrder: t.ByteOrder is null
-                    ? ModbusByteOrder.BigEndian
-                    : ParseEnum<ModbusByteOrder>(t.ByteOrder, t.Name, driverInstanceId, "ByteOrder"),
-                BitIndex: t.BitIndex ?? 0,
-                StringLength: t.StringLength ?? 0,
-                StringByteOrder: t.StringByteOrder is null
-                    ? ModbusStringByteOrder.HighByteFirst
-                    : ParseEnum<ModbusStringByteOrder>(t.StringByteOrder, t.Name, driverInstanceId, "StringByteOrder"),
-                WriteIdempotent: t.WriteIdempotent ?? false,
-                ArrayCount: t.ArrayCount,
-                Deadband: t.Deadband,
-                UnitId: t.UnitId);
-        }
-
-        ValidateStringLength(tag, driverInstanceId);
-        return tag;
-    }
-
-    /// <summary>
-    ///     Rejects <c>StringLength = 0</c> for <c>String</c>-typed tags. The
-    ///     driver computes <c>RegisterCount = (StringLength + 1) / 2</c> which would emit an
-    ///     FC03/FC04 with <c>quantity = 0</c>, a spec-illegal request the PLC rejects with
-    ///     exception 03 (Illegal Data Value). Surface as a clear bind-time error.
-    /// </summary>
-    private static void ValidateStringLength(ModbusTagDefinition tag, string driverInstanceId)
-    {
-        if (tag.DataType == ModbusDataType.String && tag.StringLength < 1)
-            throw new InvalidOperationException(
-                $"Modbus tag '{tag.Name}' in '{driverInstanceId}' has DataType=String but StringLength={tag.StringLength}. " +
-                $"String tags must declare StringLength >= 1 (the number of ASCII characters, packed 2 per register).");
-    }
-
     private static T ParseEnum<T>(string? raw, string? tagName, string driverInstanceId, string field) where T : struct, Enum
     {
         if (string.IsNullOrWhiteSpace(raw))
@@ -241,8 +163,9 @@ public static class ModbusDriverFactoryExtensions
         public int? AutoProhibitReprobeMs { get; init; }
         /// <summary>Gets or sets a value indicating whether automatic reconnection is enabled.</summary>
         public bool? AutoReconnect { get; init; }
-        /// <summary>Gets or sets the collection of tag definitions.</summary>
-        public List<ModbusTagDto>? Tags { get; init; }
+        /// <summary>Gets or sets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent) the
+        /// deploy artifact delivers. The driver maps each through the tag-definition factory at Initialize.</summary>
+        public List<RawTagEntry>? RawTags { get; init; }
         /// <summary>Gets or sets the probe configuration.</summary>
         public ModbusProbeDto? Probe { get; init; }
 
@@ -276,45 +199,6 @@ public static class ModbusDriverFactoryExtensions
         public double? BackoffMultiplier { get; init; }
     }
 
-    internal sealed class ModbusTagDto
-    {
-        /// <summary>Gets or sets the tag name.</summary>
-        public string? Name { get; init; }
-
-        /// <summary>
-        ///     Address grammar string per <c>ModbusAddressParser</c> — when present, takes
-        ///     precedence over the structured Region/Address/DataType/ByteOrder/BitIndex/
-        ///     StringLength/ArrayCount fields. Examples: <c>"40001"</c>, <c>"40001:F"</c>,
-        ///     <c>"40001:F:CDAB:5"</c>, <c>"HR1:I"</c>, <c>"C100"</c>.
-        /// </summary>
-        public string? AddressString { get; init; }
-
-        /// <summary>Gets or sets the register region.</summary>
-        public string? Region { get; init; }
-        /// <summary>Gets or sets the starting address.</summary>
-        public ushort? Address { get; init; }
-        /// <summary>Gets or sets the data type.</summary>
-        public string? DataType { get; init; }
-        /// <summary>Gets or sets a value indicating whether the tag is writable.</summary>
-        public bool? Writable { get; init; }
-        /// <summary>Gets or sets the byte order.</summary>
-        public string? ByteOrder { get; init; }
-        /// <summary>Gets or sets the bit index for bit-level tags.</summary>
-        public byte? BitIndex { get; init; }
-        /// <summary>Gets or sets the string length for string-typed tags.</summary>
-        public ushort? StringLength { get; init; }
-        /// <summary>Gets or sets the byte order for string values.</summary>
-        public string? StringByteOrder { get; init; }
-        /// <summary>Gets or sets a value indicating whether writes are idempotent.</summary>
-        public bool? WriteIdempotent { get; init; }
-        /// <summary>Gets or sets the array count for array-typed tags.</summary>
-        public int? ArrayCount { get; init; }
-        /// <summary>Gets or sets the deadband for change detection.</summary>
-        public double? Deadband { get; init; }
-        /// <summary>Gets or sets the unit identifier for this tag.</summary>
-        public byte? UnitId { get; init; }
-    }
-
     internal sealed class ModbusProbeDto
     {
         /// <summary>Gets or sets a value indicating whether probing is enabled.</summary>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/NamespaceMap.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/NamespaceMap.cs
index ed879916..776dfa40 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/NamespaceMap.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/NamespaceMap.cs
@@ -1,8 +1,19 @@
+using System.Text.Json;
 using Opc.Ua;
 using Opc.Ua.Client;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient;
 
+/// <summary>
+///     One authored raw tag's resolution target: the upstream OPC UA node id string the driver dials
+///     (authored as the <c>nodeId</c> key of the tag's <c>TagConfig</c> blob) plus the platform
+///     <see cref="RawTagEntry.WriteIdempotent"/> flag threaded onto the table (not read from the blob).
+/// </summary>
+/// <param name="NodeId">The upstream OPC UA node id string (a stable <c>nsu=…</c> or plain <c>ns=N;…</c> reference).</param>
+/// <param name="WriteIdempotent">Whether a write to this tag is idempotent (from the tag's <see cref="RawTagEntry"/>).</param>
+public readonly record struct RawTagBinding(string NodeId, bool WriteIdempotent);
+
 /// <summary>
 ///     Bidirectional namespace map for the OPC UA Client (gateway) driver, built at connect
 ///     time from <c>session.NamespaceUris</c> per <c>docs/v2/driver-specs.md</c> §8
@@ -20,52 +31,123 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient;
 ///         This map captures the upstream namespace table as it was at connect time and lets
 ///         the driver persist NodeIds in a <b>server-stable</b> form — the namespace
 ///         <i>URI</i> plus the identifier — via <see cref="ToStableReference"/>. At
-///         read/write time <see cref="TryResolve"/> re-binds that stable form against the
-///         <i>current</i> session's namespace table, so a table reorder is transparently
-///         corrected instead of silently misaddressing nodes.
+///         read/write time the static <see cref="TryResolve(ISession?, string, out NodeId)"/>
+///         re-binds that stable form against the <i>current</i> session's namespace table, so a
+///         table reorder is transparently corrected instead of silently misaddressing nodes.
 ///     </para>
 ///     <para>
 ///         Stable references use the form <c>nsu=&lt;uri&gt;;&lt;idType&gt;=&lt;identifier&gt;</c>,
 ///         which is the standard OPC UA namespace-URI NodeId encoding the SDK already
 ///         understands. References that are already in plain <c>ns=N;…</c> form (e.g. a
-///         hand-entered config tag) still resolve — <see cref="TryResolve"/> falls back to a
-///         direct parse against the current session.
+///         hand-entered config tag) still resolve — the static
+///         <see cref="TryResolve(ISession?, string, out NodeId)"/> falls back to a direct parse
+///         against the current session.
+///     </para>
+///     <para>
+///         <b>v3 RawPath resolution.</b> The map additionally carries the driver's authored
+///         <c>RawPath → upstream node id</c> table, built from the deployed <see cref="RawTagEntry"/>
+///         list at connect time. Under v3 the read/write/subscribe/history reference handed to the
+///         driver is the tag's <b>RawPath</b> identity, not the upstream node id; the instance
+///         <see cref="TryResolve(string, out string)"/> maps that RawPath to the upstream node id
+///         string (authored as the <c>nodeId</c> key of each tag's <c>TagConfig</c> blob), which the
+///         driver then re-binds against the live session via the static
+///         <see cref="TryResolve(ISession?, string, out NodeId)"/>.
 ///     </para>
 /// </remarks>
 public sealed class NamespaceMap
 {
+    private static readonly IReadOnlyDictionary<string, RawTagBinding> EmptyRawTable =
+        new Dictionary<string, RawTagBinding>(0, StringComparer.Ordinal);
+
     // index -> URI and URI -> index, as the upstream server published them at connect time.
     private readonly string[] _uris;
     private readonly Dictionary<string, ushort> _uriToIndex;
 
-    private NamespaceMap(string[] uris)
+    // v3 authored resolution table: RawPath (tag identity) -> upstream node id + WriteIdempotent.
+    // Case-sensitive ordinal — a RawPath is an exact cluster-scoped slash path.
+    private readonly IReadOnlyDictionary<string, RawTagBinding> _rawPathToNode;
+
+    private NamespaceMap(string[] uris, IReadOnlyDictionary<string, RawTagBinding> rawPathToNode)
     {
         _uris = uris;
         _uriToIndex = new Dictionary<string, ushort>(uris.Length, StringComparer.Ordinal);
         for (var i = 0; i < uris.Length; i++)
             _uriToIndex[uris[i]] = (ushort)i;
-    }
-
-    /// <summary>Snapshot the namespace table from a live session.</summary>
-    /// <param name="session">The OPC UA session to snapshot.</param>
-    /// <returns>A <see cref="NamespaceMap"/> capturing the session's current namespace table.</returns>
-    public static NamespaceMap FromSession(ISession session)
-    {
-        ArgumentNullException.ThrowIfNull(session);
-        return FromTable(session.NamespaceUris);
+        _rawPathToNode = rawPathToNode;
     }
 
     /// <summary>
-    ///     Snapshot a <see cref="NamespaceTable"/> directly. Separated from
-    ///     <see cref="FromSession"/> so the URI encoding can be exercised without standing up
-    ///     a live <see cref="ISession"/>.
+    ///     Snapshot the namespace table from a live session and (v3) ingest the driver's authored
+    ///     <paramref name="rawTags"/> into the <c>RawPath → upstream node id</c> resolution table.
+    /// </summary>
+    /// <param name="session">The OPC UA session to snapshot.</param>
+    /// <param name="rawTags">The deployed raw tags to build the RawPath resolution table from. Null/empty
+    ///     (e.g. the AdminUI address-picker browse path, which never resolves a RawPath) yields an empty table.</param>
+    /// <returns>A <see cref="NamespaceMap"/> capturing the session's namespace table + RawPath table.</returns>
+    public static NamespaceMap FromSession(ISession session, IReadOnlyList<RawTagEntry>? rawTags = null)
+    {
+        ArgumentNullException.ThrowIfNull(session);
+        return FromTable(session.NamespaceUris, rawTags);
+    }
+
+    /// <summary>
+    ///     Snapshot a <see cref="NamespaceTable"/> directly and (v3) ingest the driver's authored
+    ///     <paramref name="rawTags"/> into the <c>RawPath → upstream node id</c> resolution table.
+    ///     Separated from <see cref="FromSession"/> so the encoding + RawPath resolution can be
+    ///     exercised without standing up a live <see cref="ISession"/>.
     /// </summary>
     /// <param name="namespaceUris">The namespace table to snapshot.</param>
-    /// <returns>A <see cref="NamespaceMap"/> capturing the given namespace table.</returns>
-    public static NamespaceMap FromTable(NamespaceTable namespaceUris)
+    /// <param name="rawTags">The deployed raw tags to build the RawPath resolution table from; null/empty yields an empty table.</param>
+    /// <returns>A <see cref="NamespaceMap"/> capturing the given namespace table + RawPath table.</returns>
+    public static NamespaceMap FromTable(NamespaceTable namespaceUris, IReadOnlyList<RawTagEntry>? rawTags = null)
     {
         ArgumentNullException.ThrowIfNull(namespaceUris);
-        return new NamespaceMap(namespaceUris.ToArray());
+        return new NamespaceMap(namespaceUris.ToArray(), BuildRawPathTable(rawTags));
+    }
+
+    /// <summary>
+    ///     Build the <c>RawPath → upstream node id</c> table from the authored raw tags. Each entry's
+    ///     <c>TagConfig</c> blob is parsed for its <c>nodeId</c> string key (the upstream OPC UA node the
+    ///     driver dials); an entry with a blank RawPath or a TagConfig missing a usable <c>nodeId</c> is
+    ///     skipped (the driver surfaces such a reference as <c>BadNodeIdInvalid</c>). The entry's
+    ///     <see cref="RawTagEntry.WriteIdempotent"/> is threaded onto the table, not read from the blob.
+    /// </summary>
+    private static IReadOnlyDictionary<string, RawTagBinding> BuildRawPathTable(IReadOnlyList<RawTagEntry>? rawTags)
+    {
+        if (rawTags is null || rawTags.Count == 0) return EmptyRawTable;
+        var table = new Dictionary<string, RawTagBinding>(rawTags.Count, StringComparer.Ordinal);
+        foreach (var entry in rawTags)
+        {
+            if (string.IsNullOrWhiteSpace(entry.RawPath)) continue;
+            if (!TryReadNodeId(entry.TagConfig, out var nodeId)) continue;
+            table[entry.RawPath] = new RawTagBinding(nodeId, entry.WriteIdempotent);
+        }
+        return table;
+    }
+
+    /// <summary>
+    ///     Read the upstream node id string from an authored <c>TagConfig</c> blob's <c>nodeId</c> key
+    ///     (camelCase, per the AdminUI <c>OpcUaClientTagConfigModel</c>; a legacy PascalCase <c>NodeId</c>
+    ///     is also accepted). Never throws — a malformed blob yields <see langword="false"/>.
+    /// </summary>
+    private static bool TryReadNodeId(string tagConfig, out string nodeId)
+    {
+        nodeId = string.Empty;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object) return false;
+            if ((root.TryGetProperty("nodeId", out var n) || root.TryGetProperty("NodeId", out n))
+                && n.ValueKind == JsonValueKind.String)
+            {
+                var s = n.GetString();
+                if (!string.IsNullOrWhiteSpace(s)) { nodeId = s; return true; }
+            }
+        }
+        catch (JsonException) { /* malformed blob — treat as unresolvable */ }
+        return false;
     }
 
     /// <summary>Number of namespaces captured. Index 0 is always the OPC UA core namespace.</summary>
@@ -83,6 +165,39 @@ public sealed class NamespaceMap
     public ushort? IndexForUri(string uri) =>
         _uriToIndex.TryGetValue(uri, out var idx) ? idx : null;
 
+    /// <summary>Number of authored raw tags in the RawPath resolution table.</summary>
+    public int RawTagCount => _rawPathToNode.Count;
+
+    /// <summary>
+    ///     (v3) Resolve a tag's <b>RawPath</b> identity to its upstream OPC UA node id string via the
+    ///     authored resolution table. The returned node id is still a <i>reference string</i>
+    ///     (<c>nsu=…</c> or <c>ns=N;…</c>) — the caller re-binds it against the live session with the
+    ///     static <see cref="TryResolve(ISession?, string, out NodeId)"/>. Returns <see langword="false"/>
+    ///     for a blank RawPath or an unknown/un-authored RawPath.
+    /// </summary>
+    /// <param name="rawPath">The tag's RawPath (the wire reference the driver is handed under v3).</param>
+    /// <param name="nodeId">On success, the upstream node id string; otherwise <see cref="string.Empty"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="rawPath"/> maps to an authored upstream node id.</returns>
+    public bool TryResolve(string rawPath, out string nodeId)
+    {
+        nodeId = string.Empty;
+        if (string.IsNullOrWhiteSpace(rawPath)) return false;
+        if (!_rawPathToNode.TryGetValue(rawPath, out var binding)) return false;
+        nodeId = binding.NodeId;
+        return true;
+    }
+
+    /// <summary>
+    ///     (v3) Look up the full <see cref="RawTagBinding"/> (upstream node id + <c>WriteIdempotent</c>)
+    ///     for a tag's RawPath. Companion to <see cref="TryResolve(string, out string)"/> for callers
+    ///     that need the write-idempotency flag threaded onto the table.
+    /// </summary>
+    /// <param name="rawPath">The tag's RawPath.</param>
+    /// <param name="binding">On success, the resolution binding for the tag.</param>
+    /// <returns><see langword="true"/> when <paramref name="rawPath"/> is an authored raw tag.</returns>
+    public bool TryGetBinding(string rawPath, out RawTagBinding binding) =>
+        _rawPathToNode.TryGetValue(rawPath, out binding);
+
     /// <summary>
     ///     Render a NodeId resolved against this map's session as a <b>server-stable</b>
     ///     reference string — namespace URI plus identifier, in the SDK's <c>nsu=…</c>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/OpcUaClientDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/OpcUaClientDriverOptions.cs
index 022a45ef..9259a552 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/OpcUaClientDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/OpcUaClientDriverOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient;
 
@@ -23,6 +24,16 @@ public sealed class OpcUaClientDriverOptions
     /// </summary>
     public string EndpointUrl { get; init; } = "opc.tcp://localhost:4840";
 
+    /// <summary>
+    ///     v3 authored raw tags for this driver instance — the deploy artifact (Wave C) populates this
+    ///     with the cluster's raw OPC UA Client tags. Each <see cref="RawTagEntry"/> carries the tag's
+    ///     <b>RawPath</b> identity plus a driver <c>TagConfig</c> blob whose <c>nodeId</c> key holds the
+    ///     upstream OPC UA node id string the driver dials. The driver builds a <c>RawPath → nodeId</c>
+    ///     resolution table (via <see cref="NamespaceMap"/>) from this list at connect time; a
+    ///     read/write/subscribe/history reference is always a RawPath resolved through that table.
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
+
     /// <summary>
     ///     Ordered list of candidate endpoint URLs for failover. The driver tries each in
     ///     order at <c>OpcUaClientDriver.InitializeAsync</c> and on session drop;
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.csproj b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.csproj
index 8e2c9fac..aa67cc0d 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.csproj
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Contracts.csproj
@@ -8,4 +8,9 @@
     <ItemGroup>
         <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" />
     </ItemGroup>
+    <ItemGroup>
+        <!-- v3: NamespaceMap resolves a RawPath (RawTagEntry identity) to the upstream node id.
+             RawTagEntry lives in the Core.Abstractions leaf beside EquipmentTagRefResolver. -->
+        <ProjectReference Include="..\..\Core\ZB.MOM.WW.OtOpcUa.Core.Abstractions\ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj"/>
+    </ItemGroup>
 </Project>
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs
index 3484b526..1df13d30 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs
@@ -93,6 +93,15 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
     /// <param name="session">The session instance to install, or <c>null</c> to clear it.</param>
     internal void SetSessionForTest(ISession? session) => Session = session;
 
+    /// <summary>
+    ///     Test-only seam to install the <see cref="NamespaceMap"/> that connect/reconnect builds at
+    ///     runtime, so the v3 RawPath → upstream node id resolution can be exercised without a live
+    ///     connect (which is what populates <see cref="_namespaceMap"/>). Production code never calls
+    ///     this — <see cref="InitializeAsync"/> / <see cref="OnReconnectComplete"/> own the real build.
+    /// </summary>
+    /// <param name="map">The namespace map to install, or <c>null</c> to clear it.</param>
+    internal void SetNamespaceMapForTest(NamespaceMap? map) => _namespaceMap = map;
+
     private DriverHealth _health = new(DriverState.Unknown, null, null);
     private bool _disposed;
     /// <summary>URL of the endpoint the driver actually connected to. Exposed via <see cref="HostName"/>.</summary>
@@ -193,8 +202,10 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             // Build the bidirectional namespace map from the freshly negotiated session's
             // NamespaceUris (driver-specs.md §8 "Namespace Remapping"). Stored NodeIds carry
             // the namespace URI, not the session-relative ns=N index, so a remote namespace
-            // reorder across a restart can't silently misaddress nodes.
-            _namespaceMap = NamespaceMap.FromSession(session);
+            // reorder across a restart can't silently misaddress nodes. v3: the same map also
+            // ingests the authored RawTags so read/write/subscribe/history references (RawPaths)
+            // resolve to their upstream node ids.
+            _namespaceMap = NamespaceMap.FromSession(session, _options.RawTags);
 
             Session = session;
             _connectedEndpointUrl = connectedUrl;
@@ -638,14 +649,15 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
                 return results;
             }
 
-            // Parse NodeIds against the live session. Tags whose reference doesn't parse get
-            // BadNodeIdInvalid and are omitted from the wire request — saves a round-trip for
-            // a fault the driver can detect locally.
+            // Resolve each RawPath reference (v3) to a live NodeId against the current session.
+            // A RawPath the authored RawTags table doesn't know — or a node id that won't parse —
+            // gets BadNodeIdInvalid and is omitted from the wire request, saving a round-trip for a
+            // fault the driver can detect locally.
             var toSend = new ReadValueIdCollection();
             var indexMap = new List<int>(fullReferences.Count); // maps wire-index -> results-index
             for (var i = 0; i < fullReferences.Count; i++)
             {
-                if (!TryParseNodeId(session, fullReferences[i], out var nodeId))
+                if (!TryResolveTagNode(session, fullReferences[i], out var nodeId))
                 {
                     results[i] = new DataValueSnapshot(null, StatusBadNodeIdInvalid, null, now);
                     continue;
@@ -727,7 +739,7 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             var indexMap = new List<int>(writes.Count);
             for (var i = 0; i < writes.Count; i++)
             {
-                if (!TryParseNodeId(session, writes[i].FullReference, out var nodeId))
+                if (!TryResolveTagNode(session, writes[i].FullReference, out var nodeId))
                 {
                     results[i] = new WriteResult(StatusBadNodeIdInvalid);
                     continue;
@@ -783,22 +795,33 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
     }
 
     /// <summary>
-    ///     Parse a tag's full-reference string as a NodeId, resolved against the
-    ///     <paramref name="session"/>'s <i>current</i> namespace table. Accepts both the
-    ///     server-stable <c>nsu=&lt;uri&gt;;…</c> form the driver persists (see
-    ///     <see cref="NamespaceMap.ToStableReference"/>) and plain OPC UA serialized forms
-    ///     (<c>ns=2;s=…</c>, <c>i=2253</c>, <c>ns=4;g=…</c>, <c>ns=3;b=…</c>). Resolving the
-    ///     <c>nsu=…</c> form against the current session re-binds it through that session's
-    ///     URI table, so a remote namespace-table reorder across a restart is transparently
-    ///     corrected (driver-specs.md §8). Empty + malformed strings return false; the driver
-    ///     surfaces that as <see cref="StatusBadNodeIdInvalid"/> without a wire round-trip.
+    ///     (v3) Resolve a tag's <b>RawPath</b> reference to a live <see cref="NodeId"/> against the
+    ///     <paramref name="session"/>'s <i>current</i> namespace table. Two stages:
+    ///     <list type="number">
+    ///         <item>Map the RawPath (the wire reference handed to the driver under v3) to its
+    ///         upstream node id string via the authored <c>RawTags</c> table on
+    ///         <see cref="_namespaceMap"/> (<see cref="NamespaceMap.TryResolve(string, out string)"/>).</item>
+    ///         <item>Re-bind that node id string — a server-stable <c>nsu=&lt;uri&gt;;…</c> form or a plain
+    ///         <c>ns=2;s=…</c> serialized NodeId — against the current session so a remote
+    ///         namespace-table reorder across a restart is transparently corrected (driver-specs.md §8).</item>
+    ///     </list>
+    ///     An unknown/un-authored RawPath, a missing map, or a node id that won't parse returns false;
+    ///     the driver surfaces that as <see cref="StatusBadNodeIdInvalid"/> without a wire round-trip.
     /// </summary>
     /// <param name="session">The OPC UA session to resolve the node ID against.</param>
-    /// <param name="fullReference">The full reference string to parse.</param>
-    /// <param name="nodeId">The parsed node ID when successful.</param>
-    /// <returns><c>true</c> if the reference was parsed successfully; otherwise <c>false</c>.</returns>
-    internal static bool TryParseNodeId(ISession session, string fullReference, out NodeId nodeId) =>
-        NamespaceMap.TryResolve(session, fullReference, out nodeId);
+    /// <param name="rawPath">The tag's RawPath reference to resolve.</param>
+    /// <param name="nodeId">The resolved live node ID when successful.</param>
+    /// <returns><c>true</c> if the RawPath resolved to a live node ID; otherwise <c>false</c>.</returns>
+    internal bool TryResolveTagNode(ISession session, string rawPath, out NodeId nodeId)
+    {
+        nodeId = NodeId.Null;
+        var map = _namespaceMap;
+        if (map is null) return false;
+        // Stage 1: RawPath -> upstream node id string (authored as TagConfig.nodeId).
+        if (!map.TryResolve(rawPath, out var upstreamNodeId)) return false;
+        // Stage 2: node id string -> live NodeId re-bound against the current session table.
+        return NamespaceMap.TryResolve(session, upstreamNodeId, out nodeId);
+    }
 
     /// <summary>
     ///     Render a discovered NodeId in the server-stable form persisted into the local
@@ -1201,9 +1224,10 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             var itemHandlers = new List<MonitoredItemNotificationHandle>();
             foreach (var fullRef in fullReferences)
             {
-                if (!TryParseNodeId(session, fullRef, out var nodeId)) continue;
-                // The tag string is routed through MonitoredItem.Handle so the Notification
-                // handler can identify which tag changed without an extra lookup.
+                if (!TryResolveTagNode(session, fullRef, out var nodeId)) continue;
+                // The RawPath (v3 tag identity) is routed through MonitoredItem.Handle so the
+                // Notification handler reports the change under the same reference the runtime
+                // subscribed with — StartNodeId is the resolved upstream node, Handle stays the RawPath.
                 var item = new MonitoredItem(telemetry: null!, new MonitoredItemOptions
                 {
                     DisplayName = fullRef,
@@ -1464,7 +1488,9 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             var callRequests = new CallMethodRequestCollection();
             foreach (var ack in acknowledgements)
             {
-                if (!TryParseNodeId(session, ack.ConditionId, out var conditionId)) continue;
+                // ConditionId is an upstream condition-node id captured from the alarm event (not a
+                // tag RawPath), so it re-binds directly against the session via the static resolve.
+                if (!NamespaceMap.TryResolve(session, ack.ConditionId, out var conditionId)) continue;
                 callRequests.Add(new CallMethodRequest
                 {
                     ObjectId = conditionId,
@@ -1658,7 +1684,7 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             // NodeId parsing is namespace-relative, so it must also use the current session's
             // namespace table.
             var session = Session;
-            if (session is null || !TryParseNodeId(session, fullReference, out var nodeId))
+            if (session is null || !TryResolveTagNode(session, fullReference, out var nodeId))
             {
                 return new Core.Abstractions.HistoryReadResult([], null);
             }
@@ -1836,7 +1862,9 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             {
                 notifierNodeId = ObjectIds.Server;
             }
-            else if (!TryParseNodeId(session, sourceName, out var parsed))
+            // sourceName is an upstream event-notifier node id (not a tag RawPath), so it
+            // re-binds directly against the session via the static resolve.
+            else if (!NamespaceMap.TryResolve(session, sourceName, out var parsed))
             {
                 return new Core.Abstractions.HistoricalEventsResult([], null);
             }
@@ -1989,8 +2017,9 @@ public sealed class OpcUaClientDriver : IDriver, ITagDiscovery, IReadable, IWrit
             // Reconnect succeeded. Rebuild the namespace map from the *new* session: the
             // remote server may have reordered its namespace table across the restart that
             // caused the drop (driver-specs.md §8). Stable nsu= references stored in the
-            // address space re-resolve correctly against this fresh map.
-            _namespaceMap = NamespaceMap.FromSession(newSession);
+            // address space re-resolve correctly against this fresh map. v3: re-ingest the
+            // authored RawTags so RawPath resolution survives the reconnect too.
+            _namespaceMap = NamespaceMap.FromSession(newSession, _options.RawTags);
             TransitionTo(HostState.Running);
             _health = new DriverHealth(DriverState.Healthy, DateTime.UtcNow, null);
             return;
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriverFactoryExtensions.cs
index 6943927f..ad47daff 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriverFactoryExtensions.cs
@@ -8,7 +8,11 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient;
 /// <summary>
 ///     Registers the OPC UA Client driver with the <see cref="DriverFactoryRegistry"/>. The driver's
 ///     <c>DriverConfig</c> JSON deserialises directly into <see cref="OpcUaClientDriverOptions"/>
-///     (the same shape <see cref="OpcUaClientDriverProbe"/> reads), so no separate DTO is needed.
+///     (the same shape <see cref="OpcUaClientDriverProbe"/> reads), so no separate DTO is needed —
+///     unlike the protocol drivers, this driver has no pre-declared "Tags" DTO path to retire.
+///     v3: the deploy artifact's authored raw tags bind straight onto
+///     <see cref="OpcUaClientDriverOptions.RawTags"/> (a <c>RawTagEntry</c> list) through the same
+///     deserialiser; the <c>EndpointUrl</c> binding is unchanged (endpoint→DeviceConfig is Wave C).
 ///     Mirrors <c>ModbusDriverFactoryExtensions</c> / <c>GalaxyDriverFactoryExtensions</c>.
 /// </summary>
 public static class OpcUaClientDriverFactoryExtensions
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7DriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7DriverOptions.cs
index 23c8974b..15a09eb7 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7DriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7DriverOptions.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7;
 
@@ -53,8 +54,15 @@ public sealed class S7DriverOptions
     /// <summary>Connect + per-operation timeout.</summary>
     public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(5);
 
-    /// <summary>Pre-declared tag map. S7 has a symbol-table protocol but S7.Net does not expose it, so the driver operates off a static tag list configured per-site. Address grammar documented in S7AddressParser (PR 63).</summary>
-    public IReadOnlyList<S7TagDefinition> Tags { get; init; } = [];
+    /// <summary>
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag); the driver maps each through
+    ///     <see cref="S7TagDefinitionFactory.FromTagConfig"/> into its RawPath → definition table.
+    ///     S7 has a symbol-table protocol but S7.Net does not expose it, so the driver serves exactly
+    ///     these authored tags. Address grammar documented in S7AddressParser (PR 63).
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
 
     /// <summary>
     ///     Background connectivity-probe settings. When enabled, the driver runs a tick loop
@@ -104,7 +112,7 @@ public sealed class S7ProbeOptions
 ///     Element count when the tag is a 1-D array; <c>null</c> for a scalar. Any value <c>&gt;= 1</c>
 ///     (including 1) surfaces as a 1-D OPC UA array node.
 ///     For an equipment tag this is threaded from the <c>TagConfig</c> JSON's <c>arrayLength</c>
-///     (honoured only when <c>isArray</c> is true) by <see cref="S7EquipmentTagParser"/>. When
+///     (honoured only when <c>isArray</c> is true) by <see cref="S7TagDefinitionFactory"/>. When
 ///     set, the driver issues a single contiguous block read of
 ///     <c>ArrayCount × element-bytes</c> from the tag's start address and decodes each element
 ///     into an element-typed CLR array (<c>short[]</c> / <c>int[]</c> / <c>float[]</c> / etc.).
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7EquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7TagDefinitionFactory.cs
similarity index 53%
rename from src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7EquipmentTagParser.cs
rename to src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7TagDefinitionFactory.cs
index 8f0cdf1c..48044406 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7EquipmentTagParser.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Contracts/S7TagDefinitionFactory.cs
@@ -1,29 +1,45 @@
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7;
 
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>S7TagConfigModel</c> — <c>address</c> / <c>dataType</c> / <c>stringLength</c>) into a transient
-/// <see cref="S7TagDefinition"/> whose <see cref="S7TagDefinition.Name"/> equals the reference string
-/// itself, so a value the driver publishes back keys the runtime's forward router correctly.</summary>
-public static class S7EquipmentTagParser
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>S7TagConfigModel</c> — <c>address</c> / <c>dataType</c> / <c>stringLength</c>) into a
+///     <see cref="S7TagDefinition"/>. Under v3 a tag's identity is its <b>RawPath</b> (a cluster-scoped
+///     slash path), not the address blob — so the produced definition's <see cref="S7TagDefinition.Name"/>
+///     is the RawPath the driver was handed, which is exactly the wire reference the driver's
+///     <c>RawPath → def</c> resolver keys on. The driver builds that table by mapping each
+///     <see cref="RawTagEntry"/> the deploy artifact delivers through <see cref="FromTagConfig"/>;
+///     <see cref="ToTagConfig"/> is the inverse, used by authoring paths (the Client CLI) that hold a typed
+///     definition and need to synthesise the <c>TagConfig</c> blob for a <see cref="RawTagEntry"/>.
+/// </summary>
+public static class S7TagDefinitionFactory
 {
     /// <summary>S7 string max length (DBSTRING header reserves 2 bytes; 254 chars max).</summary>
     private const int MaxStringLength = 254;
 
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is an S7 address object.</returns>
-    public static bool TryParse(string reference, out S7TagDefinition def)
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     The <c>dataType</c> enum is read STRICTLY — a present-but-invalid (typo'd) value rejects the whole
+    ///     tag (returns <see langword="false"/> ⇒ the driver surfaces <c>BadNodeIdUnknown</c>) rather than
+    ///     silently defaulting to a wrong-width Good. <see cref="S7TagDefinition.WriteIdempotent"/> is NOT read
+    ///     from the blob — it is a platform flag the caller threads in from the tag's
+    ///     <see cref="RawTagEntry.WriteIdempotent"/>.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid S7 address object.</returns>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out S7TagDefinition def)
     {
         def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
         try
         {
-            using var doc = JsonDocument.Parse(reference);
+            using var doc = JsonDocument.Parse(tagConfig);
             var root = doc.RootElement;
             if (root.ValueKind != JsonValueKind.Object
                 || !root.TryGetProperty("address", out var addrEl)
@@ -42,18 +58,19 @@ public static class S7EquipmentTagParser
             if (dataType == S7DataType.String && (stringLength < 0 || stringLength > MaxStringLength)) return false;
             // Array intent: the canonical sink-side parse (DeploymentArtifact.ExtractTagArray)
             // honours arrayLength ONLY when isArray is true AND the prop is a JSON number — mirror
-            // that here so the driver's transient def agrees byte-for-byte with the materialised
-            // OPC UA node's ValueRank/ArrayDimensions. Absent / isArray=false ⇒ null (scalar).
+            // that here so the driver's def agrees byte-for-byte with the materialised OPC UA node's
+            // ValueRank/ArrayDimensions. Absent / isArray=false ⇒ null (scalar).
             var arrayCount = ReadArrayCount(root);
             // "writable" defaults to true when absent (today's value); node-level authz still governs
             // writes. Honouring the key makes read-only equipment tags authorable (UNDER-6).
             var writable = TagConfigJson.ReadWritable(root);
             def = new S7TagDefinition(
-                Name: reference,
+                Name: rawPath,
                 Address: address,
                 DataType: dataType,
                 Writable: writable,
                 StringLength: stringLength == 0 ? MaxStringLength : stringLength,
+                WriteIdempotent: false,
                 ArrayCount: arrayCount);
             return true;
         }
@@ -62,6 +79,37 @@ public static class S7EquipmentTagParser
         catch (InvalidOperationException) { return false; }
     }
 
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI) that construct an
+    ///     <see cref="S7TagDefinition"/> from operator flags and need the <c>TagConfig</c> string to hand the
+    ///     driver as a <see cref="RawTagEntry"/>. The <c>dataType</c> enum is written as its name string;
+    ///     <c>stringLength</c> is emitted only when it diverges from the 254 default so the blob stays minimal.
+    ///     <c>Name</c> is NOT emitted — it becomes the <see cref="RawTagEntry.RawPath"/>. <c>WriteIdempotent</c>
+    ///     is NOT emitted — it travels on the <see cref="RawTagEntry"/>, not inside the blob.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(S7TagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["address"] = def.Address,
+            ["dataType"] = def.DataType.ToString(),
+            ["writable"] = def.Writable,
+        };
+        // FromTagConfig maps an absent / zero stringLength to MaxStringLength (254), so a def carrying
+        // the 254 default round-trips whether or not we emit it — emit only when it diverges.
+        if (def.StringLength != MaxStringLength) o["stringLength"] = def.StringLength;
+        if (def.ArrayCount is { } count)
+        {
+            o["isArray"] = true;
+            o["arrayLength"] = count;
+        }
+        return o.ToJsonString();
+    }
+
     /// <summary>
     ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
     ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig (a silent
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs
index 476fc283..c7949bb4 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs
@@ -51,8 +51,7 @@ public sealed class S7Driver
         _plcFactory = plcFactory ?? new S7PlcFactory();
         _logger = logger ?? NullLogger<S7Driver>.Instance;
         _resolver = new EquipmentTagRefResolver<S7TagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            r => S7EquipmentTagParser.TryParse(r, out var d) ? d : null);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         // CONV-1: the polling overlay runs on the shared PollGroupEngine (structural array diff +
         // drain-before-dispose + capped-exponential failure backoff + caller-token-filtered OCE),
         // retiring the bespoke S7 poll fork. minInterval 100 ms matches the S7 scan-mailbox floor;
@@ -104,12 +103,15 @@ public sealed class S7Driver
     /// <summary>OPC UA StatusCode used for a genuine device fault (CPU error, hardware fault).</summary>
     private const uint StatusBadDeviceFailure = 0x808B0000u;
 
-    private readonly Dictionary<string, S7TagDefinition> _tagsByName = new(StringComparer.OrdinalIgnoreCase);
-    private readonly Dictionary<string, S7ParsedAddress> _parsedByName = new(StringComparer.OrdinalIgnoreCase);
+    // v3: the RawPath → definition table. Keyed by RawPath (the v3 tag identity, == def.Name),
+    // case-sensitive ordinal. Built in InitializeAsync from _options.RawTags via the pure factory.
+    private readonly Dictionary<string, S7TagDefinition> _tagsByRawPath = new(StringComparer.Ordinal);
+    // Pre-parsed S7 address per tag, keyed by RawPath (== def.Name). Populated alongside
+    // _tagsByRawPath at init so a config typo fails fast here rather than as a per-read fault.
+    private readonly Dictionary<string, S7ParsedAddress> _parsedByRawPath = new(StringComparer.Ordinal);
 
-    // Resolves a read/write/subscribe fullReference to a tag definition, bridging the two
-    // authoring models: an authored tag-table entry (by name) OR an equipment tag whose
-    // reference is its raw TagConfig JSON (parsed once via S7EquipmentTagParser, cached).
+    // Resolves a read/write/subscribe fullReference (a RawPath in v3) to a tag definition by a single
+    // authored-table hit; a miss is a miss (the driver surfaces BadNodeIdUnknown, never a parse attempt).
     private readonly EquipmentTagRefResolver<S7TagDefinition> _resolver;
 
     /// <summary>
@@ -175,6 +177,24 @@ public sealed class S7Driver
             if (HasConfigBody(driverConfigJson))
                 _options = S7DriverFactoryExtensions.ParseOptions(_driverInstanceId, driverConfigJson);
 
+            // v3: build the RawPath → definition table from the authored raw tags BEFORE the config
+            // guards run (they now iterate the mapped table). Each entry's TagConfig blob is mapped by
+            // the pure factory; the entry's WriteIdempotent flag is threaded onto the def (it lives on
+            // the RawTagEntry, not inside the blob). A mapper miss is skipped (logged), never thrown —
+            // one bad tag must not fail the whole driver init.
+            _tagsByRawPath.Clear();
+            _parsedByRawPath.Clear();
+            _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
+            foreach (var entry in _options.RawTags)
+            {
+                if (S7TagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def))
+                    _tagsByRawPath[entry.RawPath] = def with { WriteIdempotent = entry.WriteIdempotent };
+                else
+                    _logger.LogWarning(
+                        "S7 tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+            }
+
             // Phase 4d combined config guard. Timer/Counter addresses and the wide/structured
             // types (Int64/UInt64/Float64/String/DateTime) are now SUPPORTED, but only in
             // specific shapes — this rejects the genuinely-unsupported configurations
@@ -220,21 +240,17 @@ public sealed class S7Driver
 
             // Parse every tag's address once at init so config typos fail fast here instead
             // of surfacing as BadInternalError on every Read against the bad tag. The parser
-            // also rejects bit-offset > 7, DB 0, unknown area letters, etc.
-            _tagsByName.Clear();
-            _parsedByName.Clear();
-            _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
-            foreach (var t in _options.Tags)
+            // also rejects bit-offset > 7, DB 0, unknown area letters, etc. Keyed by RawPath
+            // (== def.Name) so Read/Write can pick up the pre-parsed address.
+            foreach (var t in _tagsByRawPath.Values)
             {
-                var parsed = S7AddressParser.Parse(t.Address); // throws FormatException
-                _tagsByName[t.Name] = t;
-                _parsedByName[t.Name] = parsed;
+                _parsedByRawPath[t.Name] = S7AddressParser.Parse(t.Address); // throws FormatException
             }
 
             _initialized = true;
             _health = new DriverHealth(DriverState.Healthy, DateTime.UtcNow, null);
             _logger.LogInformation("S7Driver connected. Driver={DriverInstanceId} Host={Host} CPU={CpuType} Tags={TagCount}",
-                _driverInstanceId, _options.Host, _options.CpuType, _options.Tags.Count);
+                _driverInstanceId, _options.Host, _options.CpuType, _tagsByRawPath.Count);
 
             // Kick off the probe loop once the connection is up. Initial HostState stays
             // Unknown until the first probe tick succeeds — avoids broadcasting a premature
@@ -360,7 +376,7 @@ public sealed class S7Driver
     /// </summary>
     private void RejectUnsupportedTagConfigs()
     {
-        foreach (var t in _options.Tags)
+        foreach (var t in _tagsByRawPath.Values)
         {
             var isWide = ByteAnchoredDataTypes.Contains(t.DataType);
 
@@ -442,7 +458,7 @@ public sealed class S7Driver
     /// </summary>
     private void RejectUnsupportedTagDataTypes()
     {
-        foreach (var t in _options.Tags)
+        foreach (var t in _tagsByRawPath.Values)
         {
             if (UnimplementedDataTypes.Contains(t.DataType))
             {
@@ -573,12 +589,10 @@ public sealed class S7Driver
 
     private async Task<object> ReadOneAsync(IS7Plc plc, S7TagDefinition tag, CancellationToken ct)
     {
-        // Authored tags pre-parse their address at init (_parsedByName); an equipment-tag ref
-        // (resolved transiently by _resolver) has no _parsedByName entry, so parse its address
-        // on demand. S7AddressParser.Parse throws FormatException on a bad address, which the
-        // caller's catch maps to BadCommunicationError — the same surface a bad authored tag
-        // would have hit at init (transient defs aren't init-validated).
-        var addr = _parsedByName.TryGetValue(tag.Name, out var parsed)
+        // Every tag pre-parses its address at init (_parsedByRawPath); the on-demand
+        // S7AddressParser.Parse is a defensive fallback for a tag not in that table. Parse throws
+        // FormatException on a bad address, which the caller's catch maps to BadCommunicationError.
+        var addr = _parsedByRawPath.TryGetValue(tag.Name, out var parsed)
             ? parsed
             : S7AddressParser.Parse(tag.Address);
 
@@ -1045,16 +1059,16 @@ public sealed class S7Driver
                     results[i] = new WriteResult(StatusBadNotWritable);
                     continue;
                 }
-                // Timer/Counter transient-write guard: a transient equipment-tag ref is always
-                // resolved with Writable=true (S7EquipmentTagParser hardcodes it, and node-level
-                // auth governs writes), so Timer/Counter addresses bypass the !Writable gate above
-                // and would otherwise reach EncodeScalarBlock, which throws NotSupportedException →
-                // BadNotSupported. The docs say Timer/Counter writes return BadNotWritable. Detect
-                // the area here before the call so BOTH authored (caught by guard-d at init) and
-                // transient Timer/Counter writes consistently return BadNotWritable.
+                // Timer/Counter write guard: an equipment tag authored writable=true (S7 mapper
+                // honours the "writable" key, and node-level auth governs writes) whose address is a
+                // Timer/Counter would bypass the !Writable gate above and reach EncodeScalarBlock,
+                // which throws NotSupportedException → BadNotSupported. The docs say Timer/Counter
+                // writes return BadNotWritable. Detect the area here before the call so it
+                // consistently returns BadNotWritable (init guard-d also rejects a writable
+                // Timer/Counter, but the mapper doesn't run that guard).
                 // TryParse (not Parse) so a malformed address falls through to the existing
                 // error path rather than throwing here.
-                if (_parsedByName.TryGetValue(tag.Name, out var tcParsed)
+                if (_parsedByRawPath.TryGetValue(tag.Name, out var tcParsed)
                         ? tcParsed.Area is S7Area.Timer or S7Area.Counter
                         : (S7AddressParser.TryParse(tag.Address, out tcParsed) && tcParsed.Area is S7Area.Timer or S7Area.Counter))
                 {
@@ -1126,11 +1140,11 @@ public sealed class S7Driver
                 $"S7 array writes are not yet supported (tag '{tag.Name}'). " +
                 "Use individual scalar tags or set Writable=false for read-only arrays.");
 
-        // Parse the address the same way ReadOneAsync does: authored tags pre-parse at init
-        // (_parsedByName); an equipment-tag ref (resolved transiently) parses on demand. Needed
-        // here so the wide-type write can byte-address the block (the narrow path below addresses
-        // by the raw address string instead).
-        var addr = _parsedByName.TryGetValue(tag.Name, out var parsed)
+        // Parse the address the same way ReadOneAsync does: every tag pre-parses at init
+        // (_parsedByRawPath), with an on-demand parse as a defensive fallback. Needed here so the
+        // wide-type write can byte-address the block (the narrow path below addresses by the raw
+        // address string instead).
+        var addr = _parsedByRawPath.TryGetValue(tag.Name, out var parsed)
             ? parsed
             : S7AddressParser.Parse(tag.Address);
 
@@ -1370,7 +1384,7 @@ public sealed class S7Driver
     {
         ArgumentNullException.ThrowIfNull(builder);
         var folder = builder.Folder("S7", "S7");
-        foreach (var t in _options.Tags)
+        foreach (var t in _tagsByRawPath.Values)
         {
             // A tag carrying a non-null array count (>= 1) surfaces as a 1-D OPC UA array node.
             // A null count stays scalar. A count of 1 IS a valid 1-element array: the foundation
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7DriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7DriverFactoryExtensions.cs
index 16b2f45f..5b4670e4 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7DriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7DriverFactoryExtensions.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7;
@@ -64,9 +65,10 @@ public static class S7DriverFactoryExtensions
             Rack = dto.Rack ?? 0,
             Slot = dto.Slot ?? 0,
             Timeout = TimeSpan.FromMilliseconds(dto.TimeoutMs ?? 5_000),
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => BuildTag(t, driverInstanceId))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates rawTags with the cluster's authored raw S7
+            // tags. The driver maps each RawTagEntry's TagConfig blob through S7TagDefinitionFactory
+            // at Initialize; the legacy pre-declared DTO tag path (Name/Address → BuildTag) is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new S7ProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -77,18 +79,6 @@ public static class S7DriverFactoryExtensions
         };
     }
 
-    private static S7TagDefinition BuildTag(S7TagDto t, string driverInstanceId) =>
-        new(
-            Name: t.Name ?? throw new InvalidOperationException(
-                $"S7 config for '{driverInstanceId}' has a tag missing Name"),
-            Address: t.Address ?? throw new InvalidOperationException(
-                $"S7 tag '{t.Name}' in '{driverInstanceId}' missing Address"),
-            DataType: ParseEnum<S7DataType>(t.DataType, driverInstanceId, "DataType",
-                tagName: t.Name),
-            Writable: t.Writable ?? true,
-            StringLength: t.StringLength ?? 254,
-            WriteIdempotent: t.WriteIdempotent ?? false);
-
     private static T ParseEnum<T>(string? raw, string driverInstanceId, string field,
         string? tagName = null, T? fallback = null) where T : struct, Enum
     {
@@ -127,29 +117,13 @@ public static class S7DriverFactoryExtensions
         public short? Slot { get; init; }
         /// <summary>Gets the connection timeout in milliseconds.</summary>
         public int? TimeoutMs { get; init; }
-        /// <summary>Gets the list of tag definitions.</summary>
-        public List<S7TagDto>? Tags { get; init; }
+        /// <summary>Gets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent) the deploy
+        /// artifact delivers. The driver maps each through <see cref="S7TagDefinitionFactory"/> at Initialize.</summary>
+        public List<RawTagEntry>? RawTags { get; init; }
         /// <summary>Gets the probe configuration.</summary>
         public S7ProbeDto? Probe { get; init; }
     }
 
-    /// <summary>Data transfer object for S7 tag definition.</summary>
-    internal sealed class S7TagDto
-    {
-        /// <summary>Gets the tag name.</summary>
-        public string? Name { get; init; }
-        /// <summary>Gets the S7 address (e.g., DB1.DBD0).</summary>
-        public string? Address { get; init; }
-        /// <summary>Gets the data type name.</summary>
-        public string? DataType { get; init; }
-        /// <summary>Gets a value indicating whether the tag is writable.</summary>
-        public bool? Writable { get; init; }
-        /// <summary>Gets the string length for string types.</summary>
-        public int? StringLength { get; init; }
-        /// <summary>Gets a value indicating whether write is idempotent.</summary>
-        public bool? WriteIdempotent { get; init; }
-    }
-
     /// <summary>Data transfer object for S7 probe configuration.</summary>
     internal sealed class S7ProbeDto
     {
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATDriverOptions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATDriverOptions.cs
index ec6a6a37..b37430e1 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATDriverOptions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATDriverOptions.cs
@@ -1,18 +1,30 @@
 using System.ComponentModel.DataAnnotations;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
 
 /// <summary>
 ///     TwinCAT ADS driver configuration. One instance supports N targets (each identified by
 ///     an AMS Net ID + port). Compiles + runs without a local AMS router but every wire call
-///     fails with <c>BadCommunicationError</c> until a router is reachable.
+///     fails with <c>BadCommunicationError</c> until a router is reachable. The tags the driver
+///     serves are delivered as authored raw tags in <see cref="RawTags"/>; the driver maps each
+///     through <see cref="TwinCATTagDefinitionFactory.FromTagConfig"/> to build its
+///     RawPath → definition table, routing each to its device by the entry's
+///     <see cref="RawTagEntry.DeviceName"/> (multi-device).
 /// </summary>
 public sealed class TwinCATDriverOptions
 {
     /// <summary>Gets the list of TwinCAT devices to connect to.</summary>
     public IReadOnlyList<TwinCATDeviceOptions> Devices { get; init; } = [];
-    /// <summary>Gets the list of TwinCAT tag definitions.</summary>
-    public IReadOnlyList<TwinCATTagDefinition> Tags { get; init; } = [];
+
+    /// <summary>
+    ///     Authored raw tags this driver serves. The deploy artifact hands each authored raw
+    ///     <c>Tag</c> as a <see cref="RawTagEntry"/> (RawPath identity + driver <c>TagConfig</c> blob +
+    ///     WriteIdempotent flag + owning <see cref="RawTagEntry.DeviceName"/>); the driver maps each
+    ///     through <see cref="TwinCATTagDefinitionFactory.FromTagConfig"/> into its RawPath → definition
+    ///     table and routes it to the matching <see cref="Devices"/> entry by DeviceName.
+    /// </summary>
+    public IReadOnlyList<RawTagEntry> RawTags { get; init; } = [];
     /// <summary>Gets the probe options for TwinCAT connection probing.</summary>
     public TwinCATProbeOptions Probe { get; init; } = new();
     /// <summary>Gets the default communication timeout.</summary>
@@ -33,8 +45,8 @@ public sealed class TwinCATDriverOptions
     /// <summary>
     ///     When <c>true</c>, <c>DiscoverAsync</c> walks each device's symbol table via the
     ///     TwinCAT <c>SymbolLoaderFactory</c> (flat mode) + surfaces controller-resident
-    ///     globals / program locals under a <c>Discovered/</c> sub-folder. Pre-declared tags
-    ///     from <see cref="Tags"/> always emit regardless. Default <c>false</c> to preserve
+    ///     globals / program locals under a <c>Discovered/</c> sub-folder. Authored raw tags
+    ///     from <see cref="RawTags"/> always emit regardless. Default <c>false</c> to preserve
     ///     the strict-config path for deployments where only declared tags should appear.
     /// </summary>
     public bool EnableControllerBrowse { get; init; }
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATEquipmentTagParser.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATEquipmentTagParser.cs
deleted file mode 100644
index af378af3..00000000
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATEquipmentTagParser.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.Text.Json;
-using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
-
-/// <summary>Parses an equipment tag's <c>TagConfig</c> JSON (the shape authored by the AdminUI
-/// <c>TwinCATTagConfigModel</c>) into a transient <see cref="TwinCATTagDefinition"/> whose
-/// <see cref="TwinCATTagDefinition.Name"/> equals the reference string itself, so a value the
-/// driver publishes back keys the runtime's forward router correctly.</summary>
-public static class TwinCATEquipmentTagParser
-{
-    /// <summary>Attempts to parse an equipment-tag reference into a transient definition.</summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON (also used as the def identity).</param>
-    /// <param name="def">The transient definition when parsing succeeds.</param>
-    /// <returns><see langword="true"/> when <paramref name="reference"/> is a TwinCAT symbol object.</returns>
-    public static bool TryParse(string reference, out TwinCATTagDefinition def)
-    {
-        def = null!;
-        // Authored tag names never start with '{' (AdminUI name validation), so a leading brace marks an equipment-tag TagConfig blob.
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return false;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object
-                || !root.TryGetProperty("symbolPath", out var symbol)
-                || symbol.ValueKind != JsonValueKind.String)
-                return false;
-            var symbolPath = symbol.GetString();
-            if (string.IsNullOrWhiteSpace(symbolPath)) return false;
-            var deviceHostAddress = ReadString(root, "deviceHostAddress");
-            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
-            // instead of silently defaulting to a wrong-width Good.
-            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", TwinCATDataType.DInt, out var dataType)) return false;
-            // Array intent — same shape the runtime/OPC-UA foundation parses (camelCase
-            // `isArray` bool + `arrayLength` uint). arrayLength is honoured ONLY when isArray
-            // is true AND it is a positive JSON number, so a stale length behind a cleared
-            // isArray never produces an orphan array tag (Phase 4c).
-            var arrayLength = ReadArrayLength(root);
-            // "writable" defaults to true when absent (today's value) — makes read-only equipment tags
-            // authorable (UNDER-6).
-            var writable = TagConfigJson.ReadWritable(root);
-            def = new TwinCATTagDefinition(
-                Name: reference, DeviceHostAddress: deviceHostAddress, SymbolPath: symbolPath,
-                DataType: dataType, Writable: writable, ArrayLength: arrayLength);
-            return true;
-        }
-        catch (JsonException) { return false; }
-        catch (FormatException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-
-    /// <summary>
-    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
-    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
-    ///     or not an equipment-tag object. Never throws.
-    /// </summary>
-    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
-    /// <returns>The warnings; empty when clean.</returns>
-    public static IReadOnlyList<string> Inspect(string reference)
-    {
-        var warnings = new List<string>();
-        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
-        try
-        {
-            using var doc = JsonDocument.Parse(reference);
-            var root = doc.RootElement;
-            if (root.ValueKind != JsonValueKind.Object)
-            {
-                warnings.Add("TwinCAT TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
-                return warnings;
-            }
-            var w = TagConfigJson.DescribeInvalidEnum<TwinCATDataType>(root, "dataType");
-            if (w is not null) warnings.Add(w);
-        }
-        catch (JsonException)
-        {
-            warnings.Add("TwinCAT TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
-        }
-        return warnings;
-    }
-
-    private static string ReadString(JsonElement o, string name)
-        => o.TryGetProperty(name, out var e) && e.ValueKind == JsonValueKind.String
-           ? e.GetString() ?? "" : "";
-
-    /// <summary>
-    ///     Reads the optional 1-D array length: <c>arrayLength</c> (a positive int32; values above
-    ///     <see cref="int.MaxValue"/> are treated as absent/scalar) honoured ONLY when <c>isArray</c>
-    ///     is the JSON literal <c>true</c>. Returns <c>null</c> (scalar) when isArray is absent/false,
-    ///     when arrayLength is absent / non-numeric / zero / negative / greater than
-    ///     <see cref="int.MaxValue"/>.
-    /// </summary>
-    private static int? ReadArrayLength(JsonElement o)
-    {
-        if (!o.TryGetProperty("isArray", out var aEl) || aEl.ValueKind != JsonValueKind.True)
-            return null;
-        if (!o.TryGetProperty("arrayLength", out var lEl) || lEl.ValueKind != JsonValueKind.Number)
-            return null;
-        return lEl.TryGetInt32(out var len) && len > 0 ? len : null;
-    }
-}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATTagDefinitionFactory.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATTagDefinitionFactory.cs
new file mode 100644
index 00000000..92aca8c7
--- /dev/null
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Contracts/TwinCATTagDefinitionFactory.cs
@@ -0,0 +1,156 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
+
+/// <summary>
+///     v3 pure mapper: turns an authored raw tag's <c>TagConfig</c> JSON (the shape produced by the
+///     AdminUI <c>TwinCATTagConfigModel</c>) into a <see cref="TwinCATTagDefinition"/>. Under v3 a tag's
+///     identity is its <b>RawPath</b> (a cluster-scoped slash path), not the address blob — so the
+///     produced definition's <see cref="TwinCATTagDefinition.Name"/> is the RawPath the driver was handed,
+///     which is exactly the wire reference the driver's <c>RawPath → def</c> resolver keys on. The driver
+///     builds that table by mapping each <see cref="RawTagEntry"/> the deploy artifact delivers through
+///     <see cref="FromTagConfig"/>; <see cref="ToTagConfig"/> is the inverse, used by authoring paths (the
+///     Client CLI) that hold a typed definition and need to synthesise the <c>TagConfig</c> blob for a
+///     <see cref="RawTagEntry"/>.
+/// </summary>
+/// <remarks>
+///     <b>Device routing is NOT read from the blob under v3.</b> The pre-v3 <c>deviceHostAddress</c> key is
+///     dropped: which device a tag lives under is carried on the <see cref="RawTagEntry.DeviceName"/> the
+///     deploy artifact populates (this driver is multi-device), threaded onto
+///     <see cref="TwinCATTagDefinition.DeviceHostAddress"/> by the driver at table-build time. The mapper
+///     therefore always produces a definition with an empty <see cref="TwinCATTagDefinition.DeviceHostAddress"/>.
+/// </remarks>
+public static class TwinCATTagDefinitionFactory
+{
+    /// <summary>
+    ///     Maps an authored <c>TagConfig</c> object to a typed definition keyed by <paramref name="rawPath"/>.
+    ///     The input is always an authored TagConfig JSON object (there is no name-vs-blob heuristic in v3).
+    ///     The <c>dataType</c> enum is read STRICTLY — a present-but-invalid (typo'd) value rejects the whole
+    ///     tag (returns <see langword="false"/> ⇒ the driver surfaces <c>BadNodeIdUnknown</c>) rather than
+    ///     silently defaulting to a wrong-width Good. <see cref="TwinCATTagDefinition.WriteIdempotent"/> is NOT
+    ///     read from the blob — it is a platform flag the caller threads in from the tag's
+    ///     <see cref="RawTagEntry.WriteIdempotent"/>; <see cref="TwinCATTagDefinition.DeviceHostAddress"/> is
+    ///     likewise threaded from the tag's <see cref="RawTagEntry.DeviceName"/> (multi-device routing), not
+    ///     the blob.
+    /// </summary>
+    /// <param name="tagConfig">The authored equipment-tag TagConfig JSON.</param>
+    /// <param name="rawPath">The tag's RawPath — becomes the definition's identity (<c>Name</c>).</param>
+    /// <param name="def">The mapped definition when this returns <see langword="true"/>.</param>
+    /// <returns><see langword="true"/> when <paramref name="tagConfig"/> is a valid TwinCAT symbol object.</returns>
+    public static bool FromTagConfig(string tagConfig, string rawPath, out TwinCATTagDefinition def)
+    {
+        def = null!;
+        if (string.IsNullOrWhiteSpace(tagConfig)) return false;
+        try
+        {
+            using var doc = JsonDocument.Parse(tagConfig);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("symbolPath", out var symbol)
+                || symbol.ValueKind != JsonValueKind.String)
+                return false;
+            var symbolPath = symbol.GetString();
+            if (string.IsNullOrWhiteSpace(symbolPath)) return false;
+            // Strict enum read (R2-11 Phase C): a typo'd dataType rejects the tag (→ BadNodeIdUnknown)
+            // instead of silently defaulting to a wrong-width Good.
+            if (!TagConfigJson.TryReadEnumStrict(root, "dataType", TwinCATDataType.DInt, out var dataType)) return false;
+            // Guard (Driver.TwinCAT-003): the driver does not support UDT/FB-instance tags — a
+            // Structure-typed tag would read as a garbage int blob or fail late on a write. Reject it
+            // here so it never materialises (→ BadNodeIdUnknown); declare atomic-typed members instead,
+            // or use EnableControllerBrowse to discover UDT members individually.
+            if (dataType == TwinCATDataType.Structure) return false;
+            // Array intent — same shape the runtime/OPC-UA foundation parses (camelCase
+            // `isArray` bool + `arrayLength` uint). arrayLength is honoured ONLY when isArray
+            // is true AND it is a positive JSON number, so a stale length behind a cleared
+            // isArray never produces an orphan array tag (Phase 4c).
+            var arrayLength = ReadArrayLength(root);
+            // "writable" defaults to true when absent (today's value) — makes read-only equipment tags
+            // authorable (UNDER-6).
+            var writable = TagConfigJson.ReadWritable(root);
+            def = new TwinCATTagDefinition(
+                Name: rawPath, DeviceHostAddress: "", SymbolPath: symbolPath!,
+                DataType: dataType, Writable: writable, WriteIdempotent: false, ArrayLength: arrayLength);
+            return true;
+        }
+        catch (JsonException) { return false; }
+        catch (FormatException) { return false; }
+        catch (InvalidOperationException) { return false; }
+    }
+
+    /// <summary>
+    ///     Inverse of <see cref="FromTagConfig"/>: serialises a typed definition back to the camelCase
+    ///     <c>TagConfig</c> JSON the mapper reads. Used by authoring paths (the Client CLI) that construct a
+    ///     <see cref="TwinCATTagDefinition"/> from operator flags and need the <c>TagConfig</c> string to hand
+    ///     the driver as a <see cref="RawTagEntry"/>. The <c>dataType</c> enum is written as its name string;
+    ///     the array keys are emitted only for an array tag so the blob stays minimal. Neither
+    ///     <c>WriteIdempotent</c> nor <c>DeviceHostAddress</c> is emitted — they travel on the
+    ///     <see cref="RawTagEntry"/> (<see cref="RawTagEntry.WriteIdempotent"/> /
+    ///     <see cref="RawTagEntry.DeviceName"/>), not inside the blob.
+    /// </summary>
+    /// <param name="def">The definition to serialise.</param>
+    /// <returns>The camelCase TagConfig JSON string.</returns>
+    public static string ToTagConfig(TwinCATTagDefinition def)
+    {
+        ArgumentNullException.ThrowIfNull(def);
+        var o = new JsonObject
+        {
+            ["symbolPath"] = def.SymbolPath,
+            ["dataType"] = def.DataType.ToString(),
+            ["writable"] = def.Writable,
+        };
+        if (def.ArrayLength is > 0)
+        {
+            o["isArray"] = true;
+            o["arrayLength"] = def.ArrayLength.Value;
+        }
+        return o.ToJsonString();
+    }
+
+    /// <summary>
+    ///     Deploy-time inspection (05/CONV-2): warns on a present-but-invalid <c>dataType</c> (silently
+    ///     defaulted by the lenient runtime) and on a structurally unparseable TagConfig. Empty when clean
+    ///     or not an equipment-tag object. Never throws.
+    /// </summary>
+    /// <param name="reference">The equipment tag's TagConfig JSON.</param>
+    /// <returns>The warnings; empty when clean.</returns>
+    public static IReadOnlyList<string> Inspect(string reference)
+    {
+        var warnings = new List<string>();
+        if (string.IsNullOrWhiteSpace(reference) || reference[0] != '{') return warnings;
+        try
+        {
+            using var doc = JsonDocument.Parse(reference);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                warnings.Add("TwinCAT TagConfig root is not a JSON object — the tag will not resolve (BadNodeIdUnknown).");
+                return warnings;
+            }
+            var w = TagConfigJson.DescribeInvalidEnum<TwinCATDataType>(root, "dataType");
+            if (w is not null) warnings.Add(w);
+        }
+        catch (JsonException)
+        {
+            warnings.Add("TwinCAT TagConfig is not valid JSON — the tag will not resolve (BadNodeIdUnknown).");
+        }
+        return warnings;
+    }
+
+    /// <summary>
+    ///     Reads the optional 1-D array length: <c>arrayLength</c> (a positive int32; values above
+    ///     <see cref="int.MaxValue"/> are treated as absent/scalar) honoured ONLY when <c>isArray</c>
+    ///     is the JSON literal <c>true</c>. Returns <c>null</c> (scalar) when isArray is absent/false,
+    ///     when arrayLength is absent / non-numeric / zero / negative / greater than
+    ///     <see cref="int.MaxValue"/>.
+    /// </summary>
+    private static int? ReadArrayLength(JsonElement o)
+    {
+        if (!o.TryGetProperty("isArray", out var aEl) || aEl.ValueKind != JsonValueKind.True)
+            return null;
+        if (!o.TryGetProperty("arrayLength", out var lEl) || lEl.ValueKind != JsonValueKind.Number)
+            return null;
+        return lEl.TryGetInt32(out var len) && len > 0 ? len : null;
+    }
+}
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs
index 1460d0dc..4acdbdf2 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs
@@ -24,8 +24,10 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
     // (TryGetValue) don't race — plain Dictionary is not safe for concurrent read+write.
     private readonly ConcurrentDictionary<string, DeviceState> _devices =
         new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, TwinCATTagDefinition> _tagsByName =
-        new(StringComparer.OrdinalIgnoreCase);
+    // v3: the authored RawPath → definition table. Keyed case-sensitive ordinal (the RawPath is
+    // the exact wire reference). Built in InitializeAsync from _options.RawTags via the pure mapper.
+    private readonly ConcurrentDictionary<string, TwinCATTagDefinition> _tagsByRawPath =
+        new(StringComparer.Ordinal);
 
     // Per-parent-word RMW gate for BOOL-within-word writes: a single-bit write is a
     // read-modify-write of the parent word (TwinCAT's symbol table doesn't expose "Word.N"),
@@ -35,9 +37,9 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
     private readonly ConcurrentDictionary<string, SemaphoreSlim> _bitRmwLocks =
         new(StringComparer.OrdinalIgnoreCase);
 
-    // Resolves a read/write/subscribe fullReference to a tag definition, bridging the two
-    // authoring models: an authored tag-table entry (by name) OR an equipment tag whose
-    // reference is its raw TagConfig JSON (parsed once via TwinCATEquipmentTagParser, cached).
+    // v3: resolves a read/write/subscribe fullReference (always a RawPath) to a tag definition by a
+    // single hit on the authored _tagsByRawPath table. A miss is a miss — the driver surfaces
+    // BadNodeIdUnknown (no blob-parse fallback).
     private readonly EquipmentTagRefResolver<TwinCATTagDefinition> _resolver;
 
     private DriverHealth _health = new(DriverState.Unknown, null, null);
@@ -64,8 +66,7 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
         _clientFactory = clientFactory ?? new AdsTwinCATClientFactory();
         _logger = logger ?? NullLogger<TwinCATDriver>.Instance;
         _resolver = new EquipmentTagRefResolver<TwinCATTagDefinition>(
-            r => _tagsByName.TryGetValue(r, out var t) ? t : null,
-            r => TwinCATEquipmentTagParser.TryParse(r, out var d) ? d : null);
+            r => _tagsByRawPath.TryGetValue(r, out var t) ? t : null);
         _poll = new PollGroupEngine(
             reader: ReadAsync,
             onChange: (handle, tagRef, snapshot) =>
@@ -108,7 +109,7 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
             if (!string.IsNullOrWhiteSpace(driverConfigJson))
             {
                 var parsed = TwinCATDriverFactoryExtensions.ParseOptions(driverConfigJson, _driverInstanceId);
-                if (parsed.Devices.Count > 0 || parsed.Tags.Count > 0)
+                if (parsed.Devices.Count > 0 || parsed.RawTags.Count > 0)
                     _options = parsed;
             }
 
@@ -119,7 +120,26 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
                         $"TwinCAT device has invalid HostAddress '{device.HostAddress}' — expected 'ads://{{netId}}:{{port}}'.");
                 _devices[device.HostAddress] = new DeviceState(addr, device);
             }
-            foreach (var tag in _options.Tags) _tagsByName[tag.Name] = tag;
+
+            // Build the RawPath → definition table from the authored raw tags. Each entry's TagConfig
+            // blob is mapped by the pure factory; the entry's WriteIdempotent flag AND its owning
+            // DeviceName are threaded onto the def (both live on the RawTagEntry, not inside the blob).
+            // DeviceName is resolved to the target's live host (def.DeviceHostAddress) via ResolveDeviceHost
+            // so the existing device routing (_devices keyed by HostAddress) is unchanged. A mapper miss is
+            // skipped (logged), never thrown — a bad tag must not fail the whole driver init.
+            foreach (var entry in _options.RawTags)
+            {
+                if (TwinCATTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def))
+                    _tagsByRawPath[entry.RawPath] = def with
+                    {
+                        WriteIdempotent = entry.WriteIdempotent,
+                        DeviceHostAddress = ResolveDeviceHost(entry.DeviceName),
+                    };
+                else
+                    _logger.LogWarning(
+                        "TwinCAT tag config did not map to a definition; skipping. Driver={DriverInstanceId} RawPath={RawPath}",
+                        _driverInstanceId, entry.RawPath);
+            }
 
             if (_options.Probe.Enabled)
             {
@@ -176,8 +196,8 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
             state.DisposeGate();
         }
         _devices.Clear();
-        _tagsByName.Clear();
-        _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
+        _tagsByRawPath.Clear();
+        _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
         // Dispose + clear the per-parent-word RMW gates so ReinitializeAsync cycles don't orphan
         // their SemaphoreSlim instances (each leaks a wait handle once contended).
         foreach (var sem in _bitRmwLocks.Values) sem.Dispose();
@@ -193,7 +213,7 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
     // footprint reflects live allocations only: ~256 bytes per pre-declared tag (tag-definition
     // record + dictionary overhead) and ~512 bytes per active native subscription.
     public long GetMemoryFootprint() =>
-        (_tagsByName.Count * 256L) + (_nativeSubs.Count * 512L);
+        (_tagsByRawPath.Count * 256L) + (_nativeSubs.Count * 512L);
 
     /// <inheritdoc />
     // No flushable cache exists in this driver — the symbol table is streamed fresh on every
@@ -394,8 +414,10 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
             var label = device.DeviceName ?? device.HostAddress;
             var deviceFolder = root.Folder(device.HostAddress, label);
 
-            // Pre-declared tags — always emitted as the authoritative config path.
-            var tagsForDevice = _options.Tags.Where(t =>
+            // Authored raw tags (mapped into the RawPath → def table at Initialize) — always emitted
+            // as the authoritative config path. The def's Name is the RawPath, used for both the browse
+            // name and the driver FullName; it is routed to this device by def.DeviceHostAddress.
+            var tagsForDevice = _tagsByRawPath.Values.Where(t =>
                 string.Equals(t.DeviceHostAddress, device.HostAddress, StringComparison.OrdinalIgnoreCase));
             foreach (var tag in tagsForDevice)
             {
@@ -747,6 +769,33 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
     /// </summary>
     public const string UnresolvedHostSentinel = "";
 
+    /// <summary>
+    ///     Resolve a <see cref="RawTagEntry.DeviceName"/> to the device's live host address
+    ///     (<see cref="TwinCATTagDefinition.DeviceHostAddress"/>) used to route reads/writes/subscriptions
+    ///     to the right connection. <b>TODO(v3 WaveC):</b> the live device host must come from the
+    ///     <c>Device</c> row's <c>DeviceConfig</c> (the deploy artifact will carry it); today we resolve
+    ///     the DeviceName against this driver's own <see cref="TwinCATDriverOptions.Devices"/> list —
+    ///     first by <see cref="TwinCATDeviceOptions.DeviceName"/>, then by
+    ///     <see cref="TwinCATDeviceOptions.HostAddress"/> (callers that route by host, e.g. the Client
+    ///     CLI, pass the host string as the DeviceName). An empty DeviceName routes to the sole device
+    ///     on a single-device instance; an unmatched name leaves the def unrouted (→ BadNodeIdUnknown).
+    /// </summary>
+    /// <param name="deviceName">The owning device's name (or host) from the raw-tag entry.</param>
+    /// <returns>The resolved device host address, or empty when unresolved.</returns>
+    private string ResolveDeviceHost(string deviceName)
+    {
+        var devices = _options.Devices;
+        if (string.IsNullOrEmpty(deviceName))
+            return devices.Count == 1 ? devices[0].HostAddress : "";
+        foreach (var d in devices)
+            if (string.Equals(d.DeviceName, deviceName, StringComparison.OrdinalIgnoreCase))
+                return d.HostAddress;
+        foreach (var d in devices)
+            if (string.Equals(d.HostAddress, deviceName, StringComparison.OrdinalIgnoreCase))
+                return d.HostAddress;
+        return "";
+    }
+
     /// <summary>
     ///     Resolve a reference to the device host that keys its per-host resilience
     ///     (bulkhead / circuit breaker). CONV-4: routes through
@@ -1054,8 +1103,8 @@ public sealed class TwinCATDriver : IDriver, IReadable, IWritable, ITagDiscovery
             state.DisposeGate();
         }
         _devices.Clear();
-        _tagsByName.Clear();
-        _resolver.Clear(); // drop transient equipment-tag parses so a config change re-parses
+        _tagsByRawPath.Clear();
+        _resolver.Clear(); // no-op in v3 (the resolver reads the live table by closure); kept for symmetry
         // Dispose + clear the per-parent-word RMW gates (mirrors ShutdownAsync) so the
         // SemaphoreSlim instances aren't orphaned on disposal.
         foreach (var sem in _bitRmwLocks.Values) sem.Dispose();
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriverFactoryExtensions.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriverFactoryExtensions.cs
index a628087e..a66a1595 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriverFactoryExtensions.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriverFactoryExtensions.cs
@@ -1,4 +1,5 @@
 using System.Text.Json;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
@@ -57,9 +58,11 @@ public static class TwinCATDriverFactoryExtensions
                         $"TwinCAT config for '{driverInstanceId}' has a device missing HostAddress"),
                     DeviceName: d.DeviceName))]
                 : [],
-            Tags = dto.Tags is { Count: > 0 }
-                ? [.. dto.Tags.Select(t => BuildTag(t, driverInstanceId))]
-                : [],
+            // v3: the deploy artifact (Wave C) populates rawTags with the cluster's authored raw TwinCAT
+            // tags (RawPath + TagConfig blob + WriteIdempotent + owning DeviceName). The driver maps each
+            // through TwinCATTagDefinitionFactory at Initialize; the legacy pre-declared DTO tag path
+            // (tags[] → BuildTag) is retired.
+            RawTags = dto.RawTags is { Count: > 0 } ? [.. dto.RawTags] : [],
             Probe = new TwinCATProbeOptions
             {
                 Enabled = dto.Probe?.Enabled ?? true,
@@ -85,43 +88,6 @@ public static class TwinCATDriverFactoryExtensions
     public static TwinCATDriverOptions ParseOptionsForTests(string driverConfigJson, string driverInstanceId)
         => ParseOptions(driverConfigJson, driverInstanceId);
 
-    private static TwinCATTagDefinition BuildTag(TwinCATTagDto t, string driverInstanceId)
-    {
-        var dataType = ParseEnum<TwinCATDataType>(t.DataType, t.Name, driverInstanceId, "DataType");
-
-        if (dataType == TwinCATDataType.Structure)
-            throw new InvalidOperationException(
-                $"TwinCAT tag '{t.Name ?? "<unnamed>"}' in '{driverInstanceId}' specifies " +
-                "DataType 'Structure'. The driver does not support UDT/FB-instance pre-declared tags. " +
-                "Use EnableControllerBrowse to discover UDT members individually, or declare " +
-                "individual atomic-typed tags for the fields you need.");
-
-        return new TwinCATTagDefinition(
-            Name: t.Name ?? throw new InvalidOperationException(
-                $"TwinCAT config for '{driverInstanceId}' has a tag missing Name"),
-            DeviceHostAddress: t.DeviceHostAddress ?? throw new InvalidOperationException(
-                $"TwinCAT tag '{t.Name}' in '{driverInstanceId}' missing DeviceHostAddress"),
-            SymbolPath: t.SymbolPath ?? throw new InvalidOperationException(
-                $"TwinCAT tag '{t.Name}' in '{driverInstanceId}' missing SymbolPath"),
-            DataType: dataType,
-            Writable: t.Writable ?? true,
-            WriteIdempotent: t.WriteIdempotent ?? false,
-            ArrayLength: t.ArrayLength is > 0 ? t.ArrayLength : null);
-    }
-
-    private static T ParseEnum<T>(string? raw, string? tagName, string driverInstanceId, string field)
-        where T : struct, Enum
-    {
-        if (string.IsNullOrWhiteSpace(raw))
-            throw new InvalidOperationException(
-                $"TwinCAT tag '{tagName ?? "<unnamed>"}' in '{driverInstanceId}' missing {field}");
-        return Enum.TryParse<T>(raw, ignoreCase: true, out var v)
-            ? v
-            : throw new InvalidOperationException(
-                $"TwinCAT tag '{tagName}' has unknown {field} '{raw}'. " +
-                $"Expected one of {string.Join(", ", Enum.GetNames<T>())}");
-    }
-
     private static readonly JsonSerializerOptions JsonOptions = new()
     {
         PropertyNameCaseInsensitive = true,
@@ -146,8 +112,10 @@ public static class TwinCATDriverFactoryExtensions
         /// <summary>Gets or sets the list of configured devices.</summary>
         public List<TwinCATDeviceDto>? Devices { get; init; }
 
-        /// <summary>Gets or sets the list of configured tags.</summary>
-        public List<TwinCATTagDto>? Tags { get; init; }
+        /// <summary>Gets or sets the authored raw tags (RawPath + TagConfig blob + WriteIdempotent +
+        /// owning DeviceName) the deploy artifact delivers. The driver maps each through the
+        /// tag-definition factory at Initialize; the legacy pre-declared <c>tags[]</c> path is retired.</summary>
+        public List<RawTagEntry>? RawTags { get; init; }
 
         /// <summary>Gets or sets the probe configuration.</summary>
         public TwinCATProbeDto? Probe { get; init; }
@@ -162,35 +130,6 @@ public static class TwinCATDriverFactoryExtensions
         public string? DeviceName { get; init; }
     }
 
-    internal sealed class TwinCATTagDto
-    {
-        /// <summary>Gets or sets the tag name.</summary>
-        public string? Name { get; init; }
-
-        /// <summary>Gets or sets the device host address.</summary>
-        public string? DeviceHostAddress { get; init; }
-
-        /// <summary>Gets or sets the symbol path.</summary>
-        public string? SymbolPath { get; init; }
-
-        /// <summary>Gets or sets the data type.</summary>
-        public string? DataType { get; init; }
-
-        /// <summary>Gets or sets a value indicating whether the tag is writable.</summary>
-        public bool? Writable { get; init; }
-
-        /// <summary>Gets or sets a value indicating whether writes are idempotent.</summary>
-        public bool? WriteIdempotent { get; init; }
-
-        /// <summary>
-        ///     Optional 1-D array element count. When positive, the tag is a 1-D array of this
-        ///     many <see cref="DataType"/> elements — drives <c>IsArray</c>/<c>ArrayDim</c> at
-        ///     discovery and a native ADS array read at runtime (Phase 4c).
-        ///     <c>null</c> or non-positive = scalar (the default).
-        /// </summary>
-        public int? ArrayLength { get; init; }
-    }
-
     internal sealed class TwinCATProbeDto
     {
         /// <summary>Gets or sets a value indicating whether probing is enabled.</summary>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterDrivers.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterDrivers.razor
index 2aa283c9..2f9afce2 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterDrivers.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterDrivers.razor
@@ -35,7 +35,6 @@ else
                         &middot; <span>@d.Name</span>
                         &middot; <span class="chip chip-idle ms-1">@d.DriverType</span>
                         @if (!d.Enabled) { <span class="chip chip-idle ms-1">Disabled</span> }
-                        <span class="text-muted small ms-2">ns=@d.NamespaceId</span>
                     </summary>
                     <div style="padding:0 1rem 1rem">
                         <div class="d-flex mb-2">
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterNamespaces.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterNamespaces.razor
index 3e9110ef..6cbf39a8 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterNamespaces.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterNamespaces.razor
@@ -1,81 +1,23 @@
 @page "/clusters/{ClusterId}/namespaces"
 @attribute [Authorize(Policy = AdminUiPolicies.AuthenticatedRead)]
 @rendermode RenderMode.InteractiveServer
-@using Microsoft.EntityFrameworkCore
-@using ZB.MOM.WW.OtOpcUa.Configuration
-@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
-@inject IDbContextFactory<OtOpcUaConfigDbContext> DbFactory
 
 <div class="d-flex justify-content-between align-items-center mb-3">
     <h4 class="mb-0">Namespaces &middot; <span class="mono">@ClusterId</span></h4>
-    <a href="/clusters/@ClusterId/namespaces/new" class="btn btn-primary btn-sm">New namespace</a>
 </div>
 
 <ClusterNav ClusterId="@ClusterId" ActiveTab="namespaces" />
 
-@if (_rows is null)
-{
-    <p>Loading…</p>
-}
-else
-{
-    <section class="panel notice rise" style="animation-delay:.02s">
-        Namespaces are content (decision #123) — they're served at the OPC UA endpoint and bound
-        to driver instances. NamespaceUri must be unique fleet-wide.
-    </section>
-
-    <section class="panel rise mt-3" style="animation-delay:.08s">
-        <div class="panel-head">@_rows.Count namespace@(_rows.Count == 1 ? "" : "s")</div>
-        @if (_rows.Count == 0)
-        {
-            <div style="padding:1rem" class="text-muted">No namespaces defined for this cluster.</div>
-        }
-        else
-        {
-            <div class="table-wrap">
-                <table class="data-table">
-                    <thead>
-                        <tr>
-                            <th>NamespaceId</th>
-                            <th>Kind</th>
-                            <th>URI</th>
-                            <th>Status</th>
-                            <th>Notes</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var n in _rows)
-                        {
-                            <tr>
-                                <td><span class="mono">@n.NamespaceId</span></td>
-                                <td>@n.Kind</td>
-                                <td><span class="mono small">@n.NamespaceUri</span></td>
-                                <td>
-                                    @if (n.Enabled) { <span class="chip chip-ok">Enabled</span> }
-                                    else { <span class="chip chip-idle">Disabled</span> }
-                                </td>
-                                <td class="text-muted small">@(n.Notes ?? "")</td>
-                                <td><a href="/clusters/@ClusterId/namespaces/@n.NamespaceId" class="btn btn-sm btn-outline-primary">Edit</a></td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-        }
-    </section>
-}
+<section class="panel notice rise" style="animation-delay:.02s">
+    <div class="panel-head">Namespaces are retired in v3</div>
+    <div style="padding:1rem">
+        The <code>Namespace</code> entity has been removed. The v3 Raw/UNS split replaces it —
+        raw driver folders and the unified namespace are managed on the <strong>/raw</strong> and
+        <strong>/uns</strong> pages, arriving in v3 Batch 2/3. This page is a placeholder so existing
+        links do not 404.
+    </div>
+</section>
 
 @code {
     [Parameter] public string ClusterId { get; set; } = "";
-    private List<Namespace>? _rows;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await using var db = await DbFactory.CreateDbContextAsync();
-        _rows = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
-    }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbCipDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbCipDriverPage.razor
index f5f108c0..cb379509 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbCipDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbCipDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -175,37 +175,13 @@ else
             </CollectionEditor>
 
             @* Tags *@
-            <CollectionEditor TRow="AbCipTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".14s"
-                              NewRow="@(() => new AbCipTagRow())" Clone="@(r => r.Clone())"
-                              Validate="AbCipTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Device</th><th>Tag path</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-                    <td class="mono">@t.TagPath</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Device host address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
-                                   placeholder="ab://gateway/1,0" /></div>
-                        <div class="col-md-6"><label class="form-label">Tag path</label>
-                            <input class="form-control form-control-sm mono" @bind="t.TagPath"
-                                   placeholder="e.g. Program:Main.SomeTag" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<AbCipDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -231,7 +207,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded;
     private bool _busy;
     private string? _error;
@@ -242,17 +217,12 @@ else
 
     private void OnAddressPicked(string address) => _pickedAddress = address;
 
-    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
+    // Held separately because Devices is a collection — edited via the CollectionEditor modal.
     private List<AbCipDeviceRow> _devices = [];
-    private List<AbCipTagRow> _tags = [];
 
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
 
         if (IsNew)
         {
@@ -261,7 +231,6 @@ else
                 DriverInstanceId = "",
                 Name = "",
                 DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                 Enabled = true,
             };
             _form = new FormModel();
@@ -277,7 +246,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new AbCipDriverOptions();
@@ -285,7 +253,6 @@ else
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
                 _devices = opts.Devices.Select(AbCipDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags.Select(AbCipTagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -298,8 +265,7 @@ else
         {
             var configJson = System.Text.Json.JsonSerializer.Serialize(
                 _form.ToOptions(
-                    _devices.Select(r => r.ToDefinition()).ToList(),
-                    _tags.Select(r => r.ToDefinition()).ToList()),
+                    _devices.Select(r => r.ToDefinition()).ToList()),
                 _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
@@ -313,7 +279,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -327,7 +292,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -373,8 +337,7 @@ else
     private string SerializeCurrentConfig()
         => System.Text.Json.JsonSerializer.Serialize(
             _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList()),
+                _devices.Select(r => r.ToDefinition()).ToList()),
             _jsonOpts);
 
     private static AbCipDriverOptions? TryDeserialize(string json)
@@ -423,53 +386,8 @@ else
         }
     }
 
-    // Mutable VM for the modal editor — AbCipTagDefinition is an immutable record.
-    public sealed class AbCipTagRow
-    {
-        public string Name { get; set; } = "";
-        public string DeviceHostAddress { get; set; } = "";
-        public string TagPath { get; set; } = "";
-        public AbCipDataType DataType { get; set; } = AbCipDataType.DInt;
-        public bool Writable { get; set; } = true;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent, Members, SafetyTag) across a load→save.
-        private AbCipTagDefinition? _source;
-
-        public AbCipTagRow Clone() => (AbCipTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static AbCipTagRow FromDefinition(AbCipTagDefinition d) => new()
-        {
-            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, TagPath = d.TagPath,
-            DataType = d.DataType, Writable = d.Writable,
-            _source = d,
-        };
-
-        public AbCipTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new AbCipTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), TagPath.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                DeviceHostAddress = DeviceHostAddress.Trim(),
-                TagPath = TagPath.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-            };
-        }
-
-        public static string? ValidateRow(AbCipTagRow row, IReadOnlyList<AbCipTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
-    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
+    // Collections (Devices) are kept on the component and passed in on ToOptions().
     public sealed class FormModel
     {
         // Operation
@@ -509,11 +427,9 @@ else
         };
 
         public AbCipDriverOptions ToOptions(
-            IReadOnlyList<AbCipDeviceOptions> devices,
-            IReadOnlyList<AbCipTagDefinition> tags) => new()
+            IReadOnlyList<AbCipDeviceOptions> devices) => new()
         {
             Devices = devices,
-            Tags = tags,
             Probe = new AbCipProbeOptions
             {
                 Enabled = ProbeEnabled,
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbLegacyDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbLegacyDriverPage.razor
index fd582119..1d833e51 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbLegacyDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/AbLegacyDriverPage.razor
@@ -37,7 +37,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -140,37 +140,13 @@ else
             </CollectionEditor>
 
             @* Tags *@
-            <CollectionEditor TRow="AbLegacyTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".12s"
-                              NewRow="@(() => new AbLegacyTagRow())" Clone="@(r => r.Clone())"
-                              Validate="AbLegacyTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Device</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-                    <td class="mono">@t.Address</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Device host address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
-                                   placeholder="10.0.0.10" /></div>
-                        <div class="col-md-6"><label class="form-label">Address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.Address"
-                                   placeholder="e.g. N7:0, F8:0, B3:0/0" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<AbLegacyDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -196,7 +172,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded;
     private bool _busy;
     private string? _error;
@@ -209,15 +184,10 @@ else
 
     // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
     private List<AbLegacyDeviceRow> _devices = [];
-    private List<AbLegacyTagRow> _tags = [];
 
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
 
         if (IsNew)
         {
@@ -226,7 +196,6 @@ else
                 DriverInstanceId = "",
                 Name = "",
                 DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                 Enabled = true,
             };
             _form = new FormModel();
@@ -242,7 +211,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new AbLegacyDriverOptions();
@@ -250,7 +218,6 @@ else
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
                 _devices = opts.Devices.Select(AbLegacyDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags.Select(AbLegacyTagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -263,8 +230,7 @@ else
         {
             var configJson = System.Text.Json.JsonSerializer.Serialize(
                 _form.ToOptions(
-                    _devices.Select(r => r.ToDefinition()).ToList(),
-                    _tags.Select(r => r.ToDefinition()).ToList()),
+                    _devices.Select(r => r.ToDefinition()).ToList()),
                 _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
@@ -278,7 +244,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -292,7 +257,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -338,8 +302,7 @@ else
     private string SerializeCurrentConfig()
         => System.Text.Json.JsonSerializer.Serialize(
             _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList()),
+                _devices.Select(r => r.ToDefinition()).ToList()),
             _jsonOpts);
 
     private static AbLegacyDriverOptions? TryDeserialize(string json)
@@ -388,51 +351,6 @@ else
         }
     }
 
-    // Mutable VM for the modal editor — AbLegacyTagDefinition is an immutable record.
-    public sealed class AbLegacyTagRow
-    {
-        public string Name { get; set; } = "";
-        public string DeviceHostAddress { get; set; } = "";
-        public string Address { get; set; } = "";
-        public AbLegacyDataType DataType { get; set; } = AbLegacyDataType.Int;
-        public bool Writable { get; set; } = true;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent) across a load→save.
-        private AbLegacyTagDefinition? _source;
-
-        public AbLegacyTagRow Clone() => (AbLegacyTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static AbLegacyTagRow FromDefinition(AbLegacyTagDefinition d) => new()
-        {
-            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, Address = d.Address,
-            DataType = d.DataType, Writable = d.Writable,
-            _source = d,
-        };
-
-        public AbLegacyTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new AbLegacyTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), Address.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                DeviceHostAddress = DeviceHostAddress.Trim(),
-                Address = Address.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-            };
-        }
-
-        public static string? ValidateRow(AbLegacyTagRow row, IReadOnlyList<AbLegacyTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
     // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
     public sealed class FormModel
@@ -464,11 +382,9 @@ else
         };
 
         public AbLegacyDriverOptions ToOptions(
-            IReadOnlyList<AbLegacyDeviceOptions> devices,
-            IReadOnlyList<AbLegacyTagDefinition> tags) => new()
+            IReadOnlyList<AbLegacyDeviceOptions> devices) => new()
         {
             Devices = devices,
-            Tags = tags,
             Probe = new AbLegacyProbeOptions
             {
                 Enabled = ProbeEnabled,
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/FocasDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/FocasDriverPage.razor
index 213a2904..db1fdfe5 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/FocasDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/FocasDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -218,37 +218,13 @@ else
             </CollectionEditor>
 
             @* Tags *@
-            <CollectionEditor TRow="FocasTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".23s"
-                              NewRow="@(() => new FocasTagRow())" Clone="@(r => r.Clone())"
-                              Validate="FocasTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Device</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-                    <td class="mono">@t.Address</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Device host address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
-                                   placeholder="192.168.0.10:8193" /></div>
-                        <div class="col-md-6"><label class="form-label">Address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.Address"
-                                   placeholder="e.g. X0.0, R100, PARAM:1815/0, MACRO:500" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<FocasDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -274,7 +250,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded, _busy;
     private string? _error;
 
@@ -286,18 +261,14 @@ else
 
     // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
     private List<FocasDeviceRow> _devices = [];
-    private List<FocasTagRow> _tags = [];
 
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId).ToListAsync();
 
         if (IsNew)
         {
-            _identityModel = new() { DriverType = DriverTypeKey, NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "", Enabled = true };
+            _identityModel = new() { DriverType = DriverTypeKey, Enabled = true };
             _form = FormModel.FromOptions(new FocasDriverOptions());
         }
         else
@@ -311,7 +282,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new FocasDriverOptions();
@@ -319,7 +289,6 @@ else
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
                 _devices = opts.Devices.Select(FocasDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags.Select(FocasTagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -331,8 +300,7 @@ else
         try
         {
             var opts = _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList());
+                _devices.Select(r => r.ToDefinition()).ToList());
             var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
@@ -345,7 +313,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -359,7 +326,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -405,8 +371,7 @@ else
     private string SerializeCurrentConfig()
         => System.Text.Json.JsonSerializer.Serialize(
             _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList()),
+                _devices.Select(r => r.ToDefinition()).ToList()),
             _jsonOpts);
 
     private static FocasDriverOptions? TryDeserialize(string json)
@@ -455,51 +420,6 @@ else
         }
     }
 
-    // Mutable VM for the modal editor — FocasTagDefinition is an immutable record.
-    public sealed class FocasTagRow
-    {
-        public string Name { get; set; } = "";
-        public string DeviceHostAddress { get; set; } = "";
-        public string Address { get; set; } = "";
-        public FocasDataType DataType { get; set; } = FocasDataType.Int32;
-        public bool Writable { get; set; } = true;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent) across a load→save.
-        private FocasTagDefinition? _source;
-
-        public FocasTagRow Clone() => (FocasTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static FocasTagRow FromDefinition(FocasTagDefinition d) => new()
-        {
-            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, Address = d.Address,
-            DataType = d.DataType, Writable = d.Writable,
-            _source = d,
-        };
-
-        public FocasTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new FocasTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), Address.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                DeviceHostAddress = DeviceHostAddress.Trim(),
-                Address = Address.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-            };
-        }
-
-        public static string? ValidateRow(FocasTagRow row, IReadOnlyList<FocasTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
     // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
     public sealed class FormModel
@@ -549,8 +469,7 @@ else
         };
 
         public FocasDriverOptions ToOptions(
-            IReadOnlyList<FocasDeviceOptions> devices,
-            IReadOnlyList<FocasTagDefinition> tags) => new()
+            IReadOnlyList<FocasDeviceOptions> devices) => new()
         {
             Timeout = TimeSpan.FromSeconds(TimeoutSeconds),
             Probe = new FocasProbeOptions
@@ -578,7 +497,6 @@ else
                 TimerPollInterval = TimeSpan.FromSeconds(FixedTreeTimerPollIntervalSeconds),
             },
             Devices = devices,
-            Tags = tags,
         };
     }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/GalaxyDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/GalaxyDriverPage.razor
index 3620f4da..12e8c060 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/GalaxyDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/GalaxyDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -224,7 +224,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded;
     private bool _busy;
     private string? _error;
@@ -238,10 +237,6 @@ else
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
 
         if (IsNew)
         {
@@ -250,7 +245,6 @@ else
                 DriverInstanceId = "",
                 Name = "",
                 DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                 Enabled = true,
             };
             _form = new FormModel();
@@ -266,7 +260,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? CreateDefaultOptions();
@@ -303,7 +296,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -317,7 +309,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/ModbusDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/ModbusDriverPage.razor
index 489ab9c9..a09e50f5 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/ModbusDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/ModbusDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -273,44 +273,13 @@ else
                 </div>
             </section>
 
-            <CollectionEditor TRow="ModbusTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              NewRow="@(() => new ModbusTagRow())" Clone="@(r => r.Clone())"
-                              Validate="ModbusTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Region</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td>@t.Region</td><td class="mono">@t.Address</td>
-                    <td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-3"><label class="form-label">Region</label>
-                            <select class="form-select form-select-sm" @bind="t.Region">
-                                @foreach (var e in Enum.GetValues<ModbusRegion>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><label class="form-label">Address</label>
-                            <input type="number" class="form-control form-control-sm" @bind="t.Address" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<ModbusDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><label class="form-label">Byte order</label>
-                            <select class="form-select form-select-sm" @bind="t.ByteOrder">
-                                @foreach (var e in Enum.GetValues<ModbusByteOrder>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-2"><label class="form-label">Bit index</label>
-                            <input type="number" class="form-control form-control-sm" @bind="t.BitIndex" /></div>
-                        <div class="col-md-2"><label class="form-label">String len</label>
-                            <input type="number" class="form-control form-control-sm" @bind="t.StringLength" /></div>
-                        <div class="col-md-2"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -336,7 +305,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded;
     private bool _busy;
     private string? _error;
@@ -347,16 +315,9 @@ else
 
     private void OnAddressPicked(string address) => _pickedAddress = address;
 
-    // Held separately because Tags is a collection — edited via the CollectionEditor modal.
-    private List<ModbusTagRow> _tags = [];
-
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
 
         if (IsNew)
         {
@@ -365,7 +326,6 @@ else
                 DriverInstanceId = "",
                 Name = "",
                 DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                 Enabled = true,
             };
             _form = new FormModel();
@@ -381,14 +341,12 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new ModbusDriverOptions();
                 _form = FormModel.FromOptions(opts);
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
-                _tags = opts.Tags.Select(ModbusTagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -399,7 +357,7 @@ else
         _busy = true; _error = null;
         try
         {
-            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
+            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(), _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
             {
@@ -412,7 +370,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -426,7 +383,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -470,7 +426,7 @@ else
     }
 
     private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(), _jsonOpts);
 
     private static ModbusDriverOptions? TryDeserialize(string json)
     {
@@ -478,60 +434,6 @@ else
         catch { return null; }
     }
 
-    // Mutable VM for the modal editor — ModbusTagDefinition is an immutable record.
-    public sealed class ModbusTagRow
-    {
-        public string Name { get; set; } = "";
-        public ModbusRegion Region { get; set; } = ModbusRegion.HoldingRegisters;
-        public int Address { get; set; }
-        public ModbusDataType DataType { get; set; } = ModbusDataType.Int16;
-        public bool Writable { get; set; } = true;
-        public ModbusByteOrder ByteOrder { get; set; } = ModbusByteOrder.BigEndian;
-        public int BitIndex { get; set; }
-        public int StringLength { get; set; }
-        public bool WriteIdempotent { get; set; }
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (StringByteOrder, ArrayCount, Deadband, UnitId, CoalesceProhibited) across a load→save.
-        private ModbusTagDefinition? _source;
-
-        public ModbusTagRow Clone() => (ModbusTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static ModbusTagRow FromDefinition(ModbusTagDefinition d) => new()
-        {
-            Name = d.Name, Region = d.Region, Address = d.Address, DataType = d.DataType,
-            Writable = d.Writable, ByteOrder = d.ByteOrder, BitIndex = d.BitIndex,
-            StringLength = d.StringLength, WriteIdempotent = d.WriteIdempotent,
-            _source = d,
-        };
-
-        public ModbusTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new ModbusTagDefinition(Name.Trim(), Region, 0, DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                Region = Region,
-                Address = (ushort)Math.Clamp(Address, 0, 65535),
-                DataType = DataType,
-                Writable = Writable,
-                ByteOrder = ByteOrder,
-                BitIndex = (byte)Math.Clamp(BitIndex, 0, 255),
-                StringLength = (ushort)Math.Clamp(StringLength, 0, 65535),
-                WriteIdempotent = WriteIdempotent,
-            };
-        }
-
-        public static string? ValidateRow(ModbusTagRow row, IReadOnlyList<ModbusTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalars exposed as settable properties so Blazor @bind-Value works.
     // Collection (Tags) is kept on the component (_tags) and passed in when building the final Options.
     public sealed class FormModel
@@ -623,13 +525,12 @@ else
             AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
         };
 
-        public ModbusDriverOptions ToOptions(IReadOnlyList<ModbusTagDefinition> tags) => new()
+        public ModbusDriverOptions ToOptions() => new()
         {
             Host = Host,
             Port = Port,
             UnitId = (byte)Math.Clamp(UnitId, 0, 255),
             Timeout = TimeSpan.FromSeconds(TimeoutSeconds),
-            Tags = tags,
             Probe = new ModbusProbeOptions
             {
                 Enabled = ProbeEnabled,
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/OpcUaClientDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/OpcUaClientDriverPage.razor
index 28d10777..ea632ae5 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/OpcUaClientDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/OpcUaClientDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -285,7 +285,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded;
     private bool _busy;
     private string? _error;
@@ -305,10 +304,6 @@ else
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId)
-            .ToListAsync();
 
         if (IsNew)
         {
@@ -317,7 +312,6 @@ else
                 DriverInstanceId = "",
                 Name = "",
                 DriverType = DriverTypeKey,
-                NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "",
                 Enabled = true,
             };
             _form = new FormModel();
@@ -333,7 +327,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new OpcUaClientDriverOptions();
@@ -366,7 +359,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -380,7 +372,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/S7DriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/S7DriverPage.razor
index 994e2c97..8aaad814 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/S7DriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/S7DriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -146,37 +146,13 @@ else
             </section>
 
             @* Tags *@
-            <CollectionEditor TRow="S7TagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".11s"
-                              NewRow="@(() => new S7TagRow())" Clone="@(r => r.Clone())"
-                              Validate="S7TagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.Address</td>
-                    <td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.Address"
-                                   placeholder="e.g. DB1.DBW0, M0.0, I0.0, QD4" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<S7DataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><label class="form-label">String length</label>
-                            <input type="number" class="form-control form-control-sm" @bind="t.StringLength" />
-                            <div class="form-text">Only for String type. Max 254.</div></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -202,7 +178,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded, _busy;
     private string? _error;
 
@@ -212,19 +187,13 @@ else
 
     private void OnAddressPicked(string address) => _pickedAddress = address;
 
-    // Held separately because Tags is a collection — edited via the CollectionEditor modal.
-    private List<S7TagRow> _tags = [];
-
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId).ToListAsync();
 
         if (IsNew)
         {
-            _identityModel = new() { DriverType = DriverTypeKey, NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "", Enabled = true };
+            _identityModel = new() { DriverType = DriverTypeKey, Enabled = true };
             _form = FormModel.FromOptions(new S7DriverOptions());
         }
         else
@@ -238,14 +207,12 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new S7DriverOptions();
                 _form = FormModel.FromOptions(opts);
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
-                _tags = opts.Tags.Select(S7TagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -256,7 +223,7 @@ else
         _busy = true; _error = null;
         try
         {
-            var opts = _form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList());
+            var opts = _form.ToOptions();
             var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
@@ -269,7 +236,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -283,7 +249,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -328,7 +293,7 @@ else
 
     private string SerializeCurrentConfig()
         => System.Text.Json.JsonSerializer.Serialize(
-            _form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
+            _form.ToOptions(), _jsonOpts);
 
     private static S7DriverOptions? TryDeserialize(string json)
     {
@@ -336,53 +301,7 @@ else
         catch { return null; }
     }
 
-    // Mutable VM for the modal editor — S7TagDefinition is an immutable record.
-    public sealed class S7TagRow
-    {
-        public string Name { get; set; } = "";
-        public string Address { get; set; } = "";
-        public S7DataType DataType { get; set; } = S7DataType.Int16;
-        public bool Writable { get; set; } = true;
-        public int StringLength { get; set; } = 254;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent) across a load→save.
-        private S7TagDefinition? _source;
-
-        public S7TagRow Clone() => (S7TagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static S7TagRow FromDefinition(S7TagDefinition d) => new()
-        {
-            Name = d.Name, Address = d.Address, DataType = d.DataType,
-            Writable = d.Writable, StringLength = d.StringLength,
-            _source = d,
-        };
-
-        public S7TagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new S7TagDefinition(Name.Trim(), Address.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                Address = Address.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-                StringLength = StringLength,
-            };
-        }
-
-        public static string? ValidateRow(S7TagRow row, IReadOnlyList<S7TagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
-    // Collection (Tags) is kept on the component (_tags) and passed in on ToOptions().
     public sealed class FormModel
     {
         // Connection
@@ -417,7 +336,7 @@ else
             AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
         };
 
-        public S7DriverOptions ToOptions(IReadOnlyList<S7TagDefinition> tags) => new()
+        public S7DriverOptions ToOptions() => new()
         {
             Host = Host,
             Port = Port,
@@ -432,7 +351,6 @@ else
                 Timeout = TimeSpan.FromSeconds(ProbeTimeoutSeconds),
             },
             ProbeTimeoutSeconds = AdminProbeTimeoutSeconds,
-            Tags = tags,
         };
     }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/TwinCATDriverPage.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/TwinCATDriverPage.razor
index d8d9bc82..a23fb466 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/TwinCATDriverPage.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/TwinCATDriverPage.razor
@@ -36,7 +36,7 @@ else
                          CancelHref="@($"/clusters/{ClusterId}/drivers")"
                          OnDelete="@(IsNew ? null : (EventCallback?)EventCallback.Factory.Create(this, DeleteAsync))">
 
-            <DriverIdentitySection Model="_identityModel" Namespaces="_namespaces" IsNew="IsNew" ShowDriverType="false" />
+            <DriverIdentitySection Model="_identityModel" IsNew="IsNew" ShowDriverType="false" />
 
             @if (!IsNew && !string.IsNullOrEmpty(DriverInstanceId))
             {
@@ -157,37 +157,13 @@ else
             </CollectionEditor>
 
             @* Tags *@
-            <CollectionEditor TRow="TwinCATTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                              AnimationDelay=".14s"
-                              NewRow="@(() => new TwinCATTagRow())" Clone="@(r => r.Clone())"
-                              Validate="TwinCATTagRow.ValidateRow">
-                <HeaderTemplate>
-                    <tr><th>Name</th><th>Device</th><th>Symbol path</th><th>Type</th><th>Writable</th><th></th></tr>
-                </HeaderTemplate>
-                <RowTemplate Context="t">
-                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-                    <td class="mono">@t.SymbolPath</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-                </RowTemplate>
-                <EditTemplate Context="t">
-                    <div class="row g-3">
-                        <div class="col-md-6"><label class="form-label">Name</label>
-                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
-                        <div class="col-md-6"><label class="form-label">Device host address</label>
-                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
-                                   placeholder="192.168.0.1.1.1:851" /></div>
-                        <div class="col-md-6"><label class="form-label">Symbol path</label>
-                            <input class="form-control form-control-sm mono" @bind="t.SymbolPath"
-                                   placeholder="e.g. MAIN.bStart, GVL.Counter" /></div>
-                        <div class="col-md-3"><label class="form-label">Data type</label>
-                            <select class="form-select form-select-sm" @bind="t.DataType">
-                                @foreach (var e in Enum.GetValues<TwinCATDataType>()) { <option value="@e">@e</option> }
-                            </select></div>
-                        <div class="col-md-3"><div class="form-check form-switch mt-4">
-                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
-                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
-                    </div>
-                </EditTemplate>
-            </CollectionEditor>
+            <section class="panel notice rise mt-3" style="animation-delay:.18s">
+                <div class="panel-head">Tags</div>
+                <div style="padding:1rem" class="text-muted">
+                    Tag authoring moves to the Raw tree (<strong>/raw</strong>) in v3 Batch 2.
+                    Pre-declared driver tags have been retired.
+                </div>
+            </section>
 
             <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
         </DriverFormShell>
@@ -213,7 +189,6 @@ else
     private FormModel _form = new();
     private DriverIdentitySection.DriverIdentityModel _identityModel = new() { DriverType = DriverTypeKey };
     private DriverInstance? _existing;
-    private List<Namespace> _namespaces = new();
     private bool _loaded, _busy;
     private string? _error;
 
@@ -223,20 +198,16 @@ else
 
     private void OnAddressPicked(string address) => _pickedAddress = address;
 
-    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
+    // Held separately because Devices is a collection — edited via the CollectionEditor modal.
     private List<TwinCATDeviceRow> _devices = [];
-    private List<TwinCATTagRow> _tags = [];
 
     protected override async Task OnInitializedAsync()
     {
         await using var db = await DbFactory.CreateDbContextAsync();
-        _namespaces = await db.Namespaces.AsNoTracking()
-            .Where(n => n.ClusterId == ClusterId)
-            .OrderBy(n => n.NamespaceId).ToListAsync();
 
         if (IsNew)
         {
-            _identityModel = new() { DriverType = DriverTypeKey, NamespaceId = _namespaces.FirstOrDefault()?.NamespaceId ?? "", Enabled = true };
+            _identityModel = new() { DriverType = DriverTypeKey, Enabled = true };
             _form = FormModel.FromOptions(new TwinCATDriverOptions());
         }
         else
@@ -250,7 +221,6 @@ else
                     DriverInstanceId = _existing.DriverInstanceId,
                     Name = _existing.Name,
                     DriverType = _existing.DriverType,
-                    NamespaceId = _existing.NamespaceId,
                     Enabled = _existing.Enabled,
                 };
                 var opts = TryDeserialize(_existing.DriverConfig) ?? new TwinCATDriverOptions();
@@ -258,7 +228,6 @@ else
                 _form.ResilienceConfig = _existing.ResilienceConfig;
                 _form.RowVersion = _existing.RowVersion;
                 _devices = opts.Devices.Select(TwinCATDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags.Select(TwinCATTagRow.FromDefinition).ToList();
             }
         }
         _loaded = true;
@@ -271,8 +240,7 @@ else
         {
             var configJson = System.Text.Json.JsonSerializer.Serialize(
                 _form.ToOptions(
-                    _devices.Select(r => r.ToDefinition()).ToList(),
-                    _tags.Select(r => r.ToDefinition()).ToList()),
+                    _devices.Select(r => r.ToDefinition()).ToList()),
                 _jsonOpts);
             await using var db = await DbFactory.CreateDbContextAsync();
             if (IsNew)
@@ -285,7 +253,6 @@ else
                 {
                     DriverInstanceId = _identityModel.DriverInstanceId,
                     ClusterId = ClusterId,
-                    NamespaceId = _identityModel.NamespaceId,
                     Name = _identityModel.Name,
                     DriverType = DriverTypeKey,
                     Enabled = _identityModel.Enabled,
@@ -299,7 +266,6 @@ else
                     d => d.ClusterId == ClusterId && d.DriverInstanceId == DriverInstanceId);
                 if (entity is null) { _error = "Row no longer exists."; return; }
                 db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.NamespaceId = _identityModel.NamespaceId;
                 entity.Name = _identityModel.Name;
                 entity.Enabled = _identityModel.Enabled;
                 entity.DriverConfig = configJson;
@@ -345,8 +311,7 @@ else
     private string SerializeCurrentConfig()
         => System.Text.Json.JsonSerializer.Serialize(
             _form.ToOptions(
-                _devices.Select(r => r.ToDefinition()).ToList(),
-                _tags.Select(r => r.ToDefinition()).ToList()),
+                _devices.Select(r => r.ToDefinition()).ToList()),
             _jsonOpts);
 
     private static TwinCATDriverOptions? TryDeserialize(string json)
@@ -393,53 +358,8 @@ else
         }
     }
 
-    // Mutable VM for the modal editor — TwinCATTagDefinition is an immutable record.
-    public sealed class TwinCATTagRow
-    {
-        public string Name { get; set; } = "";
-        public string DeviceHostAddress { get; set; } = "";
-        public string SymbolPath { get; set; } = "";
-        public TwinCATDataType DataType { get; set; } = TwinCATDataType.DInt;
-        public bool Writable { get; set; } = true;
-
-        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
-        // (WriteIdempotent) across a load→save.
-        private TwinCATTagDefinition? _source;
-
-        public TwinCATTagRow Clone() => (TwinCATTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
-
-        public static TwinCATTagRow FromDefinition(TwinCATTagDefinition d) => new()
-        {
-            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, SymbolPath = d.SymbolPath,
-            DataType = d.DataType, Writable = d.Writable,
-            _source = d,
-        };
-
-        public TwinCATTagDefinition ToDefinition()
-        {
-            var baseDef = _source ?? new TwinCATTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), SymbolPath.Trim(), DataType);
-            return baseDef with
-            {
-                Name = Name.Trim(),
-                DeviceHostAddress = DeviceHostAddress.Trim(),
-                SymbolPath = SymbolPath.Trim(),
-                DataType = DataType,
-                Writable = Writable,
-            };
-        }
-
-        public static string? ValidateRow(TwinCATTagRow row, IReadOnlyList<TwinCATTagRow> all, int? editIndex)
-        {
-            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
-            for (var i = 0; i < all.Count; i++)
-                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
-                    return $"Duplicate tag name '{row.Name}'.";
-            return null;
-        }
-    }
-
     // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
-    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
+    // The Devices collection is kept on the component and passed in on ToOptions().
     public sealed class FormModel
     {
         // Options
@@ -471,8 +391,7 @@ else
         };
 
         public TwinCATDriverOptions ToOptions(
-            IReadOnlyList<TwinCATDeviceOptions> devices,
-            IReadOnlyList<TwinCATTagDefinition> tags) => new()
+            IReadOnlyList<TwinCATDeviceOptions> devices) => new()
         {
             Timeout = TimeSpan.FromSeconds(TimeoutSeconds),
             UseNativeNotifications = UseNativeNotifications,
@@ -486,7 +405,6 @@ else
             },
             ProbeTimeoutSeconds = AdminProbeTimeoutSeconds,
             Devices = devices,
-            Tags = tags,
         };
     }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/NamespaceEdit.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/NamespaceEdit.razor
index 5193e508..3649e207 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/NamespaceEdit.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/NamespaceEdit.razor
@@ -1,243 +1,25 @@
 @page "/clusters/{ClusterId}/namespaces/new"
 @page "/clusters/{ClusterId}/namespaces/{NamespaceId}"
-@* Live-edit form pattern — one page handles both create (NamespaceId is null) and update.
-   RowVersion is preserved across post-back so EF Core enforces last-write-wins; concurrency
-   conflicts surface as a toast and reload the current row. *@
 @attribute [Authorize(Policy = AdminUiPolicies.ConfigEditor)]
 @rendermode RenderMode.InteractiveServer
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.EntityFrameworkCore
-@using System.ComponentModel.DataAnnotations
-@using ZB.MOM.WW.OtOpcUa.Configuration
-@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
-@using ZB.MOM.WW.OtOpcUa.Configuration.Enums
-@inject IDbContextFactory<OtOpcUaConfigDbContext> DbFactory
-@inject NavigationManager Nav
 
 <div class="d-flex justify-content-between align-items-center mb-3">
-    <h4 class="mb-0">@(IsNew ? "New namespace" : "Edit namespace") &middot; <span class="mono">@ClusterId</span></h4>
-    <a href="/clusters/@ClusterId/namespaces" class="btn btn-outline-secondary btn-sm">Cancel</a>
+    <h4 class="mb-0">Namespaces &middot; <span class="mono">@ClusterId</span></h4>
+    <a href="/clusters/@ClusterId/namespaces" class="btn btn-outline-secondary btn-sm">Back</a>
 </div>
 
 <ClusterNav ClusterId="@ClusterId" ActiveTab="namespaces" />
 
-@if (!_loaded)
-{
-    <p>Loading…</p>
-}
-else if (!IsNew && _existing is null)
-{
-    <section class="panel notice rise" style="animation-delay:.02s">
-        Namespace <span class="mono">@NamespaceId</span> was not found in cluster <span class="mono">@ClusterId</span>.
-    </section>
-}
-else
-{
-    <EditForm Model="_form" OnValidSubmit="SubmitAsync" FormName="namespaceEdit">
-        <DataAnnotationsValidator />
-        <section class="panel rise" style="animation-delay:.02s">
-            <div class="panel-head">@(IsNew ? "Identity" : $"Edit {_form.NamespaceId}")</div>
-            <div style="padding:1rem">
-                <div class="mb-3">
-                    <label class="form-label" for="nsId">NamespaceId</label>
-                    <InputText id="nsId" @bind-Value="_form.NamespaceId" disabled="@(!IsNew)"
-                               class="form-control form-control-sm mono"
-                               placeholder="LINE3-equipment" />
-                </div>
-                <div class="row">
-                    <div class="col-md-6 mb-3">
-                        <label class="form-label" for="kind">Kind</label>
-                        <InputSelect id="kind" @bind-Value="_form.Kind" class="form-select form-select-sm">
-                            <option value="@NamespaceKind.Equipment">Equipment (raw signals)</option>
-                            <option value="@NamespaceKind.Simulated">Simulated (replay — reserved)</option>
-                        </InputSelect>
-                    </div>
-                    <div class="col-md-6 mb-3">
-                        <label class="form-label" for="enabled">Enabled</label>
-                        <div class="form-check form-switch">
-                            <InputCheckbox id="enabled" @bind-Value="_form.Enabled" class="form-check-input" />
-                            <label class="form-check-label" for="enabled">Active in deployments</label>
-                        </div>
-                    </div>
-                </div>
-                <div class="mb-3">
-                    <label class="form-label" for="uri">NamespaceUri</label>
-                    <InputText id="uri" @bind-Value="_form.NamespaceUri" class="form-control form-control-sm mono"
-                               placeholder="urn:zb:warsaw-west:equipment" />
-                    <div class="form-text">Must be unique fleet-wide. Clients pin discovery here.</div>
-                </div>
-                <div class="mb-3">
-                    <label class="form-label" for="notes">Notes</label>
-                    <InputTextArea id="notes" @bind-Value="_form.Notes" class="form-control form-control-sm" rows="3" />
-                </div>
-            </div>
-        </section>
-
-        @if (!string.IsNullOrWhiteSpace(_error))
-        {
-            <div class="panel notice mt-3" style="border-color:var(--alert)">@_error</div>
-        }
-
-        <div class="mt-3 d-flex gap-2">
-            <button type="submit" class="btn btn-primary" disabled="@_busy">
-                @if (_busy) { <span class="spinner-border spinner-border-sm me-1"></span> }
-                @(IsNew ? "Create" : "Save changes")
-            </button>
-            <a href="/clusters/@ClusterId/namespaces" class="btn btn-outline-secondary">Cancel</a>
-            @if (!IsNew)
-            {
-                <button type="button" class="btn btn-outline-danger ms-auto" @onclick="DeleteAsync" disabled="@_busy">
-                    Delete
-                </button>
-            }
-        </div>
-    </EditForm>
-}
+<section class="panel notice rise" style="animation-delay:.02s">
+    <div class="panel-head">Namespaces are retired in v3</div>
+    <div style="padding:1rem">
+        The <code>Namespace</code> entity has been removed. The v3 Raw/UNS split replaces it —
+        raw driver folders and the unified namespace are managed on the <strong>/raw</strong> and
+        <strong>/uns</strong> pages, arriving in v3 Batch 2/3. This editor no longer applies.
+    </div>
+</section>
 
 @code {
     [Parameter] public string ClusterId { get; set; } = "";
     [Parameter] public string? NamespaceId { get; set; }
-
-    private bool IsNew => string.IsNullOrEmpty(NamespaceId);
-
-    private FormModel _form = new();
-    private Namespace? _existing;
-    private bool _loaded;
-    private bool _busy;
-    private string? _error;
-
-    protected override async Task OnInitializedAsync()
-    {
-        if (IsNew)
-        {
-            _form = new FormModel
-            {
-                NamespaceId = "",
-                Kind = NamespaceKind.Equipment,
-                NamespaceUri = "",
-                Enabled = true,
-            };
-        }
-        else
-        {
-            await using var db = await DbFactory.CreateDbContextAsync();
-            _existing = await db.Namespaces.AsNoTracking()
-                .FirstOrDefaultAsync(n => n.ClusterId == ClusterId && n.NamespaceId == NamespaceId);
-            if (_existing is not null)
-            {
-                _form = new FormModel
-                {
-                    NamespaceId = _existing.NamespaceId,
-                    Kind = _existing.Kind,
-                    NamespaceUri = _existing.NamespaceUri,
-                    Enabled = _existing.Enabled,
-                    Notes = _existing.Notes,
-                    RowVersion = _existing.RowVersion,
-                };
-            }
-        }
-        _loaded = true;
-    }
-
-    private async Task SubmitAsync()
-    {
-        _busy = true;
-        _error = null;
-        try
-        {
-            await using var db = await DbFactory.CreateDbContextAsync();
-            if (IsNew)
-            {
-                if (await db.Namespaces.AnyAsync(n => n.NamespaceId == _form.NamespaceId))
-                {
-                    _error = $"Namespace '{_form.NamespaceId}' already exists.";
-                    return;
-                }
-                db.Namespaces.Add(new Namespace
-                {
-                    NamespaceId = _form.NamespaceId,
-                    ClusterId = ClusterId,
-                    Kind = _form.Kind,
-                    NamespaceUri = _form.NamespaceUri,
-                    Enabled = _form.Enabled,
-                    Notes = string.IsNullOrWhiteSpace(_form.Notes) ? null : _form.Notes,
-                });
-            }
-            else
-            {
-                var entity = await db.Namespaces.FirstOrDefaultAsync(
-                    n => n.ClusterId == ClusterId && n.NamespaceId == NamespaceId);
-                if (entity is null)
-                {
-                    _error = "Row no longer exists.";
-                    return;
-                }
-                db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-                entity.Kind = _form.Kind;
-                entity.NamespaceUri = _form.NamespaceUri;
-                entity.Enabled = _form.Enabled;
-                entity.Notes = string.IsNullOrWhiteSpace(_form.Notes) ? null : _form.Notes;
-            }
-            await db.SaveChangesAsync();
-            Nav.NavigateTo($"/clusters/{ClusterId}/namespaces");
-        }
-        catch (DbUpdateConcurrencyException)
-        {
-            _error = "Another user changed this namespace while you were editing. Reload to see the latest values, then re-apply your changes.";
-        }
-        catch (Exception ex)
-        {
-            _error = ex.Message;
-        }
-        finally
-        {
-            _busy = false;
-        }
-    }
-
-    private async Task DeleteAsync()
-    {
-        if (IsNew) return;
-        _busy = true;
-        _error = null;
-        try
-        {
-            await using var db = await DbFactory.CreateDbContextAsync();
-            var entity = await db.Namespaces.FirstOrDefaultAsync(
-                n => n.ClusterId == ClusterId && n.NamespaceId == NamespaceId);
-            if (entity is null)
-            {
-                Nav.NavigateTo($"/clusters/{ClusterId}/namespaces");
-                return;
-            }
-            db.Entry(entity).Property(e => e.RowVersion).OriginalValue = _form.RowVersion;
-            db.Namespaces.Remove(entity);
-            await db.SaveChangesAsync();
-            Nav.NavigateTo($"/clusters/{ClusterId}/namespaces");
-        }
-        catch (DbUpdateConcurrencyException)
-        {
-            _error = "Another user changed this namespace while you were viewing it. Reload before deleting.";
-        }
-        catch (Exception ex)
-        {
-            _error = ex.Message;
-        }
-        finally
-        {
-            _busy = false;
-        }
-    }
-
-    private sealed class FormModel
-    {
-        [Required, RegularExpression("^[A-Za-z0-9_-]+$", ErrorMessage = "Use letters, digits, dash, underscore.")]
-        public string NamespaceId { get; set; } = "";
-        public NamespaceKind Kind { get; set; } = NamespaceKind.Equipment;
-        [Required, RegularExpression("^urn:[A-Za-z0-9_:./-]+$", ErrorMessage = "Use a URN, e.g. urn:zb:warsaw-west:equipment.")]
-        public string NamespaceUri { get; set; } = "";
-        public bool Enabled { get; set; } = true;
-        public string? Notes { get; set; }
-        public byte[] RowVersion { get; set; } = [];
-    }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverIdentitySection.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverIdentitySection.razor
index 5b3a9039..5bf707fc 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverIdentitySection.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverIdentitySection.razor
@@ -40,16 +40,6 @@
                     <div class="form-text">Cannot be changed after creation — drives the actor type that owns this instance.</div>
                 </div>
             }
-            <div class="col-md-6 mb-3">
-                <label class="form-label" for="ns">Namespace</label>
-                <InputSelect id="ns" @bind-Value="Model.NamespaceId" class="form-select form-select-sm">
-                    @foreach (var ns in Namespaces)
-                    {
-                        <option value="@ns.NamespaceId">@ns.NamespaceId (@ns.Kind)</option>
-                    }
-                </InputSelect>
-                <ValidationMessage For="@(() => Model.NamespaceId)" />
-            </div>
         </div>
         <div class="mb-3">
             <label class="form-label" for="enabled">Enabled</label>
@@ -63,7 +53,6 @@
 
 @code {
     [Parameter, EditorRequired] public DriverIdentityModel Model { get; set; } = new();
-    [Parameter, EditorRequired] public IReadOnlyList<Namespace> Namespaces { get; set; } = [];
     [Parameter] public bool IsNew { get; set; }
     [Parameter] public bool ShowDriverType { get; set; }
 
@@ -73,7 +62,6 @@
         public string DriverInstanceId { get; set; } = "";
         [Required] public string Name { get; set; } = "";
         [Required] public string DriverType { get; set; } = "Modbus";
-        [Required] public string NamespaceId { get; set; } = "";
         public bool Enabled { get; set; } = true;
     }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor
index ef4c9d34..c8b378c7 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Uns/TagEditors/OpcUaClientTagConfigEditor.razor
@@ -1,10 +1,10 @@
 @using ZB.MOM.WW.OtOpcUa.AdminUI.Uns.TagEditors
 
 <div class="row g-2">
-    <div class="col-md-12"><label class="form-label">Upstream node reference (FullName)</label>
-        <input type="text" class="form-control form-control-sm mono" value="@_m.FullName"
+    <div class="col-md-12"><label class="form-label">Upstream node reference (NodeId)</label>
+        <input type="text" class="form-control form-control-sm mono" value="@_m.NodeId"
                placeholder="nsu=urn:server:ns;s=Line3.Temp"
-               @onchange="@(e => Update(() => _m.FullName = e.Value?.ToString() ?? string.Empty))" />
+               @onchange="@(e => Update(() => _m.NodeId = e.Value?.ToString() ?? string.Empty))" />
         <div class="form-text">The remote OPC UA NodeId the driver reads/writes/subscribes against. Use the browse picker on the driver page to find it.</div></div>
 </div>
 
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/ScriptAnalysis/IScriptTagCatalog.cs b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/ScriptAnalysis/IScriptTagCatalog.cs
index 8e8eea22..e6f03fd9 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/ScriptAnalysis/IScriptTagCatalog.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/ScriptAnalysis/IScriptTagCatalog.cs
@@ -140,12 +140,13 @@ public sealed class ScriptTagCatalog(IDbContextFactory<OtOpcUaConfigDbContext> d
     {
         await using var db = await dbFactory.CreateDbContextAsync(ct);
 
-        // Only the resolvable keys are projected, so no UNS join is needed: the equipment-tag key is
-        // the FullName from TagConfig, the FolderPath-scoped tag key is FolderPath/Name, and the
-        // virtual-tag key is its own Name. Pull just those columns, untracked.
+        // v3: Tag is Raw-only — EquipmentId / FolderPath / DriverInstanceId were retired (the
+        // equipment↔Tag + driver bindings are gone). The resolvable key is the driver FullName carried
+        // in TagConfig; project only the surviving columns. (The Raw/UNS tag catalog is rebuilt in
+        // Batch 2/3.)
         var tagRows = await db.Tags
             .AsNoTracking()
-            .Select(t => new { t.EquipmentId, t.Name, t.FolderPath, t.DataType, t.DriverInstanceId, t.TagConfig })
+            .Select(t => new { t.Name, t.DataType, t.TagConfig })
             .ToListAsync(ct);
 
         var vtagRows = await db.VirtualTags
@@ -157,13 +158,10 @@ public sealed class ScriptTagCatalog(IDbContextFactory<OtOpcUaConfigDbContext> d
 
         foreach (var t in tagRows)
         {
-            var path = t.EquipmentId is null
-                // FolderPath-scoped tag (EquipmentId null) — subscribes by the MXAccess dot-ref, which
-                // is "FolderPath.Name" when a folder is set, else just "Name".
-                ? (string.IsNullOrWhiteSpace(t.FolderPath) ? t.Name : $"{t.FolderPath}.{t.Name}")
-                // Equipment driver tag — the runtime GetTag key is the driver FullName from TagConfig.
-                : ExtractFullNameFromTagConfig(t.TagConfig);
-            entries.Add(new ScriptTagInfo(path, "Tag", t.DataType, t.DriverInstanceId));
+            // The runtime GetTag key is the driver FullName from TagConfig; fall back to Name if absent.
+            var full = ExtractFullNameFromTagConfig(t.TagConfig);
+            var path = string.IsNullOrWhiteSpace(full) ? t.Name : full;
+            entries.Add(new ScriptTagInfo(path, "Tag", t.DataType, null));
         }
 
         foreach (var v in vtagRows)
@@ -185,7 +183,10 @@ public sealed class ScriptTagCatalog(IDbContextFactory<OtOpcUaConfigDbContext> d
     /// </summary>
     private static string ExtractFullNameFromTagConfig(string tagConfig)
     {
-        if (string.IsNullOrWhiteSpace(tagConfig)) return tagConfig;
+        // Best-effort: pull the driver FullName out of the TagConfig JSON blob if present.
+        // Returns "" when absent/unparseable so the caller falls back to the tag Name — never
+        // the raw blob (which would surface as a garbage completion path).
+        if (string.IsNullOrWhiteSpace(tagConfig)) return "";
         try
         {
             using var doc = System.Text.Json.JsonDocument.Parse(tagConfig);
@@ -193,10 +194,10 @@ public sealed class ScriptTagCatalog(IDbContextFactory<OtOpcUaConfigDbContext> d
                 && doc.RootElement.TryGetProperty("FullName", out var fullName)
                 && fullName.ValueKind == System.Text.Json.JsonValueKind.String)
             {
-                return fullName.GetString() ?? tagConfig;
+                return fullName.GetString() ?? "";
             }
         }
-        catch (System.Text.Json.JsonException) { /* fall through to raw blob */ }
-        return tagConfig;
+        catch (System.Text.Json.JsonException) { /* fall through to tag Name */ }
+        return "";
     }
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/TagEditors/OpcUaClientTagConfigModel.cs b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/TagEditors/OpcUaClientTagConfigModel.cs
index 86deb8ee..f3925231 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/TagEditors/OpcUaClientTagConfigModel.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/TagEditors/OpcUaClientTagConfigModel.cs
@@ -3,21 +3,24 @@ using System.Text.Json.Nodes;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Uns.TagEditors;
 
 /// <summary>Typed working model for an OPC UA Client (gateway) equipment tag's TagConfig JSON. The tag
-/// is bound to the upstream OPC UA server node by its full reference (<c>FullName</c> — the persisted
+/// is bound to the upstream OPC UA server node by its full reference (<c>nodeId</c> — the persisted
 /// stable <c>nsu=…;s=…</c> or plain <c>ns=2;s=…</c> NodeId the driver reads/writes/subscribes against).
 /// Preserves unrecognised JSON keys across a load→save.</summary>
 /// <remarks>
-///     The <c>FullName</c> key is intentionally PascalCase: the shared deploy-time parser
-///     (<c>Commons.Types.TagConfigIntent.Parse</c>, consumed by the composer, artifact decoder, draft
-///     gate, and node walker) reads it via a case-sensitive <c>TryGetProperty("FullName", …)</c>, so the editor MUST persist that exact
-///     casing. The driver-agnostic server-side HistoryRead intent keys (<c>isHistorized</c> /
+///     Under the v3 identity contract, <c>TagConfig</c> no longer carries identity — the upstream
+///     node reference is an ordinary driver-specific address field. The key is the camelCase
+///     <c>nodeId</c> (replacing the legacy PascalCase <c>FullName</c> identity convention). The
+///     driver-agnostic server-side HistoryRead intent keys (<c>isHistorized</c> /
 ///     <c>historianTagname</c>) are NOT modelled here — they are owned by the TagModal-merge seam
 ///     (<see cref="TagHistorizeConfig"/>) and survive a load→save of this model as preserved unknown keys.
 /// </remarks>
 public sealed class OpcUaClientTagConfigModel
 {
+    /// <summary>The camelCase TagConfig JSON key holding the upstream node reference.</summary>
+    internal const string NodeIdKey = "nodeId";
+
     /// <summary>Upstream OPC UA node reference the tag binds to (the driver-side full reference). Required.</summary>
-    public string FullName { get; set; } = "";
+    public string NodeId { get; set; } = "";
 
     private JsonObject _bag = new();
 
@@ -30,24 +33,24 @@ public sealed class OpcUaClientTagConfigModel
         var o = TagConfigJson.ParseOrNew(json);
         return new OpcUaClientTagConfigModel
         {
-            FullName = TagConfigJson.GetString(o, "FullName") ?? "",
+            NodeId = TagConfigJson.GetString(o, NodeIdKey) ?? "",
             _bag = o,
         };
     }
 
     /// <summary>Serialises this model back to a TagConfig JSON string over the preserved key bag.
-    /// <c>FullName</c> is written PascalCase (the composer/walker contract key); any history keys merged
-    /// by the TagModal (<c>isHistorized</c> / <c>historianTagname</c>) are carried through untouched as
-    /// preserved unknown keys.</summary>
+    /// <c>nodeId</c> is written camelCase (the v3 address key); any history keys merged by the TagModal
+    /// (<c>isHistorized</c> / <c>historianTagname</c>) are carried through untouched as preserved unknown
+    /// keys.</summary>
     /// <returns>The serialised TagConfig JSON string.</returns>
     public string ToJson()
     {
-        TagConfigJson.Set(_bag, "FullName", FullName.Trim());
+        TagConfigJson.Set(_bag, NodeIdKey, NodeId.Trim());
         return TagConfigJson.Serialize(_bag);
     }
 
     /// <summary>Validation hook; returns an error message or null when the model is valid.</summary>
     /// <returns>An error message describing the validation failure, or <c>null</c> when valid.</returns>
     public string? Validate()
-        => string.IsNullOrWhiteSpace(FullName) ? "An upstream node reference (FullName) is required." : null;
+        => string.IsNullOrWhiteSpace(NodeId) ? "An upstream node reference (nodeId) is required." : null;
 }
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
index 1150a9b0..0a12e7ce 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
@@ -51,14 +51,10 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             })
             .ToListAsync(ct);
 
-        // Per-equipment driver-tag counts (tags with no equipment are excluded).
-        var tagCounts = (await db.Tags
-                .AsNoTracking()
-                .Where(t => t.EquipmentId != null)
-                .GroupBy(t => t.EquipmentId)
-                .Select(g => new { EquipmentId = g.Key!, Count = g.Count() })
-                .ToListAsync(ct))
-            .ToDictionary(x => x.EquipmentId, x => x.Count, StringComparer.Ordinal);
+        // Per-equipment driver-tag counts: the equipment↔Tag binding was retired in v3
+        // (Tag is now Raw-only; authoring moved to the Raw tree in Batch 2/3). No binding
+        // exists to count against, so every equipment reports zero driver tags.
+        var tagCounts = new Dictionary<string, int>(StringComparer.Ordinal);
 
         // Per-equipment virtual-tag counts (virtual tags with no equipment are excluded).
         var vtagCounts = (await db.VirtualTags
@@ -83,14 +79,11 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
     }
 
     /// <inheritdoc />
-    public async Task<IReadOnlyList<EquipmentTagRow>> LoadTagsForEquipmentAsync(string equipmentId, CancellationToken ct = default)
+    public Task<IReadOnlyList<EquipmentTagRow>> LoadTagsForEquipmentAsync(string equipmentId, CancellationToken ct = default)
     {
-        await using var db = await dbFactory.CreateDbContextAsync(ct);
-        return await db.Tags.AsNoTracking()
-            .Where(t => t.EquipmentId == equipmentId)
-            .OrderBy(t => t.Name)
-            .Select(t => new EquipmentTagRow(t.TagId, t.Name, t.DriverInstanceId, t.DataType, t.AccessLevel))
-            .ToListAsync(ct);
+        // The equipment↔Tag binding was retired in v3 (Tag is now Raw-only; authoring moved to
+        // the Raw tree in Batch 2/3). No equipment-bound tags exist to list.
+        return Task.FromResult<IReadOnlyList<EquipmentTagRow>>(Array.Empty<EquipmentTagRow>());
     }
 
     /// <inheritdoc />
@@ -141,7 +134,8 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
                 e.Name,
                 e.MachineCode,
                 e.UnsLineId,
-                e.DriverInstanceId,
+                // Equipment↔driver binding retired in v3 — no DriverInstanceId column remains.
+                null,
                 e.ZTag,
                 e.SAPID,
                 e.Manufacturer,
@@ -168,9 +162,10 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             .Where(t => t.TagId == tagId)
             .Select(t => new TagEditDto(
                 t.TagId,
-                t.EquipmentId!,
+                // Tag is Raw-only in v3 — equipment binding + driver binding retired.
+                string.Empty,
                 t.Name,
-                t.DriverInstanceId,
+                string.Empty,
                 t.DataType,
                 t.AccessLevel,
                 t.WriteIdempotent,
@@ -293,37 +288,8 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
 
         db.Entry(entity).Property(e => e.RowVersion).OriginalValue = rowVersion;
 
-        // A cluster move must not orphan driver-bound equipment from its driver's
-        // cluster. Any equipment under this area that is bound to a driver in a different cluster
-        // than the target blocks the move.
-        if (newClusterId != entity.ClusterId)
-        {
-            var lineIds = await db.UnsLines
-                .Where(l => l.UnsAreaId == unsAreaId)
-                .Select(l => l.UnsLineId)
-                .ToListAsync(ct);
-
-            var boundEquipment = await db.Equipment
-                .Where(eq => lineIds.Contains(eq.UnsLineId) && eq.DriverInstanceId != null)
-                .Select(eq => new { eq.EquipmentId, eq.DriverInstanceId })
-                .ToListAsync(ct);
-
-            foreach (var eq in boundEquipment)
-            {
-                var driverCluster = await db.DriverInstances
-                    .Where(d => d.DriverInstanceId == eq.DriverInstanceId)
-                    .Select(d => d.ClusterId)
-                    .FirstOrDefaultAsync(ct);
-
-                if (driverCluster is not null && driverCluster != newClusterId)
-                {
-                    return new UnsMutationResult(
-                        false,
-                        $"Cannot move area to '{newClusterId}': equipment '{eq.EquipmentId}' is bound to a driver in cluster '{driverCluster}' (decision #122). Re-home or unbind it first.");
-                }
-            }
-        }
-
+        // The equipment↔driver binding was retired in v3, so a cluster move can no longer
+        // orphan driver-bound equipment — the old cross-cluster binding guard is gone.
         entity.Name = name;
         entity.Notes = string.IsNullOrWhiteSpace(notes) ? null : notes;
         entity.ClusterId = newClusterId;
@@ -416,40 +382,8 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
 
         db.Entry(entity).Property(e => e.RowVersion).OriginalValue = rowVersion;
 
-        // A reparent to a different area must not orphan driver-bound equipment
-        // from its driver's cluster.  Resolve the new area's cluster and check every bound
-        // equipment item under this line against it.
-        if (newUnsAreaId != entity.UnsAreaId)
-        {
-            var newAreaCluster = await db.UnsAreas
-                .Where(a => a.UnsAreaId == newUnsAreaId)
-                .Select(a => (string?)a.ClusterId)
-                .FirstOrDefaultAsync(ct);
-
-            if (newAreaCluster is not null)
-            {
-                var boundEquipment = await db.Equipment
-                    .Where(eq => eq.UnsLineId == unsLineId && eq.DriverInstanceId != null)
-                    .Select(eq => new { eq.EquipmentId, eq.DriverInstanceId })
-                    .ToListAsync(ct);
-
-                foreach (var eq in boundEquipment)
-                {
-                    var driverCluster = await db.DriverInstances
-                        .Where(d => d.DriverInstanceId == eq.DriverInstanceId)
-                        .Select(d => d.ClusterId)
-                        .FirstOrDefaultAsync(ct);
-
-                    if (driverCluster is not null && driverCluster != newAreaCluster)
-                    {
-                        return new UnsMutationResult(
-                            false,
-                            $"Cannot move line to area '{newUnsAreaId}': equipment '{eq.EquipmentId}' is bound to a driver in cluster '{driverCluster}' (decision #122). Re-home or unbind it first.");
-                    }
-                }
-            }
-        }
-
+        // The equipment↔driver binding was retired in v3, so a line reparent can no longer
+        // orphan driver-bound equipment — the old cross-cluster binding guard is gone.
         entity.UnsAreaId = newUnsAreaId;
         entity.Name = name;
         entity.Notes = string.IsNullOrWhiteSpace(notes) ? null : notes;
@@ -525,7 +459,7 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
         {
             EquipmentId = equipmentId,
             EquipmentUuid = uuid,
-            DriverInstanceId = string.IsNullOrWhiteSpace(input.DriverInstanceId) ? null : input.DriverInstanceId,
+            // Equipment↔driver binding retired in v3 — no DriverInstanceId column remains.
             UnsLineId = input.UnsLineId,
             Name = input.Name,
             MachineCode = input.MachineCode,
@@ -596,7 +530,7 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             {
                 EquipmentId = equipmentId,
                 EquipmentUuid = uuid,
-                DriverInstanceId = string.IsNullOrWhiteSpace(row.DriverInstanceId) ? null : row.DriverInstanceId,
+                // Equipment↔driver binding retired in v3 — no DriverInstanceId column remains.
                 UnsLineId = row.UnsLineId,
                 Name = row.Name,
                 MachineCode = row.MachineCode,
@@ -650,7 +584,7 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             return guard.Value;
         }
 
-        entity.DriverInstanceId = string.IsNullOrWhiteSpace(input.DriverInstanceId) ? null : input.DriverInstanceId;
+        // Equipment↔driver binding retired in v3 — no DriverInstanceId column remains.
         entity.UnsLineId = input.UnsLineId;
         entity.Name = input.Name;
         entity.MachineCode = input.MachineCode;
@@ -803,10 +737,7 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             return "cluster nodes";
         }
 
-        if (await db.Namespaces.AnyAsync(ns => ns.ClusterId == clusterId, ct))
-        {
-            return "namespaces";
-        }
+        // The Namespace entity was retired in v3 (Raw/UNS split); no namespaces child-check remains.
 
         if (await db.UnsAreas.AnyAsync(a => a.ClusterId == clusterId, ct))
         {
@@ -826,141 +757,40 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
         $"Delete failed: {blocker} still reference cluster '{clusterId}' — remove them first.";
 
     /// <inheritdoc />
-    public async Task<IReadOnlyList<(string DriverInstanceId, string Display, string DriverType, string DriverConfig)>> LoadTagDriversForEquipmentAsync(
+    public Task<IReadOnlyList<(string DriverInstanceId, string Display, string DriverType, string DriverConfig)>> LoadTagDriversForEquipmentAsync(
         string equipmentId,
         CancellationToken ct = default)
     {
-        await using var db = await dbFactory.CreateDbContextAsync(ct);
-
-        var equipmentCluster = await ResolveEquipmentClusterAsync(db, equipmentId, ct);
-        if (equipmentCluster is null)
-        {
-            return Array.Empty<(string, string, string, string)>();
-        }
-
-        // Drivers in the equipment's cluster whose namespace is Equipment-kind.
-        // GalaxyMxGateway is an ordinary Equipment-kind driver post-de-split, so it surfaces here
-        // alongside the PLC drivers; its DriverConfig feeds the Galaxy live-browse address picker.
-        var equipmentNamespaceIds = await db.Namespaces
-            .Where(n => n.ClusterId == equipmentCluster && n.Kind == NamespaceKind.Equipment)
-            .Select(n => n.NamespaceId)
-            .ToListAsync(ct);
-
-        var drivers = await db.DriverInstances
-            .Where(d => d.ClusterId == equipmentCluster && equipmentNamespaceIds.Contains(d.NamespaceId))
-            .OrderBy(d => d.DriverInstanceId)
-            .Select(d => new { d.DriverInstanceId, d.Name, d.DriverType, d.DriverConfig })
-            .ToListAsync(ct);
-
-        return drivers
-            .Select(d => (d.DriverInstanceId, Display: $"{d.DriverInstanceId} — {d.Name}", d.DriverType, d.DriverConfig))
-            .ToList();
+        // The equipment↔driver binding and the Namespace entity were retired in v3 (Raw/UNS split).
+        // Equipment no longer scopes a candidate-driver list; tag/driver authoring moved to the Raw
+        // tree in Batch 2/3. No candidate drivers to offer.
+        return Task.FromResult<IReadOnlyList<(string, string, string, string)>>(
+            Array.Empty<(string, string, string, string)>());
     }
 
     /// <inheritdoc />
-    public async Task<UnsMutationResult> CreateTagAsync(
+    public Task<UnsMutationResult> CreateTagAsync(
         string equipmentId,
         TagInput input,
         CancellationToken ct = default)
     {
-        await using var db = await dbFactory.CreateDbContextAsync(ct);
-
-        if (await db.Tags.AnyAsync(t => t.TagId == input.TagId, ct))
-        {
-            return new UnsMutationResult(false, $"Tag '{input.TagId}' already exists.");
-        }
-
-        if (!IsValidJson(input.TagConfig))
-        {
-            return new UnsMutationResult(false, "TagConfig is not valid JSON.");
-        }
-
-        if (!await db.Equipment.AnyAsync(e => e.EquipmentId == equipmentId, ct))
-            return new UnsMutationResult(false, $"Equipment '{equipmentId}' not found.");
-
-        var equipmentCluster = await ResolveEquipmentClusterAsync(db, equipmentId, ct);
-        var guard = await CheckTagDriverGuardAsync(db, input.DriverInstanceId, equipmentCluster, ct);
-        if (guard is not null)
-        {
-            return guard.Value;
-        }
-
-        if (await db.Tags.AnyAsync(t => t.EquipmentId == equipmentId && t.Name == input.Name, ct))
-        {
-            return new UnsMutationResult(false, $"A tag named '{input.Name}' already exists on this equipment.");
-        }
-
-        db.Tags.Add(new Tag
-        {
-            TagId = input.TagId,
-            DriverInstanceId = input.DriverInstanceId,
-            EquipmentId = equipmentId,
-            Name = input.Name,
-            FolderPath = null,
-            DataType = input.DataType,
-            AccessLevel = input.AccessLevel,
-            WriteIdempotent = input.WriteIdempotent,
-            PollGroupId = string.IsNullOrWhiteSpace(input.PollGroupId) ? null : input.PollGroupId,
-            TagConfig = input.TagConfig,
-        });
-        await db.SaveChangesAsync(ct);
-        return new UnsMutationResult(true, null);
+        // Equipment-bound tag authoring was retired in v3: Tag is now Raw-only and the equipment↔Tag
+        // binding no longer exists. Authoring moved to the Raw tree (/raw) in v3 Batch 2.
+        return Task.FromResult(new UnsMutationResult(
+            false, "Tag authoring moved to the Raw tree (/raw) in v3 Batch 2."));
     }
 
     /// <inheritdoc />
-    public async Task<UnsMutationResult> UpdateTagAsync(
+    public Task<UnsMutationResult> UpdateTagAsync(
         string tagId,
         TagInput input,
         byte[] rowVersion,
         CancellationToken ct = default)
     {
-        await using var db = await dbFactory.CreateDbContextAsync(ct);
-
-        var entity = await db.Tags.FirstOrDefaultAsync(t => t.TagId == tagId, ct);
-        if (entity is null)
-        {
-            return new UnsMutationResult(false, "Row no longer exists.");
-        }
-
-        db.Entry(entity).Property(e => e.RowVersion).OriginalValue = rowVersion;
-
-        if (!IsValidJson(input.TagConfig))
-        {
-            return new UnsMutationResult(false, "TagConfig is not valid JSON.");
-        }
-
-        var equipmentCluster = await ResolveEquipmentClusterAsync(db, entity.EquipmentId, ct);
-        var guard = await CheckTagDriverGuardAsync(db, input.DriverInstanceId, equipmentCluster, ct);
-        if (guard is not null)
-        {
-            return guard.Value;
-        }
-
-        if (await db.Tags.AnyAsync(
-                t => t.EquipmentId == entity.EquipmentId && t.Name == input.Name && t.TagId != tagId,
-                ct))
-        {
-            return new UnsMutationResult(false, $"A tag named '{input.Name}' already exists on this equipment.");
-        }
-
-        // EquipmentId and FolderPath (null) are preserved — tree tags are always equipment-bound.
-        entity.DriverInstanceId = input.DriverInstanceId;
-        entity.Name = input.Name;
-        entity.DataType = input.DataType;
-        entity.AccessLevel = input.AccessLevel;
-        entity.WriteIdempotent = input.WriteIdempotent;
-        entity.PollGroupId = string.IsNullOrWhiteSpace(input.PollGroupId) ? null : input.PollGroupId;
-        entity.TagConfig = input.TagConfig;
-
-        try
-        {
-            await db.SaveChangesAsync(ct);
-            return new UnsMutationResult(true, null);
-        }
-        catch (DbUpdateConcurrencyException)
-        {
-            return new UnsMutationResult(false, "Another user changed this tag while you were editing.");
-        }
+        // Equipment-bound tag editing was retired in v3: Tag is now Raw-only and the equipment↔Tag
+        // binding no longer exists. Authoring moved to the Raw tree (/raw) in v3 Batch 2.
+        return Task.FromResult(new UnsMutationResult(
+            false, "Tag authoring moved to the Raw tree (/raw) in v3 Batch 2."));
     }
 
     /// <inheritdoc />
@@ -1048,9 +878,9 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             .Select(s => s.SourceCode).FirstOrDefaultAsync(ct);
         if (!EquipmentScriptPaths.ContainsEquipToken(src)) return null;
 
-        var configs = await db.Tags.Where(t => t.EquipmentId == equipmentId)
-            .Select(t => t.TagConfig).ToListAsync(ct);
-        var fullNames = configs.Select(TagConfigFullName.Extract);
+        // The equipment↔Tag binding was retired in v3 (Tag is Raw-only), so no equipment-bound driver
+        // tags exist to derive an equipment tag base from. The {{equip}} token can't be resolved here.
+        var fullNames = Array.Empty<string>();
         if (EquipmentScriptPaths.DeriveEquipmentBase(fullNames) is null)
         {
             return new UnsMutationResult(false,
@@ -1350,11 +1180,8 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             return new UnsMutationResult(false, $"Driver '{driverInstanceId}' not found.");
         }
 
-        var ns = await db.Namespaces.FirstOrDefaultAsync(n => n.NamespaceId == driver.NamespaceId, ct);
-        if (ns?.Kind != NamespaceKind.Equipment)
-        {
-            return new UnsMutationResult(false, $"Driver '{driverInstanceId}' is not in an Equipment-kind namespace.");
-        }
+        // The Namespace entity + NamespaceKind were retired in v3 (Raw/UNS split); the
+        // driver-in-Equipment-namespace check no longer applies.
 
         if (driver.ClusterId != equipmentCluster)
         {
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/AdminOperationsActor.cs b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/AdminOperationsActor.cs
index 645ee64e..6766c520 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/AdminOperationsActor.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/AdminOperationsActor.cs
@@ -214,15 +214,21 @@ public sealed class AdminOperationsActor : ReceiveActor
             // (default) these are non-blocking (logged + appended to the accepted result Message); in Error
             // mode they fold into the reject list so a typo'd config cannot be re-deployed until fixed.
             // Running servers are untouched either way — the gate only sees re-deploys.
+            // v3: a raw Tag's driver is resolved via its Device (Tag no longer carries EquipmentId /
+            // DriverInstanceId). Inspect EVERY raw tag's TagConfig against its device's driver type.
             var driverTypeById = draft.DriverInstances
                 .GroupBy(d => d.DriverInstanceId, StringComparer.Ordinal)
                 .ToDictionary(g => g.Key, g => g.First().DriverType, StringComparer.Ordinal);
+            var driverByDevice = draft.Devices
+                .GroupBy(d => d.DeviceId, StringComparer.Ordinal)
+                .ToDictionary(g => g.Key, g => g.First().DriverInstanceId, StringComparer.Ordinal);
             var tagConfigWarnings = new List<(string TagId, string Text)>();
-            foreach (var t in draft.Tags.Where(t => t.EquipmentId is not null))
+            foreach (var t in draft.Tags)
             {
-                if (!driverTypeById.TryGetValue(t.DriverInstanceId, out var driverType)) continue;
+                if (!driverByDevice.TryGetValue(t.DeviceId, out var driverInstanceId)) continue;
+                if (!driverTypeById.TryGetValue(driverInstanceId, out var driverType)) continue;
                 foreach (var w in EquipmentTagConfigInspector.Inspect(driverType, t.TagConfig))
-                    tagConfigWarnings.Add((t.TagId, $"tag '{t.TagId}' (equipment '{t.EquipmentId}'): {w}"));
+                    tagConfigWarnings.Add((t.TagId, $"tag '{t.TagId}': {w}"));
             }
             if (tagConfigWarnings.Count > 0)
             {
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/ConfigComposer.cs b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/ConfigComposer.cs
index 9ef81752..261b2ea7 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/ConfigComposer.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/ConfigComposer.cs
@@ -29,16 +29,23 @@ public static class ConfigComposer
     public static async Task<ConfigArtifact> SnapshotAndFlattenAsync(
         OtOpcUaConfigDbContext db, CancellationToken ct = default)
     {
+        // v3 greenfield snapshot: the Raw tree (RawFolders → DriverInstances(+RawFolderId) → Devices(+DeviceConfig)
+        // → TagGroups → Tags(DeviceId/TagGroupId, no EquipmentId/FolderPath/DriverInstanceId)) plus the UNS
+        // projection (UnsAreas/UnsLines/Equipment/UnsTagReferences) and the retained VirtualTags/ScriptedAlarms/
+        // PollGroups/NodeAcls/Scripts. The Namespaces snapshot is RETIRED (the two OPC UA namespaces are implicit).
+        // RevisionHash inputs follow the blob automatically — adding/removing a table shifts the SHA-256.
         var snapshot = new
         {
             Clusters = await db.ServerClusters.AsNoTracking().OrderBy(x => x.ClusterId).ToListAsync(ct),
             Nodes = await db.ClusterNodes.AsNoTracking().OrderBy(x => x.NodeId).ToListAsync(ct),
+            RawFolders = await db.RawFolders.AsNoTracking().OrderBy(x => x.RawFolderId).ToListAsync(ct),
             DriverInstances = await db.DriverInstances.AsNoTracking().OrderBy(x => x.DriverInstanceId).ToListAsync(ct),
             Devices = await db.Devices.AsNoTracking().OrderBy(x => x.DeviceId).ToListAsync(ct),
+            TagGroups = await db.TagGroups.AsNoTracking().OrderBy(x => x.TagGroupId).ToListAsync(ct),
             Equipment = await db.Equipment.AsNoTracking().OrderBy(x => x.EquipmentId).ToListAsync(ct),
             Tags = await db.Tags.AsNoTracking().OrderBy(x => x.TagId).ToListAsync(ct),
+            UnsTagReferences = await db.UnsTagReferences.AsNoTracking().OrderBy(x => x.UnsTagReferenceId).ToListAsync(ct),
             PollGroups = await db.PollGroups.AsNoTracking().OrderBy(x => x.PollGroupId).ToListAsync(ct),
-            Namespaces = await db.Namespaces.AsNoTracking().OrderBy(x => x.NamespaceId).ToListAsync(ct),
             UnsAreas = await db.UnsAreas.AsNoTracking().OrderBy(x => x.UnsAreaId).ToListAsync(ct),
             UnsLines = await db.UnsLines.AsNoTracking().OrderBy(x => x.UnsLineId).ToListAsync(ct),
             NodeAcls = await db.NodeAcls.AsNoTracking().OrderBy(x => x.NodeAclId).ToListAsync(ct),
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
index 852ec7c9..3de19921 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
@@ -20,12 +20,12 @@ public static class EquipmentTagConfigInspector
     private static readonly IReadOnlyDictionary<string, Func<string, IReadOnlyList<string>>> Inspectors =
         new Dictionary<string, Func<string, IReadOnlyList<string>>>(StringComparer.OrdinalIgnoreCase)
         {
-            ["Modbus"]   = ModbusEquipmentTagParser.Inspect,
-            ["S7"]       = S7EquipmentTagParser.Inspect,
-            ["AbCip"]    = AbCipEquipmentTagParser.Inspect,
-            ["AbLegacy"] = AbLegacyEquipmentTagParser.Inspect,
-            ["TwinCat"]  = TwinCATEquipmentTagParser.Inspect,
-            ["Focas"]    = FocasEquipmentTagParser.Inspect,
+            ["Modbus"]   = ModbusTagDefinitionFactory.Inspect,
+            ["S7"]       = S7TagDefinitionFactory.Inspect,
+            ["AbCip"]    = AbCipTagDefinitionFactory.Inspect,
+            ["AbLegacy"] = AbLegacyTagDefinitionFactory.Inspect,
+            ["TwinCat"]  = TwinCATTagDefinitionFactory.Inspect,
+            ["Focas"]    = FocasTagDefinitionFactory.Inspect,
         };
 
     /// <summary>Inspects a tag's <c>TagConfig</c> for the given driver type. Returns the driver's warnings,
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer/AddressSpaceComposer.cs b/src/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer/AddressSpaceComposer.cs
index eff3d232..1625aec6 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer/AddressSpaceComposer.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer/AddressSpaceComposer.cs
@@ -297,41 +297,24 @@ public static class AddressSpaceComposer
         IReadOnlyList<Equipment> equipment,
         IReadOnlyList<DriverInstance> driverInstances,
         IReadOnlyList<ScriptedAlarm> scriptedAlarms) =>
-        Compose(Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment, driverInstances, scriptedAlarms,
-                Array.Empty<Tag>(), Array.Empty<Namespace>());
-
-    /// <summary>UNS-aware overload that doesn't supply tags.</summary>
-    /// <param name="unsAreas">The UNS areas.</param>
-    /// <param name="unsLines">The UNS lines.</param>
-    /// <param name="equipment">The equipment.</param>
-    /// <param name="driverInstances">The driver instances.</param>
-    /// <param name="scriptedAlarms">The scripted alarms.</param>
-    /// <param name="devices">The per-device rows used to resolve each equipment's <c>DeviceHost</c>. <c>null</c> = none.</param>
-    /// <returns>The composition result.</returns>
-    public static AddressSpaceComposition Compose(
-        IReadOnlyList<UnsArea> unsAreas,
-        IReadOnlyList<UnsLine> unsLines,
-        IReadOnlyList<Equipment> equipment,
-        IReadOnlyList<DriverInstance> driverInstances,
-        IReadOnlyList<ScriptedAlarm> scriptedAlarms,
-        IReadOnlyList<Device>? devices = null) =>
-        Compose(unsAreas, unsLines, equipment, driverInstances, scriptedAlarms,
-                Array.Empty<Tag>(), Array.Empty<Namespace>(), devices: devices);
+        Compose(Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment, driverInstances, scriptedAlarms);
 
     /// <summary>
-    ///     Composes the address space build plan from the configuration entities.
+    ///     Composes the address space build plan from the v3 configuration entities.
+    ///     <para><b>v3 DARK address space (Batch 1):</b> equipment-tag variable nodes do NOT materialize —
+    ///     <c>EquipmentTags</c> is deliberately empty (the raw + UNS variable nodes are lit up in Batch 4's
+    ///     dual namespace). The composer carries the UNS folder hierarchy (Area/Line/Equipment) +
+    ///     per-equipment VirtualTags + ScriptedAlarms only. Equipment no longer binds a driver/device, so
+    ///     <see cref="EquipmentNode"/>'s driver/device hooks are always null. This is the pure reference
+    ///     mirror of <c>DeploymentArtifact.ParseComposition</c> (byte-parity target for the corpus tests).</para>
     /// </summary>
     /// <param name="unsAreas">The UNS areas.</param>
     /// <param name="unsLines">The UNS lines.</param>
     /// <param name="equipment">The equipment.</param>
     /// <param name="driverInstances">The driver instances.</param>
     /// <param name="scriptedAlarms">The scripted alarms.</param>
-    /// <param name="tags">The tags.</param>
-    /// <param name="namespaces">The namespaces.</param>
-    /// <param name="virtualTags">The Equipment-namespace virtual (calculated) tags. <c>null</c> = none.</param>
+    /// <param name="virtualTags">The per-equipment virtual (calculated) tags. <c>null</c> = none.</param>
     /// <param name="scripts">The scripts joined to <paramref name="virtualTags"/> by ScriptId for the expression. <c>null</c> = none.</param>
-    /// <param name="devices">The per-device rows (<c>DeviceId</c> + schemaless <c>DeviceConfig</c> JSON) used to resolve
-    /// each equipment's <c>DeviceHost</c> from its bound <c>DeviceId</c>. <c>null</c> = none.</param>
     /// <returns>The composition result.</returns>
     public static AddressSpaceComposition Compose(
         IReadOnlyList<UnsArea> unsAreas,
@@ -339,28 +322,12 @@ public static class AddressSpaceComposer
         IReadOnlyList<Equipment> equipment,
         IReadOnlyList<DriverInstance> driverInstances,
         IReadOnlyList<ScriptedAlarm> scriptedAlarms,
-        IReadOnlyList<Tag> tags,
-        IReadOnlyList<Namespace> namespaces,
         IReadOnlyList<VirtualTag>? virtualTags = null,
-        IReadOnlyList<Script>? scripts = null,
-        IReadOnlyList<Device>? devices = null)
+        IReadOnlyList<Script>? scripts = null)
     {
         var vtags = virtualTags ?? Array.Empty<VirtualTag>();
         var resolvedScripts = scripts ?? Array.Empty<Script>();
 
-        // DeviceId → connection host, resolved once from each bound Device's schemaless DeviceConfig JSON
-        // via the shared DeviceConfigIntent.TryExtractHost (single source of truth + normalization for both
-        // this composer and the artifact-decode mirror in DeploymentArtifact, so EquipmentNode.DeviceHost is
-        // byte-parity-equal). This MUST match DeploymentArtifact.BuildDeviceHostMap semantics EXACTLY:
-        // Ordinal comparer, skip blank/whitespace DeviceIds, and LAST-WINS on a duplicate DeviceId (a
-        // foreach assignment, NOT ToDictionary which would THROW on a dupe — diverging from the decode
-        // side's last-wins). DeviceId is DB-unique so a dupe is defensive-only.
-        var deviceHostById = new Dictionary<string, string?>(StringComparer.Ordinal);
-        foreach (var d in devices ?? Array.Empty<Device>())
-        {
-            if (string.IsNullOrWhiteSpace(d.DeviceId)) continue;
-            deviceHostById[d.DeviceId] = DeviceConfigIntent.TryExtractHost(d.DeviceConfig);
-        }
         var areas = unsAreas
             .OrderBy(a => a.UnsAreaId, StringComparer.Ordinal)
             .Select(a => new UnsAreaProjection(a.UnsAreaId, a.Name))
@@ -373,18 +340,10 @@ public static class AddressSpaceComposer
 
         var nodes = equipment
             .OrderBy(e => e.EquipmentId, StringComparer.Ordinal)
-            // DisplayName = the UNS level-5 Name segment (friendly browse name, matching the Area
-            // and Line projections + EquipmentNodeWalker) — NOT the colloquial MachineCode. NodeId
-            // stays the logical EquipmentId so browse-path resolution + ACLs are unaffected.
-            // DriverInstanceId / DeviceId are copied straight from the row; DeviceHost resolves from the
-            // bound device's config (null when there's no device or no parseable HostAddress).
-            .Select(e => new EquipmentNode(
-                e.EquipmentId,
-                e.Name,
-                e.UnsLineId,
-                DriverInstanceId: e.DriverInstanceId,
-                DeviceId: e.DeviceId,
-                DeviceHost: e.DeviceId is null ? null : deviceHostById.GetValueOrDefault(e.DeviceId)))
+            // DisplayName = the UNS level-5 Name segment (friendly browse name). NodeId stays the logical
+            // EquipmentId. v3: equipment no longer binds a driver/device (it references raw tags via
+            // UnsTagReference), so DriverInstanceId/DeviceId/DeviceHost are always null.
+            .Select(e => new EquipmentNode(e.EquipmentId, e.Name, e.UnsLineId))
             .ToList();
 
         var plans = driverInstances
@@ -397,55 +356,10 @@ public static class AddressSpaceComposer
             .Select(a => new ScriptedAlarmPlan(a.ScriptedAlarmId, a.EquipmentId, a.PredicateScriptId, a.MessageTemplate))
             .ToList();
 
-        var driversById = driverInstances.ToDictionary(d => d.DriverInstanceId, StringComparer.Ordinal);
-        var namespacesById = namespaces.ToDictionary(n => n.NamespaceId, StringComparer.Ordinal);
-
-        // Equipment tags = a Tag bound to an Equipment (non-null EquipmentId) whose driver's namespace
-        // is Equipment-kind. FullName is the driver-side wire reference pulled from TagConfig — it
-        // becomes the variable's NodeId + read/write routing key. Galaxy points are ordinary equipment
-        // tags now (GalaxyMxGateway is a standard Equipment-kind driver), so no driver-type exception.
-        var equipmentTags = tags
-            .Where(t => t.EquipmentId is not null)
-            .Where(t => driversById.TryGetValue(t.DriverInstanceId, out var di)
-                        && namespacesById.TryGetValue(di.NamespaceId, out var ns)
-                        && ns.Kind == NamespaceKind.Equipment)
-            .OrderBy(t => t.EquipmentId, StringComparer.Ordinal)
-            .ThenBy(t => t.FolderPath ?? string.Empty, StringComparer.Ordinal) // coalesce so the sort matches the artifact-decode side exactly
-            .ThenBy(t => t.Name, StringComparer.Ordinal)
-            .Select(t =>
-            {
-                // Parse the schemaless TagConfig blob ONCE per tag (01/P-1) via the shared byte-parity
-                // authority (01/C-1). TagConfigIntent.Parse is the SINGLE SOURCE OF TRUTH the
-                // artifact-decode seam (DeploymentArtifact), the draft gate (DraftValidator), and the
-                // walker all consume — so the live-compose and artifact-decode plans stay byte-equal.
-                var intent = TagConfigIntent.Parse(t.TagConfig);
-                return new EquipmentTagPlan(
-                    TagId: t.TagId,
-                    EquipmentId: t.EquipmentId!,
-                    DriverInstanceId: t.DriverInstanceId,
-                    FolderPath: t.FolderPath ?? string.Empty,
-                    Name: t.Name,
-                    DataType: t.DataType,
-                    FullName: intent.FullName,
-                    Writable: t.AccessLevel == TagAccessLevel.ReadWrite,
-                    Alarm: intent.Alarm is { } a ? new EquipmentTagAlarmInfo(a.AlarmType, a.Severity, a.HistorizeToAveva) : null,
-                    IsHistorized: intent.IsHistorized,
-                    HistorianTagname: intent.HistorianTagname,
-                    IsArray: intent.IsArray,
-                    ArrayLength: intent.ArrayLength);
-            })
-            .ToList();
-
-        // Per-equipment tag base = the shared substring-before-first-dot across each equipment's
-        // child-tag FullNames, used to expand the reserved {{equip}} token in shared VirtualTag
-        // scripts (equipment-relative tag paths). Derived from equipmentTags so one script reused
-        // across N identical machines resolves to N machine-specific dependency graphs.
-        var baseByEquip = equipmentTags
-            .GroupBy(t => t.EquipmentId, StringComparer.Ordinal)
-            .ToDictionary(
-                g => g.Key,
-                g => EquipmentScriptPaths.DeriveEquipmentBase(g.Select(t => t.FullName)),
-                StringComparer.Ordinal);
+        // v3 DARK: no equipment-tag variable plans this batch (Batch 4 owns UNS↔Raw fan-out). {{equip}}
+        // substitution therefore has no per-equipment tag base — matches the artifact-decode mirror.
+        var equipmentTags = Array.Empty<EquipmentTagPlan>();
+        var baseByEquip = new Dictionary<string, string?>(StringComparer.Ordinal);
 
         // Equipment VirtualTags = each VirtualTag joined to its Script (by ScriptId) for the
         // expression source. The {{equip}} token is substituted with the owning equipment's tag
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DeploymentArtifact.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DeploymentArtifact.cs
index 1c132341..33548200 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DeploymentArtifact.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DeploymentArtifact.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using ZB.MOM.WW.OtOpcUa.Commons.Types;
 using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.OpcUaServer;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
@@ -62,17 +63,25 @@ public static class DeploymentArtifact
         try
         {
             using var doc = JsonDocument.Parse(blob.ToArray());
-            if (!doc.RootElement.TryGetProperty("DriverInstances", out var arr)
+            var root = doc.RootElement;
+            if (!root.TryGetProperty("DriverInstances", out var arr)
                 || arr.ValueKind != JsonValueKind.Array)
             {
                 return Array.Empty<DriverInstanceSpec>();
             }
 
+            // v3: each spec's DriverConfig is the MERGED config the driver factory binds from —
+            // DriverConfig (protocol/channel) + per-Device DeviceConfig (endpoint) + the driver's authored
+            // raw tags (RawTags array, keyed by RawPath) — folded once here via DriverDeviceConfigMerger so
+            // both spawn (TryCreate) and redeploy (ApplyDelta) hand the driver the same shape.
+            var rawTagsByDriver = BuildRawTagsByDriver(root);
+            var deviceRowsByDriver = BuildDeviceRowsByDriver(root);
+
             var result = new List<DriverInstanceSpec>(arr.GetArrayLength());
             foreach (var el in arr.EnumerateArray())
             {
                 if (el.ValueKind != JsonValueKind.Object) continue;
-                var spec = TryReadSpec(el);
+                var spec = TryReadSpec(el, rawTagsByDriver, deviceRowsByDriver);
                 if (spec is not null) result.Add(spec);
             }
             return result;
@@ -83,6 +92,121 @@ public static class DeploymentArtifact
         }
     }
 
+    /// <summary>Flatten the artifact's raw topology (RawFolders / DriverInstances / Devices / TagGroups /
+    /// Tags) into each driver's authored <see cref="RawTagEntry"/> list, keyed by DriverInstanceId. Each
+    /// tag's RawPath is computed via the shared <see cref="RawPathResolver"/> (the single identity authority),
+    /// so the deploy-decode side agrees byte-for-byte with the authoring/validation side. A tag whose
+    /// device/driver chain is broken (unknown link) is dropped.</summary>
+    /// <param name="root">The artifact root element.</param>
+    /// <returns>DriverInstanceId → authored raw tags (RawPath + TagConfig + WriteIdempotent + DeviceName).</returns>
+    private static Dictionary<string, List<RawTagEntry>> BuildRawTagsByDriver(JsonElement root)
+    {
+        var byDriver = new Dictionary<string, List<RawTagEntry>>(StringComparer.Ordinal);
+
+        var folders = new Dictionary<string, (string? ParentId, string Name)>(StringComparer.Ordinal);
+        foreach (var el in EnumerateArray(root, "RawFolders"))
+        {
+            var id = ReadString(el, "RawFolderId");
+            if (string.IsNullOrWhiteSpace(id)) continue;
+            folders[id!] = (ReadNullableString(el, "ParentRawFolderId"), ReadString(el, "Name") ?? id!);
+        }
+
+        var drivers = new Dictionary<string, (string? RawFolderId, string Name)>(StringComparer.Ordinal);
+        foreach (var el in EnumerateArray(root, "DriverInstances"))
+        {
+            var id = ReadString(el, "DriverInstanceId");
+            if (string.IsNullOrWhiteSpace(id)) continue;
+            drivers[id!] = (ReadNullableString(el, "RawFolderId"), ReadString(el, "Name") ?? id!);
+        }
+
+        var deviceToDriver = new Dictionary<string, string>(StringComparer.Ordinal);
+        var devices = new Dictionary<string, (string DriverInstanceId, string Name)>(StringComparer.Ordinal);
+        foreach (var el in EnumerateArray(root, "Devices"))
+        {
+            var id = ReadString(el, "DeviceId");
+            var di = ReadString(el, "DriverInstanceId");
+            if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(di)) continue;
+            var name = ReadString(el, "Name") ?? id!;
+            devices[id!] = (di!, name);
+            deviceToDriver[id!] = di!;
+        }
+
+        var groups = new Dictionary<string, (string? ParentId, string Name)>(StringComparer.Ordinal);
+        foreach (var el in EnumerateArray(root, "TagGroups"))
+        {
+            var id = ReadString(el, "TagGroupId");
+            if (string.IsNullOrWhiteSpace(id)) continue;
+            groups[id!] = (ReadNullableString(el, "ParentTagGroupId"), ReadString(el, "Name") ?? id!);
+        }
+
+        var resolver = new RawPathResolver(folders, drivers, devices, groups);
+
+        foreach (var el in EnumerateArray(root, "Tags"))
+        {
+            var deviceId = ReadString(el, "DeviceId");
+            var name = ReadString(el, "Name");
+            if (string.IsNullOrWhiteSpace(deviceId) || string.IsNullOrWhiteSpace(name)) continue;
+            if (!deviceToDriver.TryGetValue(deviceId!, out var driverInstanceId)) continue;
+            var tagGroupId = ReadNullableString(el, "TagGroupId");
+            var rawPath = resolver.TryBuildTagPath(deviceId!, tagGroupId, name!);
+            if (rawPath is null) continue; // broken chain — dropped (deploy gate rejects invalid names)
+            var tagConfig = el.TryGetProperty("TagConfig", out var tcEl) && tcEl.ValueKind == JsonValueKind.String
+                ? tcEl.GetString() ?? "{}" : "{}";
+            // WriteIdempotent (bool; non-bool/absent ⇒ false — the safe R2 default: writes are non-idempotent).
+            var writeIdempotent = el.TryGetProperty("WriteIdempotent", out var wiEl)
+                && wiEl.ValueKind is JsonValueKind.True or JsonValueKind.False && wiEl.GetBoolean();
+            var deviceName = devices.TryGetValue(deviceId!, out var dev) ? dev.Name : string.Empty;
+
+            if (!byDriver.TryGetValue(driverInstanceId, out var list))
+                byDriver[driverInstanceId] = list = new List<RawTagEntry>();
+            list.Add(new RawTagEntry(rawPath, tagConfig, writeIdempotent, deviceName));
+        }
+
+        // Deterministic ordering per driver (ordinal RawPath) so the injected config is byte-stable.
+        foreach (var list in byDriver.Values)
+            list.Sort((a, b) => string.CompareOrdinal(a.RawPath, b.RawPath));
+        return byDriver;
+    }
+
+    /// <summary>Group the artifact's Devices into per-driver <see cref="DriverDeviceConfigMerger.DeviceRow"/>
+    /// lists (entity Name + schemaless DeviceConfig), ordered by DeviceId for a stable merge.</summary>
+    /// <param name="root">The artifact root element.</param>
+    /// <returns>DriverInstanceId → ordered device rows.</returns>
+    private static Dictionary<string, List<DriverDeviceConfigMerger.DeviceRow>> BuildDeviceRowsByDriver(JsonElement root)
+    {
+        var byDriver = new Dictionary<string, List<(string DeviceId, DriverDeviceConfigMerger.DeviceRow Row)>>(StringComparer.Ordinal);
+        foreach (var el in EnumerateArray(root, "Devices"))
+        {
+            var id = ReadString(el, "DeviceId");
+            var di = ReadString(el, "DriverInstanceId");
+            if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(di)) continue;
+            var name = ReadString(el, "Name") ?? id!;
+            var deviceConfig = ReadString(el, "DeviceConfig");
+            if (!byDriver.TryGetValue(di!, out var list))
+                byDriver[di!] = list = new List<(string, DriverDeviceConfigMerger.DeviceRow)>();
+            list.Add((id!, new DriverDeviceConfigMerger.DeviceRow(name, deviceConfig)));
+        }
+
+        return byDriver.ToDictionary(
+            kv => kv.Key,
+            kv => kv.Value.OrderBy(x => x.DeviceId, StringComparer.Ordinal).Select(x => x.Row).ToList(),
+            StringComparer.Ordinal);
+    }
+
+    /// <summary>Enumerate an artifact array property's object elements (empty when absent/non-array).</summary>
+    private static IEnumerable<JsonElement> EnumerateArray(JsonElement root, string property)
+    {
+        if (!root.TryGetProperty(property, out var arr) || arr.ValueKind != JsonValueKind.Array)
+            yield break;
+        foreach (var el in arr.EnumerateArray())
+            if (el.ValueKind == JsonValueKind.Object)
+                yield return el;
+    }
+
+    /// <summary>Reads a string property, coalescing a JSON <c>null</c> (or wrong type) to <see langword="null"/>.</summary>
+    private static string? ReadNullableString(JsonElement el, string property) =>
+        el.TryGetProperty(property, out var p) && p.ValueKind == JsonValueKind.String ? p.GetString() : null;
+
     /// <summary>
     ///     Resolve how a node should scope a deployment artifact to its own ClusterId. Single-cluster
     ///     (or legacy) artifacts resolve to <see cref="ClusterFilterMode.None"/> so every existing
@@ -155,7 +279,10 @@ public static class DeploymentArtifact
     private static string? ReadString(JsonElement el, string property) =>
         el.TryGetProperty(property, out var p) && p.ValueKind == JsonValueKind.String ? p.GetString() : null;
 
-    private static DriverInstanceSpec? TryReadSpec(JsonElement el)
+    private static DriverInstanceSpec? TryReadSpec(
+        JsonElement el,
+        IReadOnlyDictionary<string, List<RawTagEntry>> rawTagsByDriver,
+        IReadOnlyDictionary<string, List<DriverDeviceConfigMerger.DeviceRow>> deviceRowsByDriver)
     {
         var rowId = el.TryGetProperty("DriverInstanceRowId", out var rowEl)
             && rowEl.TryGetGuid(out var rid) ? rid : Guid.Empty;
@@ -166,7 +293,7 @@ public static class DeploymentArtifact
         var enabled = !el.TryGetProperty("Enabled", out var enEl)
             || enEl.ValueKind is not (JsonValueKind.True or JsonValueKind.False)
             || enEl.GetBoolean();
-        var config = ReadString(el, "DriverConfig");
+        var driverConfig = ReadString(el, "DriverConfig");
         var clusterId = ReadString(el, "ClusterId");
         // Per-instance resilience overrides (DriverInstance.ResilienceConfig column). Optional/nullable —
         // absent means tier defaults; layered onto the tier by DriverResilienceOptionsParser at spawn.
@@ -174,13 +301,20 @@ public static class DeploymentArtifact
 
         if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(type)) return null;
 
+        // v3 endpoint→DeviceConfig + RawTags injection: fold DriverConfig + per-device DeviceConfig + the
+        // driver's authored raw tags into the single config the factory binds from (single-endpoint drivers
+        // get their sole DeviceConfig merged up; multi-device drivers get a reconstructed Devices[] array).
+        var devices = deviceRowsByDriver.TryGetValue(id!, out var dr) ? dr : (IReadOnlyList<DriverDeviceConfigMerger.DeviceRow>)Array.Empty<DriverDeviceConfigMerger.DeviceRow>();
+        var rawTags = rawTagsByDriver.TryGetValue(id!, out var rt) ? rt : (IReadOnlyList<RawTagEntry>)Array.Empty<RawTagEntry>();
+        var mergedConfig = DriverDeviceConfigMerger.Merge(driverConfig, devices, rawTags);
+
         return new DriverInstanceSpec(
             DriverInstanceRowId: rowId,
             DriverInstanceId: id!,
             Name: name ?? id!,
             DriverType: type!,
             Enabled: enabled,
-            DriverConfig: config ?? "{}",
+            DriverConfig: mergedConfig,
             ClusterId: clusterId,
             ResilienceConfig: resilienceConfig);
     }
@@ -208,13 +342,14 @@ public static class DeploymentArtifact
 
             var areas = ReadArray(root, "UnsAreas", ReadAreaProjection);
             var lines = ReadArray(root, "UnsLines", ReadLineProjection);
-            // DeviceId → connection host, resolved from the artifact's Devices array via the SAME shared
-            // helper the composer uses, so each EquipmentNode.DeviceHost is byte-parity-equal across seams.
-            var deviceHostById = BuildDeviceHostMap(root);
-            var equipment = ReadArray(root, "Equipment", el => ReadEquipmentNode(el, deviceHostById));
+            var equipment = ReadArray(root, "Equipment", ReadEquipmentNode);
             var drivers = ReadArray(root, "DriverInstances", ReadDriverPlan);
             var alarms = ReadArray(root, "ScriptedAlarms", ReadAlarmPlan);
-            var equipmentTags = BuildEquipmentTagPlans(root);
+            // v3 DARK address space (Batch 1): NO equipment-tag variable plans materialize — the raw + UNS
+            // variable nodes are lit up in Batch 4 (the dual namespace + UNS fan-out). EquipmentTags is
+            // deliberately empty; {{equip}} substitution therefore has no per-equipment tag base (empty).
+            // The retained per-equipment plans (folder hierarchy + VirtualTags + ScriptedAlarms) still exist.
+            var equipmentTags = Array.Empty<EquipmentTagPlan>();
             var equipmentVirtualTags = BuildEquipmentVirtualTagPlans(root, equipmentTags);
             var equipmentScriptedAlarms = BuildEquipmentScriptedAlarmPlans(root);
 
@@ -326,21 +461,18 @@ public static class DeploymentArtifact
                         lineToArea[lineId!] = areaId!;
                 }
             }
-            // Equipment carries no ClusterId — driver-bound equipment is attributed by its driver's
-            // cluster; driver-less equipment (null DriverInstanceId) by its UNS line's area cluster.
+            // v3: Equipment carries no ClusterId AND no driver binding — it is attributed solely by its
+            // UNS line's area cluster (Equipment -> UnsLine.UnsAreaId -> UnsArea.ClusterId).
             if (root.TryGetProperty("Equipment", out var eq) && eq.ValueKind == JsonValueKind.Array)
             {
                 foreach (var el in eq.EnumerateArray())
                 {
                     if (el.ValueKind != JsonValueKind.Object) continue;
-                    var di = el.TryGetProperty("DriverInstanceId", out var diEl) ? diEl.GetString() : null;
                     var id = el.TryGetProperty("EquipmentId", out var idEl) ? idEl.GetString() : null;
                     var lineId = el.TryGetProperty("UnsLineId", out var luEl) ? luEl.GetString() : null;
                     if (string.IsNullOrWhiteSpace(id)) continue;
-                    var inByDriver = di is not null && driverIds.Contains(di);
-                    var inByLine = di is null && lineId is not null
-                        && lineToArea.TryGetValue(lineId, out var areaOfLine) && areaIds.Contains(areaOfLine);
-                    if (inByDriver || inByLine) equipmentIds.Add(id!);
+                    if (lineId is not null && lineToArea.TryGetValue(lineId, out var areaOfLine) && areaIds.Contains(areaOfLine))
+                        equipmentIds.Add(id!);
                 }
             }
         }
@@ -376,119 +508,6 @@ public static class DeploymentArtifact
         Array.Empty<DriverInstancePlan>(),
         Array.Empty<ScriptedAlarmPlan>());
 
-    /// <summary>
-    ///     Cross-reference the artifact's Tags + Namespaces + DriverInstances arrays to find
-    ///     Equipment-namespace tags (non-null EquipmentId, owning namespace Kind == Equipment), then
-    ///     emit one <see cref="EquipmentTagPlan"/> per qualifying tag. The artifact-decode mirror of
-    ///     <c>AddressSpaceComposer.Compose</c>'s equipment filter — so the compose-side + artifact-decode
-    ///     plans agree on the same set of tags. FullName is read from each tag's TagConfig blob
-    ///     (top-level "FullName" field).
-    /// </summary>
-    private static IReadOnlyList<EquipmentTagPlan> BuildEquipmentTagPlans(JsonElement root)
-    {
-        if (!root.TryGetProperty("Tags", out var tagsArr) || tagsArr.ValueKind != JsonValueKind.Array)
-            return Array.Empty<EquipmentTagPlan>();
-        if (!root.TryGetProperty("Namespaces", out var nsArr) || nsArr.ValueKind != JsonValueKind.Array)
-            return Array.Empty<EquipmentTagPlan>();
-        if (!root.TryGetProperty("DriverInstances", out var diArr) || diArr.ValueKind != JsonValueKind.Array)
-            return Array.Empty<EquipmentTagPlan>();
-
-        // namespaceId → Equipment-kind. Kind serialises as a number by default (Equipment = 0);
-        // tolerate the string form too.
-        var equipmentNamespaces = new HashSet<string>(StringComparer.Ordinal);
-        foreach (var el in nsArr.EnumerateArray())
-        {
-            if (el.ValueKind != JsonValueKind.Object) continue;
-            var id = el.TryGetProperty("NamespaceId", out var idEl) ? idEl.GetString() : null;
-            if (string.IsNullOrWhiteSpace(id)) continue;
-            if (!el.TryGetProperty("Kind", out var kindEl)) continue;
-            var isEquipment = kindEl.ValueKind switch
-            {
-                JsonValueKind.Number => kindEl.GetInt32() == 0, // NamespaceKind.Equipment = 0
-                JsonValueKind.String => string.Equals(kindEl.GetString(), "Equipment", StringComparison.Ordinal),
-                _ => false,
-            };
-            if (isEquipment) equipmentNamespaces.Add(id!);
-        }
-
-        // driverInstanceId → namespaceId.
-        var driverToNamespace = new Dictionary<string, string>(StringComparer.Ordinal);
-        foreach (var el in diArr.EnumerateArray())
-        {
-            if (el.ValueKind != JsonValueKind.Object) continue;
-            var id = el.TryGetProperty("DriverInstanceId", out var idEl) ? idEl.GetString() : null;
-            var ns = el.TryGetProperty("NamespaceId", out var nsEl) ? nsEl.GetString() : null;
-            if (!string.IsNullOrWhiteSpace(id) && !string.IsNullOrWhiteSpace(ns))
-                driverToNamespace[id!] = ns!;
-        }
-
-        var result = new List<EquipmentTagPlan>(tagsArr.GetArrayLength());
-        foreach (var el in tagsArr.EnumerateArray())
-        {
-            if (el.ValueKind != JsonValueKind.Object) continue;
-            // Equipment tags REQUIRE a non-null EquipmentId (the inverse of the Galaxy filter).
-            if (!el.TryGetProperty("EquipmentId", out var eqEl) || eqEl.ValueKind == JsonValueKind.Null) continue;
-            var equipmentId = eqEl.GetString();
-            if (string.IsNullOrWhiteSpace(equipmentId)) continue;
-
-            var tagId = el.TryGetProperty("TagId", out var tidEl) ? tidEl.GetString() : null;
-            var di = el.TryGetProperty("DriverInstanceId", out var diEl) ? diEl.GetString() : null;
-            var name = el.TryGetProperty("Name", out var nmEl) ? nmEl.GetString() : null;
-            var folder = el.TryGetProperty("FolderPath", out var fpEl) && fpEl.ValueKind != JsonValueKind.Null
-                ? fpEl.GetString() : null;
-            var dataType = el.TryGetProperty("DataType", out var dtEl) ? dtEl.GetString() : null;
-            var tagConfig = el.TryGetProperty("TagConfig", out var tcEl) && tcEl.ValueKind == JsonValueKind.String
-                ? tcEl.GetString() : null;
-            // AccessLevel → Writable. ConfigComposer serialises the TagAccessLevel enum WITHOUT a
-            // string converter, so it lands as a number (Read = 0, ReadWrite = 1); tolerate the string
-            // form ("ReadWrite") too — same defensive both-forms parse as the Kind gate above. MUST match
-            // AddressSpaceComposer's `AccessLevel == TagAccessLevel.ReadWrite` exactly (byte-parity). A missing
-            // field defaults to non-writable (read-only).
-            var writable = el.TryGetProperty("AccessLevel", out var alEl) && alEl.ValueKind switch
-            {
-                JsonValueKind.Number => alEl.GetInt32() == (int)TagAccessLevel.ReadWrite,
-                JsonValueKind.String => string.Equals(alEl.GetString(), nameof(TagAccessLevel.ReadWrite), StringComparison.Ordinal),
-                _ => false,
-            };
-
-            if (string.IsNullOrWhiteSpace(tagId) || string.IsNullOrWhiteSpace(di) || string.IsNullOrWhiteSpace(name)) continue;
-            if (!driverToNamespace.TryGetValue(di!, out var nsId)) continue;
-            // Equipment-kind namespace only — byte-parity with the composer's pure
-            // `ns.Kind == NamespaceKind.Equipment` predicate (no Galaxy exception). Galaxy points are
-            // ordinary equipment tags now (GalaxyMxGateway is a standard Equipment-kind driver).
-            if (!equipmentNamespaces.Contains(nsId)) continue;
-
-            // Parse the schemaless TagConfig blob ONCE per tag via the shared byte-parity authority
-            // (01/C-1) — the SAME TagConfigIntent.Parse the live-compose seam (AddressSpaceComposer)
-            // consumes, so the artifact-decode plan stays byte-equal with the composer's.
-            var intent = TagConfigIntent.Parse(tagConfig);
-            result.Add(new EquipmentTagPlan(
-                TagId: tagId!,
-                EquipmentId: equipmentId!,
-                DriverInstanceId: di!,
-                FolderPath: folder ?? string.Empty,
-                Name: name!,
-                DataType: dataType ?? "BaseDataType",
-                FullName: intent.FullName,
-                Writable: writable,
-                Alarm: intent.Alarm is { } a ? new EquipmentTagAlarmInfo(a.AlarmType, a.Severity, a.HistorizeToAveva) : null,
-                IsHistorized: intent.IsHistorized,
-                HistorianTagname: intent.HistorianTagname,
-                IsArray: intent.IsArray,
-                ArrayLength: intent.ArrayLength));
-        }
-
-        result.Sort((a, b) =>
-        {
-            var byEquipment = string.CompareOrdinal(a.EquipmentId, b.EquipmentId);
-            if (byEquipment != 0) return byEquipment;
-            var byFolder = string.CompareOrdinal(a.FolderPath, b.FolderPath);
-            if (byFolder != 0) return byFolder;
-            return string.CompareOrdinal(a.Name, b.Name);
-        });
-        return result;
-    }
-
     /// <summary>
     ///     Join the artifact's VirtualTags array to its Scripts array (by ScriptId) to emit one
     ///     <see cref="EquipmentVirtualTagPlan"/> per VirtualTag. The artifact-decode mirror of
@@ -712,29 +731,7 @@ public static class DeploymentArtifact
         return new UnsLineProjection(id!, areaId!, name ?? id!);
     }
 
-    /// <summary>Build the <c>DeviceId</c> → connection-host map from the artifact's <c>Devices</c> array
-    /// (each row carries a <c>DeviceId</c> + schemaless <c>DeviceConfig</c> JSON). The host is resolved via
-    /// the shared <see cref="DeviceConfigIntent.TryExtractHost"/> so the artifact-decode side
-    /// normalizes byte-identically to the live-edit composer. Ordinal comparer + last-wins on a duplicate
-    /// DeviceId. A missing/empty/non-array <c>Devices</c> property yields an empty map (no device hosts).</summary>
-    /// <param name="root">The artifact root element.</param>
-    /// <returns>The resolved DeviceId → host map (host may be null when a device has no parseable HostAddress).</returns>
-    private static IReadOnlyDictionary<string, string?> BuildDeviceHostMap(JsonElement root)
-    {
-        var map = new Dictionary<string, string?>(StringComparer.Ordinal);
-        if (!root.TryGetProperty("Devices", out var arr) || arr.ValueKind != JsonValueKind.Array)
-            return map;
-        foreach (var el in arr.EnumerateArray())
-        {
-            if (el.ValueKind != JsonValueKind.Object) continue;
-            var deviceId = ReadString(el, "DeviceId");
-            if (string.IsNullOrWhiteSpace(deviceId)) continue;
-            map[deviceId!] = DeviceConfigIntent.TryExtractHost(ReadString(el, "DeviceConfig"));
-        }
-        return map;
-    }
-
-    private static EquipmentNode? ReadEquipmentNode(JsonElement el, IReadOnlyDictionary<string, string?> deviceHostById)
+    private static EquipmentNode? ReadEquipmentNode(JsonElement el)
     {
         var id = ReadString(el, "EquipmentId");
         // DisplayName = the UNS Name segment (friendly browse name, matching UnsArea/UnsLine
@@ -743,19 +740,10 @@ public static class DeploymentArtifact
         var displayName = ReadString(el, "Name");
         var lineId = ReadString(el, "UnsLineId");
         if (string.IsNullOrWhiteSpace(id)) return null;
-        // DriverInstanceId / DeviceId copied straight from the row (null when absent / JSON null);
-        // DeviceHost resolved from the device-host map by DeviceId — byte-parity with the composer's
-        // `e.DeviceId is null ? null : deviceHostById.GetValueOrDefault(e.DeviceId)`.
-        var driverInstanceId = ReadString(el, "DriverInstanceId");
-        var deviceId = ReadString(el, "DeviceId");
-        var deviceHost = deviceId is null ? null : deviceHostById.GetValueOrDefault(deviceId);
-        return new EquipmentNode(
-            id!,
-            displayName ?? id!,
-            lineId ?? string.Empty,
-            DriverInstanceId: driverInstanceId,
-            DeviceId: deviceId,
-            DeviceHost: deviceHost);
+        // v3: Equipment no longer binds a driver/device — it references raw tags via UnsTagReference.
+        // The EquipmentNode's DriverInstanceId/DeviceId/DeviceHost hooks (used by the multi-device FixedTree
+        // partition path) are therefore always null now; Batch 4 owns the UNS↔Raw fan-out that lights them up.
+        return new EquipmentNode(id!, displayName ?? id!, lineId ?? string.Empty);
     }
 
     private static DriverInstancePlan? ReadDriverPlan(JsonElement el)
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DriverHostActor.cs b/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DriverHostActor.cs
index d890815e..4d588c8c 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DriverHostActor.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DriverHostActor.cs
@@ -112,7 +112,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     ///     several equipment variables (e.g. identical machines sharing a register), and the per-apply
     ///     rebuild dedups by NodeId.
     /// </summary>
-    private readonly Dictionary<(string DriverInstanceId, string FullName), HashSet<string>> _nodeIdByDriverRef = new();
+    private readonly Dictionary<(string DriverInstanceId, string RawPath), HashSet<string>> _nodeIdByDriverRef = new();
 
     /// <summary>
     ///     Inverse of <see cref="_nodeIdByDriverRef"/>: <c>folder-scoped equipment NodeId →
@@ -123,14 +123,14 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     ///     ref (a variable is backed by a single driver attribute), so this is a flat 1:1 map (the forward
     ///     map fans out 1:N because one ref can back several variables).
     /// </summary>
-    private readonly Dictionary<string, (string DriverInstanceId, string FullName)> _driverRefByNodeId =
+    private readonly Dictionary<string, (string DriverInstanceId, string RawPath)> _driverRefByNodeId =
         new(StringComparer.Ordinal);
 
     /// <summary>(DriverInstanceId, FullName = alarm ConditionId / AlarmFullReference) → folder-scoped condition NodeId(s).
     /// Built from EquipmentTags whose plan carries Alarm, alongside the value maps; resolves a native
     /// alarm transition to the materialised Part 9 condition node(s). Alarm tags are conditions, not
     /// value variables, so they are kept OUT of the value maps + value-subscription set.</summary>
-    private readonly Dictionary<(string DriverInstanceId, string FullName), HashSet<string>> _alarmNodeIdByDriverRef = new();
+    private readonly Dictionary<(string DriverInstanceId, string RawPath), HashSet<string>> _alarmNodeIdByDriverRef = new();
 
     /// <summary>
     ///     Inverse of <see cref="_alarmNodeIdByDriverRef"/>: <c>folder-scoped condition NodeId →
@@ -142,7 +142,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     ///     single driver alarm), so this is a flat 1:1 map (the forward map fans out 1:N because one ref can
     ///     back several conditions on identical machines).
     /// </summary>
-    private readonly Dictionary<string, (string DriverInstanceId, string FullName)> _driverRefByAlarmNodeId =
+    private readonly Dictionary<string, (string DriverInstanceId, string RawPath)> _driverRefByAlarmNodeId =
         new(StringComparer.Ordinal);
 
     /// <summary>Condition NodeId → (EquipmentId, tag Name, OPC UA alarm type, HistorizeToAveva) for building
@@ -1094,7 +1094,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
         // the continuation: it runs off the actor thread, where raw Sender is unsafe to read.
         var replyTo = Sender;
         entry.Actor.Ask<DriverInstanceActor.WriteAttributeResult>(
-                new DriverInstanceActor.WriteAttribute(target.FullName, msg.Value!), TimeSpan.FromSeconds(8))
+                new DriverInstanceActor.WriteAttribute(target.RawPath, msg.Value!), TimeSpan.FromSeconds(8))
             .ContinueWith(
                 t => t.IsCompletedSuccessfully
                     ? new NodeWriteResult(t.Result.Success, t.Result.Reason)
@@ -1164,7 +1164,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
         // Fire-and-forget: the OPC UA Part 9 ack already committed the local condition state, and the
         // driver's AcknowledgeAsync surfaces no per-condition status, so there is nothing to reply. The
         // driver correlates on ConditionId (= the authored alarm FullName the inverse map keyed on).
-        entry.Actor.Tell(new DriverInstanceActor.RouteAlarmAck(target.FullName, msg.Comment, msg.OperatorUser));
+        entry.Actor.Tell(new DriverInstanceActor.RouteAlarmAck(target.RawPath, msg.Comment, msg.OperatorUser));
     }
 
     /// <summary>Whether this node should service a Primary-only data-plane operation right now — the single
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathResolverTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathResolverTests.cs
new file mode 100644
index 00000000..5f039bae
--- /dev/null
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathResolverTests.cs
@@ -0,0 +1,113 @@
+using System.Text.Json;
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Commons.Types;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Commons.Tests;
+
+/// <summary>
+///     v3 (B1-WP4) identity — the shared <see cref="RawPathResolver"/> must build a raw tag's RawPath by
+///     walking RawFolder → Driver → Device → TagGroup ancestry, and <see cref="DriverDeviceConfigMerger"/>
+///     must fold the endpoint + RawTags into the single driver config. This is the byte-parity authority
+///     both the deploy artifact and the draft validator compute against.
+/// </summary>
+public sealed class RawPathResolverTests
+{
+    private static RawPathResolver Nested() => new(
+        folders: new Dictionary<string, (string?, string)>
+        {
+            ["f1"] = (null, "Plant"),
+            ["f2"] = ("f1", "Line1"),
+        },
+        drivers: new Dictionary<string, (string?, string)>
+        {
+            ["drv1"] = ("f2", "Modbus1"),
+            ["drvRoot"] = (null, "S7Root"),
+        },
+        devices: new Dictionary<string, (string, string)>
+        {
+            ["dev1"] = ("drv1", "PLC-A"),
+            ["devRoot"] = ("drvRoot", "PLC-B"),
+        },
+        groups: new Dictionary<string, (string?, string)>
+        {
+            ["g1"] = (null, "Motors"),
+            ["g2"] = ("g1", "M1"),
+        });
+
+    [Fact]
+    public void TryBuildTagPath_walks_folder_driver_device_group_ancestry()
+    {
+        Nested().TryBuildTagPath("dev1", "g2", "Speed")
+            .ShouldBe("Plant/Line1/Modbus1/PLC-A/Motors/M1/Speed");
+    }
+
+    [Fact]
+    public void TryBuildTagPath_device_root_tag_has_no_group_segments()
+    {
+        Nested().TryBuildTagPath("dev1", null, "Status")
+            .ShouldBe("Plant/Line1/Modbus1/PLC-A/Status");
+    }
+
+    [Fact]
+    public void TryBuildTagPath_cluster_root_driver_has_no_folder_segments()
+    {
+        Nested().TryBuildTagPath("devRoot", null, "Run")
+            .ShouldBe("S7Root/PLC-B/Run");
+    }
+
+    [Fact]
+    public void TryBuildTagPath_unknown_device_returns_null()
+    {
+        Nested().TryBuildTagPath("ghost", null, "X").ShouldBeNull();
+    }
+
+    [Fact]
+    public void TryBuildDriverPrefix_is_folders_plus_driver_name()
+    {
+        Nested().TryBuildDriverPrefix("drv1").ShouldBe("Plant/Line1/Modbus1");
+    }
+
+    [Fact]
+    public void Merge_single_device_folds_endpoint_up_and_injects_rawtags()
+    {
+        var merged = DriverDeviceConfigMerger.Merge(
+            driverConfigJson: "{\"UnitId\":3}",
+            devices: new[] { new DriverDeviceConfigMerger.DeviceRow("PLC-A", "{\"Host\":\"10.0.0.5\",\"Port\":502}") },
+            rawTags: new[] { new RawTagEntry("Plant/Modbus1/PLC-A/Speed", "{\"address\":\"40001\"}", true, "PLC-A") });
+
+        using var doc = JsonDocument.Parse(merged);
+        var root = doc.RootElement;
+        root.GetProperty("UnitId").GetInt32().ShouldBe(3);
+        root.GetProperty("Host").GetString().ShouldBe("10.0.0.5"); // single-device endpoint merged up
+        root.GetProperty("Port").GetInt32().ShouldBe(502);
+        var rawTags = root.GetProperty("RawTags").EnumerateArray().ToList();
+        rawTags.ShouldHaveSingleItem();
+        rawTags[0].GetProperty("RawPath").GetString().ShouldBe("Plant/Modbus1/PLC-A/Speed");
+        var devices = root.GetProperty("Devices").EnumerateArray().ToList();
+        devices.ShouldHaveSingleItem();
+        devices[0].GetProperty("DeviceName").GetString().ShouldBe("PLC-A");
+    }
+
+    [Fact]
+    public void Merge_multi_device_reconstructs_devices_array_with_names()
+    {
+        var merged = DriverDeviceConfigMerger.Merge(
+            driverConfigJson: "{\"Series\":\"0i\"}",
+            devices: new[]
+            {
+                new DriverDeviceConfigMerger.DeviceRow("PLC-A", "{\"HostAddress\":\"10.0.0.5:8193\"}"),
+                new DriverDeviceConfigMerger.DeviceRow("PLC-B", "{\"HostAddress\":\"10.0.0.6:8193\"}"),
+            },
+            rawTags: Array.Empty<RawTagEntry>());
+
+        using var doc = JsonDocument.Parse(merged);
+        var devices = doc.RootElement.GetProperty("Devices").EnumerateArray().ToList();
+        devices.Count.ShouldBe(2);
+        devices.Select(d => d.GetProperty("DeviceName").GetString()).ShouldBe(new[] { "PLC-A", "PLC-B" });
+        devices[0].GetProperty("HostAddress").GetString().ShouldBe("10.0.0.5:8193");
+        // Multiple devices: no top-level endpoint merge-up (per-device only).
+        doc.RootElement.TryGetProperty("HostAddress", out _).ShouldBeFalse();
+    }
+}
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathsTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathsTests.cs
new file mode 100644
index 00000000..31ea28c8
--- /dev/null
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/RawPathsTests.cs
@@ -0,0 +1,207 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Commons.Types;
+
+namespace ZB.MOM.WW.OtOpcUa.Commons.Tests;
+
+/// <summary>
+///     The v3 identity authority (<see cref="RawPaths"/>): segment validation, slash-joined build,
+///     combine/split/leaf/parent, and the case-sensitive ordinal comparer. Every identity seam in v3
+///     keys on the strings this helper produces, so the separator + segment charset contract is pinned
+///     here in exactly one place.
+/// </summary>
+public sealed class RawPathsTests
+{
+    // ---- constants ----
+
+    [Fact]
+    public void Separator_is_forward_slash()
+    {
+        RawPaths.Separator.ShouldBe('/');
+        RawPaths.SeparatorString.ShouldBe("/");
+    }
+
+    [Fact]
+    public void Comparer_is_ordinal_case_sensitive()
+    {
+        RawPaths.Comparer.ShouldBe(StringComparer.Ordinal);
+        RawPaths.Comparer.Equals("Line/Tag", "line/tag").ShouldBeFalse();
+        RawPaths.Comparer.Equals("Line/Tag", "Line/Tag").ShouldBeTrue();
+    }
+
+    // ---- ValidateSegment / IsValidSegment ----
+
+    [Theory]
+    [InlineData("Modbus")]
+    [InlineData("Device_001")]
+    [InlineData("Tag.Name")]      // dots are legal inside a segment
+    [InlineData("a")]
+    [InlineData("Has Space")]     // interior whitespace is legal; only leading/trailing is not
+    public void ValidateSegment_accepts_legal_segments(string segment)
+    {
+        RawPaths.ValidateSegment(segment).ShouldBeNull();
+        RawPaths.IsValidSegment(segment).ShouldBeTrue();
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    public void ValidateSegment_rejects_empty(string? segment)
+    {
+        RawPaths.ValidateSegment(segment).ShouldNotBeNull();
+        RawPaths.IsValidSegment(segment).ShouldBeFalse();
+    }
+
+    [Theory]
+    [InlineData("a/b")]
+    [InlineData("/leading")]
+    [InlineData("trailing/")]
+    public void ValidateSegment_rejects_separator(string segment)
+    {
+        RawPaths.ValidateSegment(segment).ShouldNotBeNull();
+        RawPaths.ValidateSegment(segment)!.ShouldContain("/");
+        RawPaths.IsValidSegment(segment).ShouldBeFalse();
+    }
+
+    [Theory]
+    [InlineData(" leading")]
+    [InlineData("trailing ")]
+    [InlineData("\ttab")]
+    [InlineData("nl\n")]
+    public void ValidateSegment_rejects_edge_whitespace(string segment)
+    {
+        RawPaths.ValidateSegment(segment).ShouldNotBeNull();
+        RawPaths.IsValidSegment(segment).ShouldBeFalse();
+    }
+
+    // ---- Build ----
+
+    [Fact]
+    public void Build_joins_multiple_segments_with_separator()
+    {
+        RawPaths.Build("Folder", "Modbus", "Dev", "Group", "Tag")
+            .ShouldBe("Folder/Modbus/Dev/Group/Tag");
+    }
+
+    [Fact]
+    public void Build_single_segment_is_the_segment()
+    {
+        RawPaths.Build("Solo").ShouldBe("Solo");
+    }
+
+    [Fact]
+    public void Build_enumerable_overload_joins()
+    {
+        RawPaths.Build(new List<string> { "A", "B" }).ShouldBe("A/B");
+    }
+
+    [Fact]
+    public void Build_empty_list_throws()
+    {
+        Should.Throw<ArgumentException>(() => RawPaths.Build(Array.Empty<string>()));
+    }
+
+    [Fact]
+    public void Build_null_throws()
+    {
+        Should.Throw<ArgumentNullException>(() => RawPaths.Build((IEnumerable<string>)null!));
+    }
+
+    [Fact]
+    public void Build_invalid_segment_throws_naming_the_index()
+    {
+        var ex = Should.Throw<ArgumentException>(() => RawPaths.Build("ok", "bad/seg", "also-ok"));
+        ex.Message.ShouldContain("index 1");
+    }
+
+    // ---- Combine ----
+
+    [Fact]
+    public void Combine_blank_parent_yields_child_alone()
+    {
+        RawPaths.Combine(null, "Root").ShouldBe("Root");
+        RawPaths.Combine("", "Root").ShouldBe("Root");
+    }
+
+    [Fact]
+    public void Combine_appends_child_under_parent()
+    {
+        RawPaths.Combine("A/B", "C").ShouldBe("A/B/C");
+    }
+
+    [Fact]
+    public void Combine_invalid_child_throws()
+    {
+        Should.Throw<ArgumentException>(() => RawPaths.Combine("A/B", "c/d"));
+        Should.Throw<ArgumentException>(() => RawPaths.Combine("A/B", ""));
+    }
+
+    // ---- Split ----
+
+    [Fact]
+    public void Split_returns_ordered_segments()
+    {
+        RawPaths.Split("A/B/C").ShouldBe(new[] { "A", "B", "C" });
+    }
+
+    [Fact]
+    public void Split_single_segment_is_one_element()
+    {
+        RawPaths.Split("Solo").ShouldBe(new[] { "Solo" });
+    }
+
+    // ---- Leaf ----
+
+    [Fact]
+    public void Leaf_of_multi_segment_is_last()
+    {
+        RawPaths.Leaf("A/B/C").ShouldBe("C");
+    }
+
+    [Fact]
+    public void Leaf_of_single_segment_is_itself()
+    {
+        RawPaths.Leaf("Solo").ShouldBe("Solo");
+    }
+
+    // ---- TryParent ----
+
+    [Fact]
+    public void TryParent_of_multi_segment_returns_parent()
+    {
+        RawPaths.TryParent("A/B/C", out var parent).ShouldBeTrue();
+        parent.ShouldBe("A/B");
+    }
+
+    [Fact]
+    public void TryParent_of_two_segment_returns_root()
+    {
+        RawPaths.TryParent("A/B", out var parent).ShouldBeTrue();
+        parent.ShouldBe("A");
+    }
+
+    [Fact]
+    public void TryParent_of_single_segment_returns_false()
+    {
+        RawPaths.TryParent("Solo", out var parent).ShouldBeFalse();
+        parent.ShouldBe(string.Empty);
+    }
+
+    // ---- round trips ----
+
+    [Fact]
+    public void Build_then_Split_round_trips()
+    {
+        var segs = new[] { "Folder", "Sub", "Modbus", "Dev", "Tag" };
+        RawPaths.Split(RawPaths.Build(segs)).ShouldBe(segs);
+    }
+
+    [Fact]
+    public void Combine_then_Leaf_and_Parent_are_consistent()
+    {
+        var path = RawPaths.Combine("A/B", "C");
+        RawPaths.Leaf(path).ShouldBe("C");
+        RawPaths.TryParent(path, out var parent).ShouldBeTrue();
+        parent.ShouldBe("A/B");
+    }
+}
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/TagConfigIntentTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/TagConfigIntentTests.cs
index b19f46fb..39d1fd18 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/TagConfigIntentTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Commons.Tests/TagConfigIntentTests.cs
@@ -6,50 +6,49 @@ namespace ZB.MOM.WW.OtOpcUa.Commons.Tests;
 
 /// <summary>
 ///     The single byte-parity authority for the cross-driver TagConfig platform intents (R2-11, 01/C-1).
-///     Ports the three retired <c>OpcUaServer.Tests/ExtractTag{Alarm,Historize,Array}Tests</c> tables and
-///     adds the <see cref="TagConfigIntent.FullName"/> / <see cref="TagConfigIntent.ExplicitFullName"/>
-///     distinction plus the never-throws property.
+///     Ports the three retired <c>OpcUaServer.Tests/ExtractTag{Alarm,Historize,Array}Tests</c> tables plus
+///     the never-throws property. Under the v3 identity contract <c>TagConfigIntent</c> no longer derives
+///     any FullName/identity — only the platform intents (alarm / historize / array) are parsed here.
 /// </summary>
 public sealed class TagConfigIntentTests
 {
-    // ---- FullName / ExplicitFullName ----
-
-    [Theory]
-    [InlineData("{\"FullName\":\"X.Y\"}", "X.Y", "X.Y")]
-    [InlineData("{\"FullName\":\"   \"}", "   ", "   ")]        // whitespace string returned verbatim (not trimmed)
-    [InlineData("{\"FullName\":\"A.B\",\"region\":\"Coils\"}", "A.B", "A.B")]
-    // fallbacks: FullName = raw blob, ExplicitFullName = null
-    [InlineData("{\"region\":\"HoldingRegisters\"}", "{\"region\":\"HoldingRegisters\"}", null)]
-    [InlineData("{\"FullName\":123}", "{\"FullName\":123}", null)]
-    [InlineData("[1,2]", "[1,2]", null)]
-    [InlineData("not json {", "not json {", null)]
-    [InlineData("   ", "   ", null)]
-    public void FullName_and_ExplicitFullName(string cfg, string expectedFullName, string? expectedExplicit)
-    {
-        var intent = TagConfigIntent.Parse(cfg);
-        intent.FullName.ShouldBe(expectedFullName);
-        intent.ExplicitFullName.ShouldBe(expectedExplicit);
-    }
+    // ---- Parse(null)/blank defaults (identity no longer carried) ----
 
     [Fact]
-    public void Parse_null_yields_empty_FullName_and_null_explicit()
+    public void Parse_null_yields_all_defaults()
     {
         var intent = TagConfigIntent.Parse(null);
-        intent.FullName.ShouldBe(string.Empty);
-        intent.ExplicitFullName.ShouldBeNull();
         intent.Alarm.ShouldBeNull();
         intent.IsHistorized.ShouldBeFalse();
+        intent.HistorianTagname.ShouldBeNull();
         intent.IsArray.ShouldBeFalse();
+        intent.ArrayLength.ShouldBeNull();
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData("not json {")]     // malformed
+    [InlineData("[1,2]")]          // non-object root
+    [InlineData("42")]             // non-object root
+    public void Parse_non_object_yields_all_defaults(string cfg)
+    {
+        var intent = TagConfigIntent.Parse(cfg);
+        intent.Alarm.ShouldBeNull();
+        intent.IsHistorized.ShouldBeFalse();
+        intent.HistorianTagname.ShouldBeNull();
+        intent.IsArray.ShouldBeFalse();
+        intent.ArrayLength.ShouldBeNull();
     }
 
     // ---- Alarm (ported from ExtractTagAlarmTests) ----
 
     [Theory]
-    [InlineData("{\"FullName\":\"X.Y\"}", false, null, 0)]
-    [InlineData("{\"FullName\":\"X.Y\",\"alarm\":{}}", true, "AlarmCondition", 500)]
-    [InlineData("{\"FullName\":\"X.Y\",\"alarm\":{\"alarmType\":\"OffNormalAlarm\",\"severity\":700}}", true, "OffNormalAlarm", 700)]
+    [InlineData("{\"nodeId\":\"X.Y\"}", false, null, 0)]
+    [InlineData("{\"nodeId\":\"X.Y\",\"alarm\":{}}", true, "AlarmCondition", 500)]
+    [InlineData("{\"nodeId\":\"X.Y\",\"alarm\":{\"alarmType\":\"OffNormalAlarm\",\"severity\":700}}", true, "OffNormalAlarm", 700)]
     [InlineData("not json", false, null, 0)]
-    [InlineData("{\"FullName\":\"X.Y\",\"alarm\":\"oops\"}", false, null, 0)]
+    [InlineData("{\"nodeId\":\"X.Y\",\"alarm\":\"oops\"}", false, null, 0)]
     [InlineData("{\"alarm\":{\"severity\":\"high\"}}", true, "AlarmCondition", 500)]  // non-number severity → 500
     [InlineData("{\"alarm\":{\"alarmType\":123}}", true, "AlarmCondition", 500)]      // non-string type → default
     public void Alarm_parses_or_null(string cfg, bool present, string? type, int sev)
@@ -73,12 +72,12 @@ public sealed class TagConfigIntentTests
     // ---- Historize ----
 
     [Theory]
-    [InlineData("{\"FullName\":\"A\",\"isHistorized\":true}", true, null)]
-    [InlineData("{\"FullName\":\"A\",\"isHistorized\":true,\"historianTagname\":\"P.L.X\"}", true, "P.L.X")]
-    [InlineData("{\"FullName\":\"A\",\"isHistorized\":false,\"historianTagname\":null}", false, null)]
-    [InlineData("{\"FullName\":\"A\",\"isHistorized\":true,\"historianTagname\":\"   \"}", true, null)]  // whitespace → null
-    [InlineData("{\"FullName\":\"A\",\"isHistorized\":\"yes\"}", false, null)]                          // non-bool → false
-    [InlineData("{\"FullName\":\"A\"}", false, null)]
+    [InlineData("{\"nodeId\":\"A\",\"isHistorized\":true}", true, null)]
+    [InlineData("{\"nodeId\":\"A\",\"isHistorized\":true,\"historianTagname\":\"P.L.X\"}", true, "P.L.X")]
+    [InlineData("{\"nodeId\":\"A\",\"isHistorized\":false,\"historianTagname\":null}", false, null)]
+    [InlineData("{\"nodeId\":\"A\",\"isHistorized\":true,\"historianTagname\":\"   \"}", true, null)]  // whitespace → null
+    [InlineData("{\"nodeId\":\"A\",\"isHistorized\":\"yes\"}", false, null)]                          // non-bool → false
+    [InlineData("{\"nodeId\":\"A\"}", false, null)]
     public void Historize(string cfg, bool expectedHistorized, string? expectedTagname)
     {
         var intent = TagConfigIntent.Parse(cfg);
@@ -89,11 +88,11 @@ public sealed class TagConfigIntentTests
     // ---- Array (ported from ExtractTagArrayTests) ----
 
     [Theory]
-    [InlineData("{\"FullName\":\"T.A\",\"isArray\":true,\"arrayLength\":16}", true, (uint)16)]
-    [InlineData("{\"FullName\":\"T.A\",\"isArray\":true}", true, null)]
-    [InlineData("{\"FullName\":\"T.A\"}", false, null)]
-    [InlineData("{\"FullName\":\"T.A\",\"isArray\":false,\"arrayLength\":16}", false, null)]
-    [InlineData("{\"FullName\":\"T.A\",\"isArray\":true,\"arrayLength\":0}", true, (uint)0)]
+    [InlineData("{\"nodeId\":\"T.A\",\"isArray\":true,\"arrayLength\":16}", true, (uint)16)]
+    [InlineData("{\"nodeId\":\"T.A\",\"isArray\":true}", true, null)]
+    [InlineData("{\"nodeId\":\"T.A\"}", false, null)]
+    [InlineData("{\"nodeId\":\"T.A\",\"isArray\":false,\"arrayLength\":16}", false, null)]
+    [InlineData("{\"nodeId\":\"T.A\",\"isArray\":true,\"arrayLength\":0}", true, (uint)0)]
     [InlineData(null, false, null)]
     [InlineData("", false, null)]
     [InlineData("not json {", false, null)]
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
index c58a2ee5..9ad5806a 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
@@ -29,30 +29,32 @@ public sealed class DraftSnapshotFactoryTests : IDisposable
     /// <summary>Disposes the database context.</summary>
     public void Dispose() => _db.Dispose();
 
-    /// <summary>Seeds one Equipment plus a Tag and a VirtualTag sharing (EquipmentId, Name); the
-    /// snapshot must carry both signal collections AND the validator must flag the collision.</summary>
+    /// <summary>Seeds an Equipment plus a raw Tag and a VirtualTag; the snapshot must carry both
+    /// signal collections. v3: Tags are raw-only, so the equipment-signal collision rule now operates
+    /// on VirtualTags — two VirtualTags sharing (EquipmentId, Name) must surface the collision.</summary>
     [Fact]
     public async Task FromConfigDb_populates_Tags_and_VirtualTags_and_surfaces_collision()
     {
         SeedEquipment("eq-1");
-        _db.Tags.Add(BuildTag(equipmentId: "eq-1", name: "speed"));
-        _db.VirtualTags.Add(BuildVirtualTag(equipmentId: "eq-1", name: "speed"));
+        _db.Tags.Add(BuildTag(name: "speed"));
+        _db.VirtualTags.Add(BuildVirtualTag(equipmentId: "eq-1", name: "speed", suffix: "a"));
+        _db.VirtualTags.Add(BuildVirtualTag(equipmentId: "eq-1", name: "speed", suffix: "b"));
         await _db.SaveChangesAsync();
 
         var snapshot = await DraftSnapshotFactory.FromConfigDbAsync(_db);
 
         snapshot.Tags.Count.ShouldBe(1);
-        snapshot.VirtualTags.Count.ShouldBe(1);
-        DraftValidator.Validate(snapshot).ShouldContain(e => e.Code == "EquipmentSignalNameCollision");
+        snapshot.VirtualTags.Count.ShouldBe(2);
+        DraftValidator.Validate(snapshot).ShouldContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
-    /// <summary>A Tag and a VirtualTag with distinct names under the same equipment do not collide,
-    /// so the snapshot validates clean of the collision code.</summary>
+    /// <summary>Distinct VirtualTag names under the same equipment do not collide, so the snapshot
+    /// validates clean of the collision code.</summary>
     [Fact]
     public async Task FromConfigDb_no_collision_when_names_differ()
     {
         SeedEquipment("eq-1");
-        _db.Tags.Add(BuildTag(equipmentId: "eq-1", name: "speed"));
+        _db.Tags.Add(BuildTag(name: "speed"));
         _db.VirtualTags.Add(BuildVirtualTag(equipmentId: "eq-1", name: "temperature"));
         await _db.SaveChangesAsync();
 
@@ -60,7 +62,7 @@ public sealed class DraftSnapshotFactoryTests : IDisposable
 
         snapshot.Tags.Count.ShouldBe(1);
         snapshot.VirtualTags.Count.ShouldBe(1);
-        DraftValidator.Validate(snapshot).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(snapshot).ShouldNotContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
     /// <summary>Seeds one active and one released reservation for the same equipment context;
@@ -109,26 +111,25 @@ public sealed class DraftSnapshotFactoryTests : IDisposable
             EquipmentUuid = uuid,
             EquipmentId = equipmentId,
             Name = "eq",
-            DriverInstanceId = "d",
             UnsLineId = "line-a",
             MachineCode = "m",
         });
     }
 
-    private static Tag BuildTag(string equipmentId, string name) => new()
+    // v3: Tags are raw-only (DeviceId FK, no EquipmentId/DriverInstanceId).
+    private static Tag BuildTag(string name) => new()
     {
         TagId = $"tag-{name}",
-        DriverInstanceId = "d",
-        EquipmentId = equipmentId,
+        DeviceId = "dev-1",
         Name = name,
         DataType = "Float",
         AccessLevel = TagAccessLevel.Read,
         TagConfig = "{}",
     };
 
-    private static VirtualTag BuildVirtualTag(string equipmentId, string name) => new()
+    private static VirtualTag BuildVirtualTag(string equipmentId, string name, string suffix = "") => new()
     {
-        VirtualTagId = $"vtag-{name}",
+        VirtualTagId = $"vtag-{name}{suffix}",
         EquipmentId = equipmentId,
         Name = name,
         DataType = "Float",
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorGalaxyFullNameCorpusTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorGalaxyFullNameCorpusTests.cs
deleted file mode 100644
index e4af659e..00000000
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorGalaxyFullNameCorpusTests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-using ZB.MOM.WW.OtOpcUa.Configuration.Validation;
-
-namespace ZB.MOM.WW.OtOpcUa.Configuration.Tests;
-
-/// <summary>
-///     Characterization net (R2-11) pinning the DraftValidator Galaxy rule's <em>explicit</em>-FullName
-///     semantics across the golden TagConfig corpus BEFORE the private FullName reader is delegated to
-///     <c>TagConfigIntent.Parse(...).ExplicitFullName</c>. Distinct from the walker/composer raw-blob
-///     fallback: <c>GalaxyTagMissingReference</c> fires whenever the TagConfig has no usable
-///     <em>explicit</em> string <c>FullName</c> — i.e. absent / non-string / whitespace / non-object /
-///     malformed — and does NOT fire only when a non-blank string FullName is present. Must be green on
-///     the unmodified tree and stay green through the swap.
-/// </summary>
-public sealed class DraftValidatorGalaxyFullNameCorpusTests
-{
-    [Theory]
-    // Present, non-blank string FullName → rule does NOT fire
-    [InlineData("{\"FullName\":\"X.Y\"}", false)]
-    [InlineData("{\"FullName\":\"A.B\",\"region\":\"Coils\"}", false)]
-    // Absent / non-string / whitespace / non-object / malformed → rule FIRES
-    [InlineData("{}", true)]
-    [InlineData("{\"region\":\"HoldingRegisters\"}", true)]
-    [InlineData("{\"FullName\":123}", true)]
-    [InlineData("{\"FullName\":\"   \"}", true)]
-    [InlineData("[1,2]", true)]
-    [InlineData("not json {", true)]
-    public void Galaxy_missing_reference_fires_iff_no_explicit_string_FullName(string tagConfig, bool shouldFire)
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1,
-            ClusterId = "c",
-            DriverInstances =
-            [
-                new DriverInstance
-                {
-                    DriverInstanceId = "d-galaxy", ClusterId = "c", NamespaceId = "ns-1",
-                    Name = "Galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}",
-                },
-            ],
-            Tags =
-            [
-                new Tag
-                {
-                    TagId = "tag-galaxytag", DriverInstanceId = "d-galaxy", EquipmentId = "eq-1",
-                    Name = "galaxytag", FolderPath = null, DataType = "Float",
-                    AccessLevel = TagAccessLevel.Read, TagConfig = tagConfig,
-                },
-            ],
-        };
-
-        var fired = DraftValidator.Validate(draft)
-            .Any(e => e.Code == "GalaxyTagMissingReference" && e.Context == "tag-galaxytag");
-        fired.ShouldBe(shouldFire);
-    }
-}
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
index e283867f..adcf5dd8 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
@@ -6,6 +6,14 @@ using ZB.MOM.WW.OtOpcUa.Configuration.Validation;
 
 namespace ZB.MOM.WW.OtOpcUa.Configuration.Tests;
 
+/// <summary>
+///     v3 WP1: the namespace-binding + Galaxy-FullName rules are retired (Namespace entity gone;
+///     Tags are raw-only, not equipment-bound). The retained rules (UNS segments, path length,
+///     EquipmentUuid immutability, external-id reservation preflight, EquipmentId derivation,
+///     cluster topology, VirtualTag equipment-signal collision) are exercised below against the v3
+///     entity shapes. WP4 (Wave C) adds the new v3 rules (raw-name charset, historized-tagname length,
+///     UNS effective-leaf uniqueness).
+/// </summary>
 [Trait("Category", "Unit")]
 public sealed class DraftValidatorTests
 {
@@ -32,7 +40,6 @@ public sealed class DraftValidatorTests
                     EquipmentUuid = uuid,
                     EquipmentId = DraftValidator.DeriveEquipmentId(uuid),
                     Name = name,
-                    DriverInstanceId = "d",
                     UnsLineId = "line-a",
                     MachineCode = "m",
                 },
@@ -44,35 +51,6 @@ public sealed class DraftValidatorTests
         hasUnsError.ShouldBe(!shouldPass);
     }
 
-    /// <summary>Verifies that namespace cannot be bound to a different cluster.</summary>
-    [Fact]
-    public void Cross_cluster_namespace_binding_is_rejected()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c-A",
-            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c-B", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c-A", NamespaceId = "ns-1", Name = "drv", DriverType = "Modbus", DriverConfig = "{}" }],
-        };
-
-        var errors = DraftValidator.Validate(draft);
-        errors.ShouldContain(e => e.Code == "BadCrossClusterNamespaceBinding");
-    }
-
-    /// <summary>Verifies that namespace in the same cluster is accepted.</summary>
-    [Fact]
-    public void Same_cluster_namespace_binding_is_accepted()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c-A",
-            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c-A", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c-A", NamespaceId = "ns-1", Name = "drv", DriverType = "Modbus", DriverConfig = "{}" }],
-        };
-
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "BadCrossClusterNamespaceBinding");
-    }
-
     /// <summary>Verifies that equipment UUID must remain immutable across generations.</summary>
     [Fact]
     public void EquipmentUuid_change_across_generations_is_rejected()
@@ -84,8 +62,8 @@ public sealed class DraftValidatorTests
         var draft = new DraftSnapshot
         {
             GenerationId = 2, ClusterId = "c",
-            Equipment = [new Equipment { EquipmentUuid = newUuid, EquipmentId = eid, Name = "eq", DriverInstanceId = "d", UnsLineId = "line-a", MachineCode = "m" }],
-            PriorEquipment = [new Equipment { EquipmentUuid = oldUuid, EquipmentId = eid, Name = "eq", DriverInstanceId = "d", UnsLineId = "line-a", MachineCode = "m" }],
+            Equipment = [new Equipment { EquipmentUuid = newUuid, EquipmentId = eid, Name = "eq", UnsLineId = "line-a", MachineCode = "m" }],
+            PriorEquipment = [new Equipment { EquipmentUuid = oldUuid, EquipmentId = eid, Name = "eq", UnsLineId = "line-a", MachineCode = "m" }],
         };
 
         DraftValidator.Validate(draft).ShouldContain(e => e.Code == "EquipmentUuidImmutable");
@@ -101,7 +79,7 @@ public sealed class DraftValidatorTests
         var draft = new DraftSnapshot
         {
             GenerationId = 1, ClusterId = "c",
-            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = DraftValidator.DeriveEquipmentId(uuid), Name = "eq", DriverInstanceId = "d", UnsLineId = "line-a", MachineCode = "m", ZTag = "ZT-001" }],
+            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = DraftValidator.DeriveEquipmentId(uuid), Name = "eq", UnsLineId = "line-a", MachineCode = "m", ZTag = "ZT-001" }],
             ActiveReservations = [new ExternalIdReservation { Kind = ReservationKind.ZTag, Value = "ZT-001", EquipmentUuid = otherUuid, ClusterId = "c", FirstPublishedBy = "t" }],
         };
 
@@ -116,96 +94,38 @@ public sealed class DraftValidatorTests
         var draft = new DraftSnapshot
         {
             GenerationId = 1, ClusterId = "c",
-            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = "EQ-operator-typed", Name = "eq", DriverInstanceId = "d", UnsLineId = "line-a", MachineCode = "m" }],
+            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = "EQ-operator-typed", Name = "eq", UnsLineId = "line-a", MachineCode = "m" }],
         };
 
         DraftValidator.Validate(draft).ShouldContain(e => e.Code == "EquipmentIdNotDerived");
     }
 
-    /// <summary>Verifies that the canonical Galaxy driver type (GalaxyMxGateway, per PR 7.2 —
-    /// it was "Galaxy" pre-PR-7.2) is a standard Equipment-kind driver: binding it to an
-    /// Equipment namespace produces no kind-mismatch error.</summary>
+    /// <summary>Verifies that all violations are reported simultaneously (single-pass validation).</summary>
     [Fact]
-    public void GalaxyMxGateway_driver_in_Equipment_namespace_is_allowed()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c",
-            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c", NamespaceId = "ns-1", Name = "drv", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
-        };
-
-        DraftValidator.Validate(draft).ShouldBeEmpty();
-    }
-
-    /// <summary>Verifies that all validation errors are reported simultaneously.</summary>
-    [Fact]
-    public void Draft_with_three_violations_surfaces_all_three()
+    public void Draft_with_multiple_violations_surfaces_all_of_them()
     {
         var uuid = Guid.NewGuid();
         var draft = new DraftSnapshot
         {
-            GenerationId = 1, ClusterId = "c-A",
-            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c-B", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c-A", NamespaceId = "ns-1", Name = "drv", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
-            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = "EQ-wrong", Name = "BAD NAME", DriverInstanceId = "d-1", UnsLineId = "line-a", MachineCode = "m" }],
+            GenerationId = 1, ClusterId = "c",
+            // EQ-wrong is not the canonical derivation, and "BAD NAME" fails the UNS segment regex.
+            Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = "EQ-wrong", Name = "BAD NAME", UnsLineId = "line-a", MachineCode = "m" }],
         };
 
         var errors = DraftValidator.Validate(draft);
-        errors.ShouldContain(e => e.Code == "BadCrossClusterNamespaceBinding");
         errors.ShouldContain(e => e.Code == "EquipmentIdNotDerived");
         errors.ShouldContain(e => e.Code == "UnsSegmentInvalid");
     }
 
-    // ------------------------------------------------------------------------------------
-    // Full-config probe — proves a realistic canonical deployed config passes ALL rules.
-    // This guards the deploy-path gate flip (reject-on-ANY-error): if a clean canonical
-    // config fired any rule, flipping the gate would block every deploy.
-    // ------------------------------------------------------------------------------------
-
-    /// <summary>Probe for the deploy-path gate activation: a full, realistic config modelling
-    /// the REAL deployed shape. Galaxy is now a standard Equipment-kind driver (the SystemPlatform
-    /// namespace split is retired), so the GalaxyMxGateway driver + its Galaxy-hierarchy Tags
-    /// (EquipmentId=null from the seed) live in the Equipment namespace alongside a Modbus driver
-    /// + UNS area/line + canonical Equipment rows + VirtualTags from the company overlay. This must
-    /// produce ZERO validation errors so the reject-on-any-error gate is safe to activate.</summary>
+    /// <summary>Probe for the deploy-path gate: a full, realistic v3 config (UNS area/line +
+    /// canonical Equipment + distinct-named VirtualTags) must produce ZERO validation errors so the
+    /// reject-on-any-error deploy gate is safe to activate.</summary>
     [Fact]
     public void Full_realistic_config_passes_all_rules()
     {
-        // Equipment side: Galaxy + Modbus drivers in a single Equipment namespace + UNS + canonical equipment.
-        var eqNamespace = new Namespace
-        {
-            NamespaceId = "MAIN-OPCUA-equipment",
-            ClusterId = "MAIN",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:zb:main:equipment",
-        };
-
-        // Galaxy hierarchy (OtOpcUa seed shape): GalaxyMxGateway driver, Tags carry EquipmentId=null.
-        var spDriver = new DriverInstance
-        {
-            DriverInstanceId = "main-galaxy",
-            ClusterId = "MAIN",
-            NamespaceId = eqNamespace.NamespaceId,
-            Name = "Galaxy",
-            DriverType = "GalaxyMxGateway",
-            DriverConfig = "{}",
-        };
-
-        var eqDriver = new DriverInstance
-        {
-            DriverInstanceId = "main-modbus",
-            ClusterId = "MAIN",
-            NamespaceId = eqNamespace.NamespaceId,
-            Name = "Modbus",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-
         var area = new UnsArea { UnsAreaId = "area-filling", ClusterId = "MAIN", Name = "filling" };
         var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = area.UnsAreaId, Name = "line-1" };
 
-        // Canonical EquipmentIds — derived from the EquipmentUuid via the same rule the overlay loader uses.
         var rinserUuid = Guid.NewGuid();
         var fillerUuid = Guid.NewGuid();
         var rinser = new Equipment
@@ -213,43 +133,27 @@ public sealed class DraftValidatorTests
             EquipmentUuid = rinserUuid,
             EquipmentId = DraftValidator.DeriveEquipmentId(rinserUuid),
             Name = "rinser-01",
-            DriverInstanceId = eqDriver.DriverInstanceId,
             UnsLineId = line.UnsLineId,
             MachineCode = "machine_001",
-            ZTag = null,
-            SAPID = null,
         };
         var filler = new Equipment
         {
             EquipmentUuid = fillerUuid,
             EquipmentId = DraftValidator.DeriveEquipmentId(fillerUuid),
             Name = "filler-02",
-            DriverInstanceId = eqDriver.DriverInstanceId,
             UnsLineId = line.UnsLineId,
             MachineCode = "machine_002",
-            ZTag = null,
-            SAPID = null,
         };
 
         var draft = new DraftSnapshot
         {
             GenerationId = 0,
             ClusterId = string.Empty,        // global snapshot — matches DraftSnapshotFactory.FromConfigDbAsync
-            // Enterprise/Site left null — matches the deploy path's conservative fallback
-            Namespaces = [eqNamespace],
-            DriverInstances = [spDriver, eqDriver],
             UnsAreas = [area],
             UnsLines = [line],
             Equipment = [rinser, filler],
-            Tags =
-            [
-                // Galaxy-hierarchy tags from the seed: EquipmentId null, Galaxy folder hierarchy.
-                BuildTag(equipmentId: null, name: "PV", folderPath: "Area.Tank01"),
-                BuildTag(equipmentId: null, name: "SP", folderPath: "Area.Tank01"),
-            ],
             VirtualTags =
             [
-                // One per equipment, names distinct within each owning equipment.
                 BuildVirtualTag(equipmentId: rinser.EquipmentId, name: "oee"),
                 BuildVirtualTag(equipmentId: filler.EquipmentId, name: "throughput"),
             ],
@@ -264,133 +168,46 @@ public sealed class DraftValidatorTests
     }
 
     // ------------------------------------------------------------------------------------
-    // Driver-less Equipment namespace — core safety claim (feat/driverless-equipment-namespace)
+    // ValidateNoUnsEffectiveNameCollision — v3: VirtualTag name uniqueness within equipment
     // ------------------------------------------------------------------------------------
 
-    /// <summary>Characterisation test: a draft that contains an Equipment-kind namespace with
-    /// ZERO <see cref="DriverInstance"/> rows, and a single <see cref="Equipment"/> whose
-    /// <see cref="Equipment.DriverInstanceId"/> is <see langword="null"/>, must pass
-    /// <see cref="DraftValidator.Validate"/> with no errors.  This locks in the design's core
-    /// safety claim — the validator must never implicitly require a driver for Equipment-namespace
-    /// equipment.</summary>
+    /// <summary>Two VirtualTags sharing (EquipmentId, Name) collide on a single OPC UA NodeId.</summary>
     [Fact]
-    public void Validate_accepts_driverless_equipment_in_driverless_equipment_namespace()
-    {
-        // An Equipment-kind namespace — no DriverInstance rows at all for this namespace.
-        var eqNamespace = new Namespace
-        {
-            NamespaceId = "MAIN-OPCUA-equipment",
-            ClusterId = "MAIN",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:zb:main:equipment",
-        };
-
-        // UNS topology required by ValidateUnsSegments / ValidatePathLength.
-        var area = new UnsArea { UnsAreaId = "area-filling", ClusterId = "MAIN", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = area.UnsAreaId, Name = "line-1" };
-
-        // Canonical EquipmentId derived from UUID — satisfies ValidateEquipmentIdDerivation.
-        var uuid = Guid.NewGuid();
-        var equipment = new Equipment
-        {
-            EquipmentUuid    = uuid,
-            EquipmentId      = DraftValidator.DeriveEquipmentId(uuid),
-            Name             = "rinser-01",
-            DriverInstanceId = null,           // ← driver-less: the property under test
-            UnsLineId        = line.UnsLineId,
-            MachineCode      = "machine_001",
-            ZTag             = null,
-            SAPID            = null,
-        };
-
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 0,
-            ClusterId    = string.Empty,       // global snapshot — matches DraftSnapshotFactory.FromConfigDbAsync
-            Namespaces       = [eqNamespace],  // Equipment namespace present
-            DriverInstances  = [],             // ← zero drivers: the other half of the safety claim
-            UnsAreas         = [area],
-            UnsLines         = [line],
-            Equipment        = [equipment],
-        };
-
-        var errors = DraftValidator.Validate(draft);
-
-        errors.ShouldBeEmpty(
-            "a driver-less Equipment in an Equipment-kind namespace with no DriverInstances must pass " +
-            "all validator rules; firing rules: " +
-            string.Join("; ", errors.Select(e => $"[{e.Code}] {e.Message}")));
-    }
-
-    // ------------------------------------------------------------------------------------
-    // ValidateNoEquipmentSignalNameCollision — Tag/VirtualTag NodeId collision
-    // ------------------------------------------------------------------------------------
-
-    /// <summary>Verifies that an equipment-bound Tag and a VirtualTag sharing the same
-    /// equipment+name collide on a single OPC UA NodeId.</summary>
-    [Fact]
-    public void Tag_and_VirtualTag_same_equipment_and_name_collide()
+    public void Two_VirtualTags_same_equipment_and_name_collide()
     {
         var draft = new DraftSnapshot
         {
             GenerationId = 1, ClusterId = "c",
-            Tags = [BuildTag(equipmentId: "eq-1", name: "speed", folderPath: null)],
-            VirtualTags = [BuildVirtualTag(equipmentId: "eq-1", name: "speed")],
+            VirtualTags =
+            [
+                BuildVirtualTag(equipmentId: "eq-1", name: "speed", suffix: "a"),
+                BuildVirtualTag(equipmentId: "eq-1", name: "speed", suffix: "b"),
+            ],
         };
 
-        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
-    /// <summary>Verifies that a Tag in a sub-folder does not collide with a VirtualTag at the
-    /// equipment root even when the names match — the NodeId keys differ.</summary>
+    /// <summary>VirtualTags with the same name under DIFFERENT equipment do not collide.</summary>
     [Fact]
-    public void Same_name_different_folder_does_not_collide()
+    public void Same_name_different_equipment_does_not_collide()
     {
         var draft = new DraftSnapshot
         {
             GenerationId = 1, ClusterId = "c",
-            Tags = [BuildTag(equipmentId: "eq-1", name: "speed", folderPath: "metrics")],
-            VirtualTags = [BuildVirtualTag(equipmentId: "eq-1", name: "speed")],
+            VirtualTags =
+            [
+                BuildVirtualTag(equipmentId: "eq-1", name: "speed"),
+                BuildVirtualTag(equipmentId: "eq-2", name: "speed"),
+            ],
         };
 
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
-    /// <summary>Verifies that a FolderPath-scoped tag (EquipmentId == null) is excluded from the
-    /// equipment-signal node space and so never collides with an equipment VirtualTag.</summary>
-    [Fact]
-    public void Unbound_tag_EquipmentId_null_does_not_collide_with_equipment_vtag()
+    private static VirtualTag BuildVirtualTag(string equipmentId, string name, string suffix = "") => new()
     {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c",
-            Tags = [BuildTag(equipmentId: null, name: "speed", folderPath: null)],
-            VirtualTags = [BuildVirtualTag(equipmentId: "eq-1", name: "speed")],
-        };
-
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
-    }
-
-    private static Tag BuildTag(
-        string? equipmentId,
-        string name,
-        string? folderPath,
-        string driverInstanceId = "d",
-        string tagConfig = "{}") => new()
-    {
-        TagId = $"tag-{name}",
-        DriverInstanceId = driverInstanceId,
-        EquipmentId = equipmentId,
-        Name = name,
-        FolderPath = folderPath,
-        DataType = "Float",
-        AccessLevel = TagAccessLevel.Read,
-        TagConfig = tagConfig,
-    };
-
-    private static VirtualTag BuildVirtualTag(string equipmentId, string name) => new()
-    {
-        VirtualTagId = $"vtag-{name}",
+        VirtualTagId = $"vtag-{equipmentId}-{name}{suffix}",
         EquipmentId = equipmentId,
         Name = name,
         DataType = "Float",
@@ -398,58 +215,7 @@ public sealed class DraftValidatorTests
     };
 
     // ------------------------------------------------------------------------------------
-    // ValidateGalaxyTagFullName — Galaxy equipment tags must carry TagConfig.FullName
-    // ------------------------------------------------------------------------------------
-
-    /// <summary>Verifies that an equipment-scoped Tag bound to a GalaxyMxGateway driver whose
-    /// TagConfig has no FullName (a Galaxy tag with no Galaxy reference) is rejected — it would
-    /// subscribe to nothing.</summary>
-    [Fact]
-    public void GalaxyTag_missing_FullName_is_rejected()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c",
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-galaxy", ClusterId = "c", NamespaceId = "ns-1", Name = "Galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
-            Tags = [BuildTag(equipmentId: "eq-1", name: "galaxytag", folderPath: null, driverInstanceId: "d-galaxy", tagConfig: "{}")],
-        };
-
-        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "GalaxyTagMissingReference" && e.Context == "tag-galaxytag");
-    }
-
-    /// <summary>Verifies that an equipment-scoped Galaxy tag carrying a TagConfig.FullName
-    /// reference is accepted.</summary>
-    [Fact]
-    public void GalaxyTag_with_FullName_is_accepted()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c",
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-galaxy", ClusterId = "c", NamespaceId = "ns-1", Name = "Galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
-            Tags = [BuildTag(equipmentId: "eq-1", name: "galaxytag", folderPath: null, driverInstanceId: "d-galaxy", tagConfig: "{\"FullName\":\"X.Y\"}")],
-        };
-
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "GalaxyTagMissingReference");
-    }
-
-    /// <summary>Verifies that an equipment-scoped Tag bound to a NON-Galaxy driver with an empty
-    /// TagConfig is NOT flagged as a Galaxy tag missing its reference — only GalaxyMxGateway-bound
-    /// equipment tags carry the Galaxy FullName requirement.</summary>
-    [Fact]
-    public void GalaxyTag_check_skips_nonGalaxy_equipment_tag()
-    {
-        var draft = new DraftSnapshot
-        {
-            GenerationId = 1, ClusterId = "c",
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-modbus", ClusterId = "c", NamespaceId = "ns-1", Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}" }],
-            Tags = [BuildTag(equipmentId: "eq-1", name: "galaxytag", folderPath: null, driverInstanceId: "d-modbus", tagConfig: "{}")],
-        };
-
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "GalaxyTagMissingReference");
-    }
-
-    // ------------------------------------------------------------------------------------
-    // Phase 6.3 task #148 part 2 — ValidateClusterTopology
+    // Phase 6.3 task #148 part 2 — ValidateClusterTopology (unchanged in v3)
     // ------------------------------------------------------------------------------------
 
     /// <summary>Verifies that cluster topology validation checks node count against declared redundancy mode.</summary>
@@ -479,7 +245,6 @@ public sealed class DraftValidatorTests
     [Fact]
     public void ValidateClusterTopology_flags_disabled_node_mismatch()
     {
-        // Declared 2 + Hot, but one node disabled — runtime would boot InvalidTopology.
         var cluster = BuildCluster(nodeCount: 2, mode: RedundancyMode.Hot);
         var nodes = new[]
         {
@@ -491,11 +256,6 @@ public sealed class DraftValidatorTests
         errors.ShouldContain(e => e.Code == "ClusterEnabledNodeCountMismatch");
     }
 
-    // v2: the "exactly one Primary per cluster" check is gone — Akka cluster's
-    // role-leader-of-"driver" elects the primary at runtime. The corresponding
-    // ValidateClusterTopology_flags_multiple_Primary test (and the
-    // ClusterMultiplePrimary error code it asserted) were removed alongside Task 14d.
-
     /// <summary>Verifies that a valid standalone cluster passes validation.</summary>
     [Fact]
     public void ValidateClusterTopology_returns_no_errors_on_valid_standalone()
@@ -540,13 +300,6 @@ public sealed class DraftValidatorTests
     [Fact]
     public void PathLength_uses_actual_Enterprise_Site_when_provided()
     {
-        // Craft a snapshot where the 32+32 approximation would flag PathTooLong but the
-        // actual Enterprise/Site lengths would not. Equipment name intentionally exceeds the
-        // UNS-segment 32-char limit (it would also trigger UnsSegmentInvalid — that is fine;
-        // both checks are independent and the test is filtering only on PathTooLong).
-        //
-        // approx: 32+32 + 32+32+90 +4 = 222  > 200 → would flag PathTooLong
-        // actual:  2 +1  + 32+32+90 +4 = 161 ≤ 200 → no PathTooLong
         var areaId = "area-a";
         var lineId = "line-b";
         var uuid = Guid.NewGuid();
@@ -567,7 +320,6 @@ public sealed class DraftValidatorTests
                     EquipmentUuid = uuid,
                     EquipmentId   = DraftValidator.DeriveEquipmentId(uuid),
                     Name          = eqName,
-                    DriverInstanceId = "d",
                     UnsLineId     = lineId,
                     MachineCode   = "m",
                 },
@@ -584,11 +336,6 @@ public sealed class DraftValidatorTests
     [Fact]
     public void PathLength_conservative_fallback_when_Enterprise_Site_absent()
     {
-        // Without Enterprise/Site on the snapshot the validator assumes 32+32.
-        // A path whose segments sum to 93 chars (area=32 + line=32 + eq=29) fits
-        // under 200 even with the 32+32 approximation (32+32+93+4 = 161 ≤ 200) and
-        // must NOT be flagged — the fallback must not over-penalise valid paths that
-        // would also be valid under real Enterprise/Site values.
         var areaId = "area-x";
         var lineId = "line-y";
         var uuid = Guid.NewGuid();
@@ -597,7 +344,6 @@ public sealed class DraftValidatorTests
         {
             GenerationId = 1,
             ClusterId = "c",
-            // Enterprise and Site deliberately omitted — conservative fallback path
             UnsAreas = [new UnsArea { UnsAreaId = areaId, ClusterId = "c", Name = new string('a', 32) }],
             UnsLines = [new UnsLine { UnsLineId = lineId, UnsAreaId = areaId, Name = new string('b', 32) }],
             Equipment =
@@ -607,7 +353,6 @@ public sealed class DraftValidatorTests
                     EquipmentUuid = uuid,
                     EquipmentId   = DraftValidator.DeriveEquipmentId(uuid),
                     Name          = new string('c', 29),
-                    DriverInstanceId = "d",
                     UnsLineId     = lineId,
                     MachineCode   = "m",
                 },
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/RawSchemaIntegrityTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/RawSchemaIntegrityTests.cs
new file mode 100644
index 00000000..07d37353
--- /dev/null
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/RawSchemaIntegrityTests.cs
@@ -0,0 +1,191 @@
+using Microsoft.EntityFrameworkCore;
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Configuration;
+using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
+using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
+
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Tests;
+
+/// <summary>
+///     v3 WP1 — exercises the DB-enforceable integrity + sibling-name uniqueness rules of the Raw tree
+///     against the real SQL schema (the filtered unique indexes over nullable parent columns and the
+///     UnsTagReference (Equipment, Tag) uniqueness). Runs against the shared SchemaComplianceFixture DB;
+///     every row uses a GUID-suffixed logical id so tests do not clobber one another.
+/// </summary>
+[Trait("Category", "SchemaCompliance")]
+[Collection(nameof(SchemaComplianceCollection))]
+public sealed class RawSchemaIntegrityTests
+{
+    private readonly SchemaComplianceFixture _fixture;
+
+    /// <summary>Initializes a new instance of the <see cref="RawSchemaIntegrityTests"/> class.</summary>
+    /// <param name="fixture">The schema compliance fixture (real SQL DB).</param>
+    public RawSchemaIntegrityTests(SchemaComplianceFixture fixture) => _fixture = fixture;
+
+    private OtOpcUaConfigDbContext NewContext()
+    {
+        var options = new DbContextOptionsBuilder<OtOpcUaConfigDbContext>()
+            .UseSqlServer(_fixture.ConnectionString)
+            .Options;
+        return new OtOpcUaConfigDbContext(options);
+    }
+
+    // Logical ids are nvarchar(64); prefix + '-' + 32 hex stays well under that.
+    private static string Id(string prefix) => $"{prefix}-{Guid.NewGuid():N}";
+
+    private string SeedCluster()
+    {
+        var clusterId = Id("cl");
+        using var db = NewContext();
+        db.ServerClusters.Add(new ServerCluster
+        {
+            ClusterId = clusterId,
+            Name = Id("Cluster"),
+            Enterprise = "zb",
+            Site = "dev",
+            NodeCount = 1,
+            RedundancyMode = RedundancyMode.None,
+            CreatedBy = "wp1-test",
+        });
+        db.SaveChanges();
+        return clusterId;
+    }
+
+    [Fact]
+    public void RawFolder_root_sibling_name_must_be_unique_within_cluster()
+    {
+        var clusterId = SeedCluster();
+        using var db = NewContext();
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterId, Name = "plc-area" });
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterId, Name = "plc-area" });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void RawFolder_same_root_name_in_different_cluster_is_allowed()
+    {
+        var clusterA = SeedCluster();
+        var clusterB = SeedCluster();
+        using var db = NewContext();
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterA, Name = "shared-name" });
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterB, Name = "shared-name" });
+
+        Should.NotThrow(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void RawFolder_nested_sibling_name_must_be_unique_within_parent()
+    {
+        var clusterId = SeedCluster();
+        var parentId = Id("rf-parent");
+        using var db = NewContext();
+        db.RawFolders.Add(new RawFolder { RawFolderId = parentId, ClusterId = clusterId, Name = "parent" });
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterId, ParentRawFolderId = parentId, Name = "child" });
+        db.RawFolders.Add(new RawFolder { RawFolderId = Id("rf"), ClusterId = clusterId, ParentRawFolderId = parentId, Name = "child" });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void DriverInstance_cluster_root_sibling_name_must_be_unique()
+    {
+        var clusterId = SeedCluster();
+        using var db = NewContext();
+        db.DriverInstances.Add(new DriverInstance { DriverInstanceId = Id("di"), ClusterId = clusterId, Name = "modbus", DriverType = "Modbus", DriverConfig = "{}" });
+        db.DriverInstances.Add(new DriverInstance { DriverInstanceId = Id("di"), ClusterId = clusterId, Name = "modbus", DriverType = "Modbus", DriverConfig = "{}" });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void Device_sibling_name_must_be_unique_within_driver()
+    {
+        var driverId = Id("di");
+        using var db = NewContext();
+        db.Devices.Add(new Device { DeviceId = Id("dev"), DriverInstanceId = driverId, Name = "plc-1", DeviceConfig = "{}" });
+        db.Devices.Add(new Device { DeviceId = Id("dev"), DriverInstanceId = driverId, Name = "plc-1", DeviceConfig = "{}" });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void TagGroup_device_root_sibling_name_must_be_unique()
+    {
+        var deviceId = Id("dev");
+        using var db = NewContext();
+        db.TagGroups.Add(new TagGroup { TagGroupId = Id("tg"), DeviceId = deviceId, Name = "motors" });
+        db.TagGroups.Add(new TagGroup { TagGroupId = Id("tg"), DeviceId = deviceId, Name = "motors" });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void Tag_device_root_sibling_name_must_be_unique()
+    {
+        var deviceId = Id("dev");
+        using var db = NewContext();
+        db.Tags.Add(NewTag(deviceId, tagGroupId: null, name: "speed"));
+        db.Tags.Add(NewTag(deviceId, tagGroupId: null, name: "speed"));
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void Tag_grouped_sibling_name_must_be_unique_within_group()
+    {
+        var deviceId = Id("dev");
+        var groupId = Id("tg");
+        using var db = NewContext();
+        db.Tags.Add(NewTag(deviceId, tagGroupId: groupId, name: "speed"));
+        db.Tags.Add(NewTag(deviceId, tagGroupId: groupId, name: "speed"));
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void Tag_same_name_in_different_groups_is_allowed()
+    {
+        var deviceId = Id("dev");
+        using var db = NewContext();
+        db.Tags.Add(NewTag(deviceId, tagGroupId: Id("tg"), name: "speed"));
+        db.Tags.Add(NewTag(deviceId, tagGroupId: Id("tg"), name: "speed"));
+
+        Should.NotThrow(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void UnsTagReference_equipment_tag_pair_must_be_unique()
+    {
+        var equipmentId = Id("eq");
+        var tagId = Id("tag");
+        using var db = NewContext();
+        db.UnsTagReferences.Add(new UnsTagReference { UnsTagReferenceId = Id("utr"), EquipmentId = equipmentId, TagId = tagId });
+        db.UnsTagReferences.Add(new UnsTagReference { UnsTagReferenceId = Id("utr"), EquipmentId = equipmentId, TagId = tagId });
+
+        Should.Throw<DbUpdateException>(() => db.SaveChanges());
+    }
+
+    [Fact]
+    public void UnsTagReference_same_tag_different_equipment_is_allowed()
+    {
+        var tagId = Id("tag");
+        using var db = NewContext();
+        db.UnsTagReferences.Add(new UnsTagReference { UnsTagReferenceId = Id("utr"), EquipmentId = Id("eq"), TagId = tagId });
+        db.UnsTagReferences.Add(new UnsTagReference { UnsTagReferenceId = Id("utr"), EquipmentId = Id("eq"), TagId = tagId });
+
+        Should.NotThrow(() => db.SaveChanges());
+    }
+
+    private static Tag NewTag(string deviceId, string? tagGroupId, string name) => new()
+    {
+        TagId = Id("tag"),
+        DeviceId = deviceId,
+        TagGroupId = tagGroupId,
+        Name = name,
+        DataType = "Float",
+        AccessLevel = TagAccessLevel.Read,
+        TagConfig = "{}",
+    };
+}
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/SchemaComplianceTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/SchemaComplianceTests.cs
index eb39e9b4..63c8b615 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/SchemaComplianceTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/SchemaComplianceTests.cs
@@ -28,14 +28,15 @@ public sealed class SchemaComplianceTests
         {
             "ServerCluster", "ClusterNode", "ClusterNodeCredential",
             "ConfigAuditLog",
-            "Namespace", "UnsArea", "UnsLine",
+            "UnsArea", "UnsLine",
+            // v3 Raw-tree tables (Namespace retired; RawFolder/TagGroup/UnsTagReference added)
+            "RawFolder", "TagGroup", "UnsTagReference",
             "DriverInstance", "Device", "Equipment", "Tag", "PollGroup", "VirtualTag",
             "NodeAcl", "ExternalIdReservation",
             "DriverHostStatus",
             "DriverInstanceResilienceStatus",
             "LdapGroupRoleMapping",
-            "EquipmentImportBatch",
-            "EquipmentImportRow",
+            // v3 dropped the orphaned EquipmentImportBatch / EquipmentImportRow tables
             "Script", "ScriptedAlarm", "ScriptedAlarmState",
             // v2 deploy-model tables (Phase 1 of Akka + fused-hosting alignment)
             "Deployment", "NodeDeploymentState", "ConfigEdit", "DataProtectionKeys",
@@ -60,6 +61,15 @@ SELECT name FROM sys.tables WHERE name <> '__EFMigrationsHistory' ORDER BY name;
         {
             ("UX_ClusterNodeCredential_Value", "([Enabled]=(1))"),
             ("UX_ExternalIdReservation_KindValue_Active", "([ReleasedAt] IS NULL)"),
+            // v3 sibling-name filtered unique indexes over nullable parent columns.
+            ("UX_RawFolder_Parent_Name", "([ParentRawFolderId] IS NOT NULL)"),
+            ("UX_RawFolder_ClusterRoot_Name", "([ParentRawFolderId] IS NULL)"),
+            ("UX_DriverInstance_Folder_Name", "([RawFolderId] IS NOT NULL)"),
+            ("UX_DriverInstance_ClusterRoot_Name", "([RawFolderId] IS NULL)"),
+            ("UX_TagGroup_Parent_Name", "([ParentTagGroupId] IS NOT NULL)"),
+            ("UX_TagGroup_DeviceRoot_Name", "([ParentTagGroupId] IS NULL)"),
+            ("UX_Tag_Group_Name", "([TagGroupId] IS NOT NULL)"),
+            ("UX_Tag_Device_Name", "([TagGroupId] IS NULL)"),
         };
 
         var rows = QueryRows(@"
@@ -148,20 +158,36 @@ SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Equipment
             columns.ShouldContain(col, $"Equipment missing expected column: {col}");
     }
 
-    /// <summary>Verifies that Namespace has at least one unique index.</summary>
+    /// <summary>Verifies the retired v2 tables (Namespace, EquipmentImportBatch/Row) are absent.</summary>
     [Fact]
-    public void Namespace_has_some_unique_index()
+    public void Retired_v2_tables_are_absent()
     {
-        // v2 dropped the "per-generation" qualifier from namespace uniqueness when live-edit
-        // replaced draft/publish. The v2 index name is implementation-defined; assert that
-        // *some* unique index exists on Namespace to catch unintentional index drops.
-        var indexes = QueryStrings(@"
+        var tables = QueryStrings("SELECT name FROM sys.tables;").ToHashSet();
+        tables.ShouldNotContain("Namespace");
+        tables.ShouldNotContain("EquipmentImportBatch");
+        tables.ShouldNotContain("EquipmentImportRow");
+    }
+
+    /// <summary>Verifies the new v3 Raw-tree tables each carry their logical-id unique index.</summary>
+    [Fact]
+    public void V3_raw_tree_tables_have_logical_id_unique_indexes()
+    {
+        var expected = new[]
+        {
+            ("RawFolder", "UX_RawFolder_LogicalId"),
+            ("TagGroup", "UX_TagGroup_LogicalId"),
+            ("UnsTagReference", "UX_UnsTagReference_LogicalId"),
+        };
+
+        foreach (var (table, index) in expected)
+        {
+            var indexes = QueryStrings($@"
 SELECT i.name
 FROM   sys.indexes i
 JOIN   sys.tables  t ON i.object_id = t.object_id
-WHERE  t.name = 'Namespace' AND i.is_unique = 1;").ToList();
-
-        indexes.ShouldNotBeEmpty();
+WHERE  t.name = '{table}' AND i.is_unique = 1;").ToHashSet();
+            indexes.ShouldContain(index, $"{table} missing unique index {index}");
+        }
     }
 
     private List<string> QueryStrings(string sql)
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ScriptingEntitiesTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ScriptingEntitiesTests.cs
index e0b65a4b..f18cb47a 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ScriptingEntitiesTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ScriptingEntitiesTests.cs
@@ -182,13 +182,13 @@ public sealed class ScriptingEntitiesTests
         ctx.ScriptedAlarmStates.ShouldNotBeNull();
     }
 
-    /// <summary>Verifies that the AddPhase7ScriptingTables migration exists in the assembly.</summary>
+    /// <summary>Verifies that the squashed V3Initial migration exists in the assembly.</summary>
     [Fact]
-    public void AddPhase7ScriptingTables_migration_exists_in_assembly()
+    public void V3Initial_migration_exists_in_assembly()
     {
-        // The migration type carries the design-time snapshot + Up/Down methods EF uses to
-        // apply the schema. Missing = schema won't roll forward in deployments.
-        var t = typeof(Migrations.AddPhase7ScriptingTables);
+        // v3 WP1 squashed every prior migration into V3Initial. The migration type carries the
+        // design-time snapshot + Up/Down (incl. the scripting tables) EF uses to apply the schema.
+        var t = typeof(Migrations.V3Initial);
         t.ShouldNotBeNull();
     }
 }
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/DriverTypeRegistryTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/DriverTypeRegistryTests.cs
index bbd9990f..61e401a0 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/DriverTypeRegistryTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/DriverTypeRegistryTests.cs
@@ -8,9 +8,8 @@ public sealed class DriverTypeRegistryTests
 {
     private static DriverTypeMetadata SampleMetadata(
         string typeName = "Modbus",
-        NamespaceKindCompatibility allowed = NamespaceKindCompatibility.Equipment,
         DriverTier tier = DriverTier.B) =>
-        new(typeName, allowed,
+        new(typeName,
             DriverConfigJsonSchema: "{\"type\": \"object\"}",
             DeviceConfigJsonSchema: "{\"type\": \"object\"}",
             TagConfigJsonSchema: "{\"type\": \"object\"}",
@@ -118,7 +117,7 @@ public sealed class DriverTypeRegistryTests
         var registry = new DriverTypeRegistry();
         registry.Register(SampleMetadata("Modbus"));
         registry.Register(SampleMetadata("S7"));
-        registry.Register(SampleMetadata("Galaxy", NamespaceKindCompatibility.Equipment));
+        registry.Register(SampleMetadata("Galaxy"));
 
         var all = registry.All();
 
@@ -126,22 +125,6 @@ public sealed class DriverTypeRegistryTests
         all.Select(m => m.TypeName).ShouldBe(new[] { "Modbus", "S7", "Galaxy" }, ignoreOrder: true);
     }
 
-    /// <summary>
-    /// Verifies that NamespaceKindCompatibility flags are implemented as a bitmask.
-    /// </summary>
-    [Fact]
-    public void NamespaceKindCompatibility_FlagsAreBitmask()
-    {
-        // Per decision #111 — driver types may be valid for multiple namespace kinds.
-        var both = NamespaceKindCompatibility.Equipment | NamespaceKindCompatibility.Simulated;
-
-        both.HasFlag(NamespaceKindCompatibility.Equipment).ShouldBeTrue();
-        both.HasFlag(NamespaceKindCompatibility.Simulated).ShouldBeTrue();
-
-        // A single-flag value does not carry the other flag — proves these are real bitmask bits.
-        NamespaceKindCompatibility.Equipment.HasFlag(NamespaceKindCompatibility.Simulated).ShouldBeFalse();
-    }
-
     /// <summary>
     /// Verifies that Get rejects empty or null type names.
     /// </summary>
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/EquipmentTagRefResolverTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/EquipmentTagRefResolverTests.cs
index 55b92f8f..c049b289 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/EquipmentTagRefResolverTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/EquipmentTagRefResolverTests.cs
@@ -4,54 +4,65 @@ using Xunit;
 
 namespace ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests;
 
+/// <summary>
+///     v3: <see cref="EquipmentTagRefResolver{TDef}"/> is now a thin wrapper over the driver's
+///     authored <c>RawPath → TDef</c> lookup. The pre-v3 two-arg ctor (byName + a JSON-blob parse
+///     fallback with a transient cache) is retired — a reference is always a RawPath, and a miss is a
+///     miss (no parse attempt). These tests pin the single-func RawPath-lookup contract.
+/// </summary>
 public class EquipmentTagRefResolverTests
 {
     private sealed record Def(string Id);
 
-    private static EquipmentTagRefResolver<Def> Make(
-        Dictionary<string, Def> byName, Func<string, Def?> parse)
-        => new(r => byName.TryGetValue(r, out var d) ? d : null, parse);
+    private static EquipmentTagRefResolver<Def> Make(Dictionary<string, Def> byRawPath)
+        => new(r => byRawPath.TryGetValue(r, out var d) ? d : null);
 
     [Fact]
-    public void Legacy_name_resolves_via_byName()
+    public void RawPath_resolves_via_lookup()
     {
-        var r = Make(new() { ["Temp"] = new Def("Temp") }, _ => null);
-        r.TryResolve("Temp", out var def).ShouldBeTrue();
+        var r = Make(new() { ["Area/Modbus/Dev/Temp"] = new Def("Temp") });
+        r.TryResolve("Area/Modbus/Dev/Temp", out var def).ShouldBeTrue();
         def!.Id.ShouldBe("Temp");
     }
 
     [Fact]
-    public void Equipment_ref_resolves_via_parse_and_is_cached()
+    public void Unknown_rawPath_returns_false()
     {
-        var calls = 0;
-        var r = Make(new(), reference => { calls++; return reference.StartsWith("{") ? new Def(reference) : null; });
-        r.TryResolve("{\"a\":1}", out var d1).ShouldBeTrue();
-        r.TryResolve("{\"a\":1}", out var d2).ShouldBeTrue();
-        d1!.Id.ShouldBe("{\"a\":1}");
-        calls.ShouldBe(1);
+        var r = Make(new() { ["Area/Modbus/Dev/Temp"] = new Def("Temp") });
+        r.TryResolve("Area/Modbus/Dev/Missing", out _).ShouldBeFalse();
     }
 
     [Fact]
-    public void Garbage_ref_returns_false_and_caches_negative()
+    public void Lookup_is_consulted_each_call()
     {
+        // v3 holds no transient parse cache — the resolver reads the driver's live table by closure,
+        // so every TryResolve consults the underlying lookup (a table rebuild is immediately visible).
         var calls = 0;
-        var r = Make(new(), _ => { calls++; return null; });
-        r.TryResolve("nope", out _).ShouldBeFalse();
-        r.TryResolve("nope", out _).ShouldBeFalse();
-        calls.ShouldBe(1);
-    }
+        var table = new Dictionary<string, Def>();
+        var r = new EquipmentTagRefResolver<Def>(reference =>
+        {
+            calls++;
+            return table.TryGetValue(reference, out var d) ? d : null;
+        });
 
-    [Fact]
-    public void Clear_drops_transient_cache()
-    {
-        var calls = 0;
-        var r = Make(new(), reference => { calls++; return new Def(reference); });
-        r.TryResolve("{\"a\":1}", out _).ShouldBeTrue();
-        r.Clear();
-        r.TryResolve("{\"a\":1}", out _).ShouldBeTrue();
+        r.TryResolve("Area/Dev/Temp", out _).ShouldBeFalse();
+        table["Area/Dev/Temp"] = new Def("Temp");
+        r.TryResolve("Area/Dev/Temp", out var def).ShouldBeTrue();
+        def!.Id.ShouldBe("Temp");
         calls.ShouldBe(2);
     }
 
+    [Fact]
+    public void Clear_is_a_noop_and_lookup_still_works()
+    {
+        // Clear() is retained for call-site compatibility only — there is no transient cache to drop.
+        var r = Make(new() { ["ref"] = new Def("ref") });
+        r.TryResolve("ref", out _).ShouldBeTrue();
+        r.Clear();
+        r.TryResolve("ref", out var def).ShouldBeTrue();
+        def!.Id.ShouldBe("ref");
+    }
+
     /// <summary>
     ///     Core.Abstractions-009: <see cref="EquipmentTagRefResolver{TDef}.TryResolve"/> carries
     ///     <c>[MaybeNullWhen(false)]</c> on its <c>out</c> parameter so NRT-enabled callers do
@@ -62,7 +73,7 @@ public class EquipmentTagRefResolverTests
     [Fact]
     public void TryResolve_false_path_sets_def_to_default()
     {
-        var r = Make(new(), _ => null);
+        var r = Make(new());
         var returned = r.TryResolve("no-such-ref", out var def);
         returned.ShouldBeFalse();
         // The [MaybeNullWhen(false)] attribute means callers must treat def as potentially null
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerFullNameCorpusTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerFullNameCorpusTests.cs
deleted file mode 100644
index ae74919d..00000000
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerFullNameCorpusTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Core.OpcUa;
-
-namespace ZB.MOM.WW.OtOpcUa.Core.Tests.OpcUa;
-
-/// <summary>
-///     Characterization net (R2-11) pinning <see cref="EquipmentNodeWalker.ExtractFullName"/>'s
-///     raw-blob-fallback semantics across the golden TagConfig corpus BEFORE the parser is delegated to
-///     <c>TagConfigIntent.Parse</c>. The walker's FullName copy falls back to the raw blob whenever the
-///     input is not a JSON object carrying a string <c>FullName</c> (blank / non-object / malformed /
-///     absent / non-string). Whitespace + non-string-property values are returned verbatim (not trimmed).
-///     Must be green on the unmodified tree and stay green through the swap.
-/// </summary>
-public sealed class EquipmentNodeWalkerFullNameCorpusTests
-{
-    [Theory]
-    // object with a string FullName → the FullName string (verbatim, incl. whitespace)
-    [InlineData("{\"FullName\":\"X.Y\"}", "X.Y")]
-    [InlineData("{\"FullName\":\"   \"}", "   ")]
-    [InlineData("{\"FullName\":\"A.B\",\"region\":\"Coils\",\"address\":5}", "A.B")]
-    // blank → raw blob (IsNullOrWhiteSpace short-circuit)
-    [InlineData("   ", "   ")]
-    // non-object root → raw blob
-    [InlineData("[1,2]", "[1,2]")]
-    // malformed JSON → raw blob
-    [InlineData("not json {", "not json {")]
-    // object, FullName absent → raw blob
-    [InlineData("{\"region\":\"HoldingRegisters\",\"address\":5}", "{\"region\":\"HoldingRegisters\",\"address\":5}")]
-    // object, FullName present but non-string → raw blob
-    [InlineData("{\"FullName\":123}", "{\"FullName\":123}")]
-    public void ExtractFullName_falls_back_to_raw_blob_except_for_string_FullName(string tagConfig, string expected)
-    {
-        EquipmentNodeWalker.ExtractFullName(tagConfig).ShouldBe(expected);
-    }
-}
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerTests.cs
index 1b22a9d7..da277e21 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/EquipmentNodeWalkerTests.cs
@@ -9,12 +9,23 @@ namespace ZB.MOM.WW.OtOpcUa.Core.Tests.OpcUa;
 [Trait("Category", "Unit")]
 public sealed class EquipmentNodeWalkerTests
 {
+    /// <summary>
+    ///     v3: raw tags no longer flow into <see cref="EquipmentNamespaceContent"/> and the walker
+    ///     emits no raw-tag variable nodes. Raw tags reach the UNS namespace via
+    ///     <c>UnsTagReference</c> as the dual-namespace fan-out of their backing raw nodes, which lands
+    ///     with the Batch-4 address space. Tests that asserted the old equipment-tag variable
+    ///     materialization are skipped with this reason until that projection is built.
+    /// </summary>
+    internal const string DarkBatch4 =
+        "v3 dark address space: raw-tag → UNS variable materialization lands in Batch 4 " +
+        "(UnsTagReference fan-out), not in EquipmentNodeWalker.";
+
     /// <summary>Verifies that walking empty content emits no nodes.</summary>
     [Fact]
     public void Walk_EmptyContent_EmitsNothing()
     {
         var rec = new RecordingBuilder("root");
-        EquipmentNodeWalker.Walk(rec, new EquipmentNamespaceContent([], [], [], []));
+        EquipmentNodeWalker.Walk(rec, new EquipmentNamespaceContent([], [], []));
 
         rec.Children.ShouldBeEmpty();
     }
@@ -26,8 +37,7 @@ public sealed class EquipmentNodeWalkerTests
         var content = new EquipmentNamespaceContent(
             Areas: [Area("area-1", "warsaw"), Area("area-2", "berlin")],
             Lines: [Line("line-1", "area-1", "oven-line"), Line("line-2", "area-2", "press-line")],
-            Equipment: [Eq("eq-1", "line-1", "oven-3"), Eq("eq-2", "line-2", "press-7")],
-            Tags: []);
+            Equipment: [Eq("eq-1", "line-1", "oven-3"), Eq("eq-2", "line-2", "press-7")]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -49,7 +59,7 @@ public sealed class EquipmentNodeWalkerTests
         eq.ZTag = null;
         eq.SAPID = null;
         var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], []);
+            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -72,7 +82,7 @@ public sealed class EquipmentNodeWalkerTests
         eq.ZTag = "ZT-0042";
         eq.SAPID = "10000042";
         var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], []);
+            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -90,7 +100,7 @@ public sealed class EquipmentNodeWalkerTests
         eq.Manufacturer = "Trumpf";
         eq.Model = "TruLaser-3030";
         var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], []);
+            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -108,7 +118,7 @@ public sealed class EquipmentNodeWalkerTests
     {
         var eq = Eq("eq-1", "line-1", "oven-3");  // no identification fields
         var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], []);
+            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -117,42 +127,18 @@ public sealed class EquipmentNodeWalkerTests
         equipmentNode.Children.ShouldNotContain(c => c.BrowseName == "Identification");
     }
 
-    /// <summary>Verifies that walking emits a variable for each bound tag under equipment.</summary>
-    [Fact]
-    public void Walk_Emits_Variable_Per_BoundTag_Under_Equipment()
+    /// <summary>
+    ///     Batch-4 pending: the walker must emit a raw-tag variable per <c>UnsTagReference</c> under
+    ///     equipment (dual-namespace fan-out). Preserved as a skipped placeholder — the pre-v3 test
+    ///     asserted equipment-tag variable materialization directly off an equipment-bound <c>Tag</c>,
+    ///     which no longer exists (tags bind to Devices, not equipment). Intent retained; unskip when
+    ///     the Batch-4 UNS projection lands.
+    /// </summary>
+    [Fact(Skip = DarkBatch4)]
+    public void Walk_Emits_RawTag_Variables_Under_Equipment_DARK_Batch4()
     {
-        var eq = Eq("eq-1", "line-1", "oven-3");
-        var tag1 = NewTag("tag-1", "Temperature", "Int32", "plcaddr-01", equipmentId: "eq-1");
-        var tag2 = NewTag("tag-2", "Setpoint", "Float32", "plcaddr-02", equipmentId: "eq-1");
-        var unboundTag = NewTag("tag-3", "Orphan", "Int32", "plcaddr-03", equipmentId: null); // SystemPlatform-style, walker skips
-        var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [tag1, tag2, unboundTag]);
-
-        var rec = new RecordingBuilder("root");
-        EquipmentNodeWalker.Walk(rec, content);
-
-        var equipmentNode = rec.Children[0].Children[0].Children[0];
-        equipmentNode.Variables.Count.ShouldBe(2);
-        equipmentNode.Variables.Select(v => v.BrowseName).ShouldBe(["Setpoint", "Temperature"]);
-        equipmentNode.Variables.First(v => v.BrowseName == "Temperature").AttributeInfo.FullName.ShouldBe("plcaddr-01");
-        equipmentNode.Variables.First(v => v.BrowseName == "Setpoint").AttributeInfo.DriverDataType.ShouldBe(DriverDataType.Float32);
-    }
-
-    /// <summary>Verifies that walking falls back to String type for unparseable data types.</summary>
-    [Fact]
-    public void Walk_FallsBack_To_String_For_Unparseable_DataType()
-    {
-        var eq = Eq("eq-1", "line-1", "oven-3");
-        var tag = NewTag("tag-1", "Mystery", "NotARealType", "plcaddr-42", equipmentId: "eq-1");
-        var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], [tag]);
-
-        var rec = new RecordingBuilder("root");
-        EquipmentNodeWalker.Walk(rec, content);
-
-        var variable = rec.Children[0].Children[0].Children[0].Variables.Single();
-        variable.AttributeInfo.DriverDataType.ShouldBe(DriverDataType.String);
+        // When Batch 4 lands, EquipmentNamespaceContent carries UnsTagReference rows and the walker
+        // emits one Variable per referenced raw node (correct DriverDataType, address, source kind).
     }
 
     /// <summary>Verifies that walking emits virtual tag variables with Virtual source discriminator.</summary>
@@ -168,7 +154,7 @@ public sealed class EquipmentNodeWalkerTests
         };
         var content = new EquipmentNamespaceContent(
             [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [], VirtualTags: [vtag]);
+            [eq], VirtualTags: [vtag]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -196,7 +182,7 @@ public sealed class EquipmentNodeWalkerTests
         };
         var content = new EquipmentNamespaceContent(
             [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [], ScriptedAlarms: [alarm]);
+            [eq], ScriptedAlarms: [alarm]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -229,7 +215,7 @@ public sealed class EquipmentNodeWalkerTests
         };
         var content = new EquipmentNamespaceContent(
             [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [], VirtualTags: [vtag], ScriptedAlarms: [alarm]);
+            [eq], VirtualTags: [vtag], ScriptedAlarms: [alarm]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);
@@ -241,10 +227,10 @@ public sealed class EquipmentNodeWalkerTests
     [Fact]
     public void Walk_Null_VirtualTags_And_ScriptedAlarms_Is_Safe()
     {
-        // Backwards-compat — callers that don't populate the new collections still work.
+        // Backwards-compat — callers that don't populate the optional collections still work.
         var eq = Eq("eq-1", "line-1", "oven-3");
         var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq], []);
+            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")], [eq]);
 
         var rec = new RecordingBuilder("root");
         EquipmentNodeWalker.Walk(rec, content);  // must not throw
@@ -252,81 +238,6 @@ public sealed class EquipmentNodeWalkerTests
         rec.Children[0].Children[0].Children[0].Variables.ShouldBeEmpty();
     }
 
-    /// <summary>Verifies that driver tag default NodeSourceKind is Driver.</summary>
-    [Fact]
-    public void Driver_tag_default_NodeSourceKind_is_Driver()
-    {
-        var eq = Eq("eq-1", "line-1", "oven-3");
-        var tag = NewTag("t-1", "Temp", "Int32", "plc-01", "eq-1");
-        var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [tag]);
-
-        var rec = new RecordingBuilder("root");
-        EquipmentNodeWalker.Walk(rec, content);
-
-        var v = rec.Children[0].Children[0].Children[0].Variables.Single();
-        v.AttributeInfo.Source.ShouldBe(NodeSourceKind.Driver);
-        v.AttributeInfo.VirtualTagId.ShouldBeNull();
-        v.AttributeInfo.ScriptedAlarmId.ShouldBeNull();
-    }
-
-    /// <summary>Verifies that ExtractFullName unwraps a JSON object with FullName field.</summary>
-    [Fact]
-    public void ExtractFullName_unwraps_json_object_with_FullName_field()
-    {
-        EquipmentNodeWalker.ExtractFullName(
-            "{\"FullName\":\"MESReceiver_001.MoveInBatchID\",\"DataType\":\"Int32\"}")
-            .ShouldBe("MESReceiver_001.MoveInBatchID");
-    }
-
-    /// <summary>Verifies that ExtractFullName handles S7-style extra fields.</summary>
-    [Fact]
-    public void ExtractFullName_handles_S7_style_extra_fields()
-    {
-        EquipmentNodeWalker.ExtractFullName(
-            "{\"FullName\":\"DB1_DBW0\",\"Address\":\"DB1.DBW0\",\"DataType\":\"Int16\"}")
-            .ShouldBe("DB1_DBW0");
-    }
-
-    /// <summary>Verifies that ExtractFullName returns raw string when input is not JSON.</summary>
-    [Fact]
-    public void ExtractFullName_returns_raw_when_not_json()
-    {
-        // Drivers that opt out of JSON TagConfig still work — fallback preserves the literal
-        // string so the driver's IReadable sees whatever the row author stored.
-        EquipmentNodeWalker.ExtractFullName("raw-tag-ref").ShouldBe("raw-tag-ref");
-    }
-
-    /// <summary>Verifies that ExtractFullName returns raw string when JSON is missing FullName field.</summary>
-    [Fact]
-    public void ExtractFullName_returns_raw_when_json_missing_FullName_field()
-    {
-        EquipmentNodeWalker.ExtractFullName("{\"Address\":\"DB1.DBW0\"}")
-            .ShouldBe("{\"Address\":\"DB1.DBW0\"}");
-    }
-
-    /// <summary>Verifies that driver tag FullName passes through from TagConfig JSON.</summary>
-    [Fact]
-    public void Driver_tag_FullName_passes_through_from_TagConfig_json()
-    {
-        // The walker hands the driver the unwrapped FullName string so IReadable.ReadAsync
-        // sees the plain address, not the raw TagConfig JSON. Verifies the dispatch contract
-        // the path-based NodeId refactor relies on.
-        var eq = Eq("eq-1", "line-1", "oven-3");
-        var tag = NewTag("t-1", "Temp", "Int32", "plc-01", "eq-1",
-            tagConfig: "{\"FullName\":\"plc-01/HR200\",\"DataType\":\"Int32\"}");
-        var content = new EquipmentNamespaceContent(
-            [Area("area-1", "warsaw")], [Line("line-1", "area-1", "line-a")],
-            [eq], [tag]);
-
-        var rec = new RecordingBuilder("root");
-        EquipmentNodeWalker.Walk(rec, content);
-
-        var v = rec.Children[0].Children[0].Children[0].Variables.Single();
-        v.AttributeInfo.FullName.ShouldBe("plc-01/HR200");
-    }
-
     // ----- builders for test seed rows -----
 
     private static UnsArea Area(string id, string name) => new()
@@ -344,25 +255,11 @@ public sealed class EquipmentNodeWalkerTests
         EquipmentRowId = Guid.NewGuid(),
         EquipmentId = equipmentId,
         EquipmentUuid = Guid.NewGuid(),
-        DriverInstanceId = "drv",
         UnsLineId = lineId,
         Name = name,
         MachineCode = "MC-" + name,
     };
 
-    private static Tag NewTag(string tagId, string name, string dataType, string address,
-        string? equipmentId, string? tagConfig = null) => new()
-    {
-        TagRowId = Guid.NewGuid(),
-        TagId = tagId,
-        DriverInstanceId = "drv",
-        EquipmentId = equipmentId,
-        Name = name,
-        DataType = dataType,
-        AccessLevel = ZB.MOM.WW.OtOpcUa.Configuration.Enums.TagAccessLevel.ReadWrite,
-        TagConfig = tagConfig ?? address,
-    };
-
     // ----- recording IAddressSpaceBuilder -----
 
     /// <summary>Test implementation of IAddressSpaceBuilder that records calls.</summary>
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/IdentificationFolderBuilderTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/IdentificationFolderBuilderTests.cs
index a997d70d..33e836ef 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/IdentificationFolderBuilderTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/OpcUa/IdentificationFolderBuilderTests.cs
@@ -45,7 +45,6 @@ public sealed class IdentificationFolderBuilderTests
     private static Equipment EmptyEquipment() => new()
     {
         EquipmentId = "EQ-000000000001",
-        DriverInstanceId = "drv-1",
         UnsLineId = "line-1",
         Name = "eq-1",
         MachineCode = "machine_001",
@@ -54,7 +53,6 @@ public sealed class IdentificationFolderBuilderTests
     private static Equipment FullyPopulatedEquipment() => new()
     {
         EquipmentId = "EQ-000000000001",
-        DriverInstanceId = "drv-1",
         UnsLineId = "line-1",
         Name = "eq-1",
         MachineCode = "machine_001",
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/AbCipCommandBaseTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/AbCipCommandBaseTests.cs
index e8e6052f..bfc5a028 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/AbCipCommandBaseTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/AbCipCommandBaseTests.cs
@@ -135,9 +135,10 @@ public sealed class AbCipCommandBaseTests
 
         var options = cmd.InvokeBuildOptions(tags);
 
-        options.Tags.Count.ShouldBe(2);
-        options.Tags[0].Name.ShouldBe("t1");
-        options.Tags[1].Name.ShouldBe("t2");
+        // v3: BuildOptions projects each typed tag to a RawTagEntry (RawPath = tag name).
+        options.RawTags.Count.ShouldBe(2);
+        options.RawTags[0].RawPath.ShouldBe("t1");
+        options.RawTags[1].RawPath.ShouldBe("t2");
     }
 
     /// <summary>
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/BuildOptionsTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/BuildOptionsTests.cs
index e484e36b..0b60a179 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/BuildOptionsTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/BuildOptionsTests.cs
@@ -94,9 +94,13 @@ public sealed class BuildOptionsTests
         options.Devices[0].DeviceName.ShouldBe("cli-MicroLogix");
     }
 
-    /// <summary>Verifies that tag list is forwarded verbatim to the options.</summary>
+    /// <summary>
+    ///     Verifies that the typed tag list is delivered as v3 <see cref="RawTagEntry"/> records: RawPath =
+    ///     the def's Name, DeviceName = the def's DeviceHostAddress, and the TagConfig blob round-trips the
+    ///     def's address / dataType / writable through the real mapper.
+    /// </summary>
     [Fact]
-    public void BuildOptions_forwards_tag_list_verbatim()
+    public void BuildOptions_delivers_tags_as_rawtag_entries()
     {
         var cmd = new TestCommand
         {
@@ -107,7 +111,18 @@ public sealed class BuildOptionsTests
 
         var options = cmd.Build(SampleTags);
 
-        options.Tags.ShouldBe(SampleTags);
+        options.RawTags.Count.ShouldBe(SampleTags.Count);
+        for (var i = 0; i < SampleTags.Count; i++)
+        {
+            var def = SampleTags[i];
+            var entry = options.RawTags[i];
+            entry.RawPath.ShouldBe(def.Name);
+            entry.DeviceName.ShouldBe(def.DeviceHostAddress);
+            AbLegacyTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var round).ShouldBeTrue();
+            round.Address.ShouldBe(def.Address);
+            round.DataType.ShouldBe(def.DataType);
+            round.Writable.ShouldBe(def.Writable);
+        }
     }
 
     /// <summary>Verifies that timeout-ms option is propagated to the driver options.</summary>
@@ -139,7 +154,7 @@ public sealed class BuildOptionsTests
 
         var options = cmd.Build([]);
 
-        options.Tags.ShouldBeEmpty();
+        options.RawTags.ShouldBeEmpty();
         options.Devices.Count.ShouldBe(1);
         options.Devices[0].PlcFamily.ShouldBe(AbLegacyPlcFamily.Plc5);
     }
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.Tests/FocasCommandBaseBuildOptionsTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.Tests/FocasCommandBaseBuildOptionsTests.cs
index f2e34733..52061a5d 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.Tests/FocasCommandBaseBuildOptionsTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.Tests/FocasCommandBaseBuildOptionsTests.cs
@@ -74,9 +74,12 @@ public sealed class FocasCommandBaseBuildOptionsTests
         options.Devices[0].Series.ShouldBe(FocasCncSeries.Zero_i_F);
     }
 
-    /// <summary>Verifies that BuildOptions forwards tag list verbatim.</summary>
+    /// <summary>
+    ///     Verifies that BuildOptions turns each typed def into a v3 <c>RawTagEntry</c> — RawPath = def.Name,
+    ///     DeviceName = def.DeviceHostAddress, and a TagConfig blob that round-trips through the mapper.
+    /// </summary>
     [Fact]
-    public void BuildOptions_forwards_tag_list_verbatim()
+    public void BuildOptions_maps_tags_to_rawtag_entries()
     {
         var sut = new ProbeOnly { CncHost = "h" };
         var tag = new FocasTagDefinition(
@@ -88,7 +91,14 @@ public sealed class FocasCommandBaseBuildOptionsTests
 
         var options = sut.Invoke([tag]);
 
-        options.Tags.Count.ShouldBe(1);
-        options.Tags[0].ShouldBeSameAs(tag);
+        options.RawTags.Count.ShouldBe(1);
+        var entry = options.RawTags[0];
+        entry.RawPath.ShouldBe("t");
+        entry.DeviceName.ShouldBe("focas://h:8193");
+        entry.WriteIdempotent.ShouldBeFalse();
+        FocasTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var round).ShouldBeTrue();
+        round.Address.ShouldBe("R100");
+        round.DataType.ShouldBe(FocasDataType.Int16);
+        round.Writable.ShouldBeFalse();
     }
 }
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ModbusCommandBaseTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ModbusCommandBaseTests.cs
index c83b5c04..ce8384b7 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ModbusCommandBaseTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ModbusCommandBaseTests.cs
@@ -92,9 +92,9 @@ public sealed class ModbusCommandBaseTests
         options.UnitId.ShouldBe((byte)17);
     }
 
-    /// <summary>Verifies that BuildOptions forwards the tag list verbatim.</summary>
+    /// <summary>Verifies that BuildOptions serialises each typed tag into a RawTagEntry (RawPath = name).</summary>
     [Fact]
-    public void BuildOptions_forwards_tag_list_verbatim()
+    public void BuildOptions_serialises_tags_into_raw_tag_entries()
     {
         var sut = new ProbeOnly { Host = "h" };
         var tag = new ModbusTagDefinition(
@@ -102,8 +102,12 @@ public sealed class ModbusCommandBaseTests
 
         var options = sut.Invoke([tag]);
 
-        options.Tags.Count.ShouldBe(1);
-        options.Tags[0].ShouldBeSameAs(tag);
+        options.RawTags.Count.ShouldBe(1);
+        options.RawTags[0].RawPath.ShouldBe("T");
+        // The blob the driver's factory reads round-trips back to the same definition.
+        ModbusTagDefinitionFactory.FromTagConfig(options.RawTags[0].TagConfig, "T", out var def).ShouldBeTrue();
+        def.Region.ShouldBe(ModbusRegion.HoldingRegisters);
+        def.DataType.ShouldBe(ModbusDataType.UInt16);
     }
 
     // --- Driver.Modbus.Cli-003: parse-time endpoint validation -------------------------------
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/S7CommandBaseBuildOptionsTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/S7CommandBaseBuildOptionsTests.cs
index e68ad437..f09ce1b2 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/S7CommandBaseBuildOptionsTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/S7CommandBaseBuildOptionsTests.cs
@@ -87,16 +87,25 @@ public sealed class S7CommandBaseBuildOptionsTests
         options.Slot.ShouldBe((short)2);
     }
 
-    /// <summary>Verifies that BuildOptions forwards the tag list verbatim.</summary>
+    /// <summary>Verifies that BuildOptions serialises each typed tag to a RawTagEntry (RawPath =
+    /// the def's Name) whose TagConfig round-trips back to the same definition (v3 delivery shape).</summary>
     [Fact]
-    public void BuildOptions_forwards_tag_list_verbatim()
+    public void BuildOptions_serialises_tags_to_raw_tag_entries()
     {
         var sut = new ProbeOnly { Host = "h" };
         var tag = new S7TagDefinition("t", "MW0", S7DataType.Int16, Writable: false);
 
         var options = sut.Invoke([tag]);
 
-        options.Tags.Count.ShouldBe(1);
-        options.Tags[0].ShouldBeSameAs(tag);
+        options.RawTags.Count.ShouldBe(1);
+        var entry = options.RawTags[0];
+        entry.RawPath.ShouldBe("t");
+        entry.WriteIdempotent.ShouldBe(tag.WriteIdempotent);
+
+        S7TagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var round).ShouldBeTrue();
+        round!.Name.ShouldBe("t");
+        round.Address.ShouldBe("MW0");
+        round.DataType.ShouldBe(S7DataType.Int16);
+        round.Writable.ShouldBeFalse();
     }
 }
diff --git a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/TwinCATCommandBaseTests.cs b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/TwinCATCommandBaseTests.cs
index 18da65a8..05561ee1 100644
--- a/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/TwinCATCommandBaseTests.cs
+++ b/tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/TwinCATCommandBaseTests.cs
@@ -99,7 +99,16 @@ public sealed class TwinCATCommandBaseTests
         options.Devices.Count.ShouldBe(1);
         options.Devices[0].HostAddress.ShouldBe("ads://10.0.0.1.1.1:851");
         options.Devices[0].DeviceName.ShouldBe("cli-10.0.0.1.1.1:851");
-        options.Tags.ShouldBe([tag]);
+        // v3: the CLI serialises its typed def into a RawTagEntry (RawPath = def.Name, DeviceName =
+        // def.DeviceHostAddress) that round-trips through the factory back to the same def.
+        options.RawTags.Count.ShouldBe(1);
+        var entry = options.RawTags[0];
+        entry.RawPath.ShouldBe("n1");
+        entry.DeviceName.ShouldBe(cmd.GatewayForTest);
+        TwinCAT.TwinCATTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var roundTripped)
+            .ShouldBeTrue();
+        roundTripped.SymbolPath.ShouldBe("MAIN.x");
+        roundTripped.DataType.ShouldBe(TwinCAT.TwinCATDataType.DInt);
         options.Timeout.ShouldBe(TimeSpan.FromMilliseconds(4321));
         options.Probe.Enabled.ShouldBeFalse();
         options.EnableControllerBrowse.ShouldBeFalse();
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipRawTags.cs
new file mode 100644
index 00000000..9fed1d68
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipRawTags.cs
@@ -0,0 +1,27 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the pre-v3 pre-declared-tag authoring style (a typed
+///     <see cref="AbCipTagDefinition"/>) to the v3 RawPath seam the driver now consumes
+///     (<see cref="RawTagEntry"/>). Each typed def is serialised to its <c>TagConfig</c> blob via
+///     <see cref="AbCipTagDefinitionFactory.ToTagConfig"/>, and the def's identity (<c>Name</c> → RawPath),
+///     device routing key (<c>DeviceHostAddress</c> → <see cref="RawTagEntry.DeviceName"/>) and
+///     write-idempotence travel on the entry — exactly the shape the deploy artifact delivers. Lets the
+///     driver's integration smoke tests keep expressing fixtures as typed definitions while exercising the
+///     v3 <c>RawTags</c> → <c>FromTagConfig</c> table-build path. Mirrors the unit-test project's helper of
+///     the same name.
+/// </summary>
+internal static class AbCipRawTags
+{
+    /// <summary>Projects typed definitions to the driver's <c>RawTags</c> option shape.</summary>
+    /// <param name="defs">The typed definitions to project.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/> list.</returns>
+    public static IReadOnlyList<RawTagEntry> From(params AbCipTagDefinition[] defs) =>
+        [.. defs.Select(d => new RawTagEntry(
+            RawPath: d.Name,
+            TagConfig: AbCipTagDefinitionFactory.ToTagConfig(d),
+            WriteIdempotent: d.WriteIdempotent,
+            DeviceName: d.DeviceHostAddress))];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs
index a6b57fa5..51168dfb 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs
@@ -37,7 +37,7 @@ public sealed class AbCipReadSmokeTests
             var drv = new AbCipDriver(new AbCipDriverOptions
             {
                 Devices = [new AbCipDeviceOptions(deviceUri, profile.Family)],
-                Tags = [new AbCipTagDefinition("Counter", deviceUri, "TestDINT", AbCipDataType.DInt)],
+                RawTags = AbCipRawTags.From(new AbCipTagDefinition("Counter", deviceUri, "TestDINT", AbCipDataType.DInt)),
                 Timeout = TimeSpan.FromSeconds(5),
             }, $"drv-smoke-{profile.Family}");
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateAlmdTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateAlmdTests.cs
index 193c475d..d33b464d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateAlmdTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateAlmdTests.cs
@@ -54,7 +54,7 @@ public sealed class AbCipEmulateAlmdTests
             Devices = [new AbCipDeviceOptions($"ab://{endpoint}/1,0")],
             EnableAlarmProjection = true,
             AlarmPollInterval = TimeSpan.FromMilliseconds(200),
-            Tags = [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition(
                     Name: "HighTempAlarm",
                     DeviceHostAddress: $"ab://{endpoint}/1,0",
@@ -72,8 +72,7 @@ public sealed class AbCipEmulateAlmdTests
                     DeviceHostAddress: $"ab://{endpoint}/1,0",
                     TagPath: "SimulateAlarm",
                     DataType: AbCipDataType.Bool,
-                    Writable: true),
-            ],
+                    Writable: true)),
         };
 
         await using var drv = new AbCipDriver(options, driverInstanceId: "emulate-almd");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateUdtReadTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateUdtReadTests.cs
index e36919bd..a6018c02 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateUdtReadTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/AbCipEmulateUdtReadTests.cs
@@ -51,7 +51,7 @@ public sealed class AbCipEmulateUdtReadTests
         var options = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions($"ab://{endpoint}/1,0")],
-            Tags = [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition(
                     Name: "Motor1",
                     DeviceHostAddress: $"ab://{endpoint}/1,0",
@@ -61,8 +61,7 @@ public sealed class AbCipEmulateUdtReadTests
                         new AbCipStructureMember("Speed",  AbCipDataType.DInt),
                         new AbCipStructureMember("Torque", AbCipDataType.Real),
                         new AbCipStructureMember("Status", AbCipDataType.DInt),
-                    ]),
-            ],
+                    ])),
             Timeout = TimeSpan.FromSeconds(5),
         };
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipAlarmProjectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipAlarmProjectionTests.cs
index bf26f406..d7c253cc 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipAlarmProjectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipAlarmProjectionTests.cs
@@ -56,7 +56,7 @@ public sealed class AbCipAlarmProjectionTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [AlmdTag("HighTemp")],
+            RawTags = AbCipRawTags.From(AlmdTag("HighTemp")),
             EnableAlarmProjection = false, // explicit; also the default
         };
         var drv = new AbCipDriver(opts, "drv-1", factory);
@@ -83,7 +83,7 @@ public sealed class AbCipAlarmProjectionTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [AlmdTag("HighTemp")],
+            RawTags = AbCipRawTags.From(AlmdTag("HighTemp")),
             EnableAlarmProjection = true,
             AlarmPollInterval = TimeSpan.FromMilliseconds(20),
             // The ALMD projection here drives the parent-UDT runtime via offset-keyed values,
@@ -138,7 +138,7 @@ public sealed class AbCipAlarmProjectionTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [AlmdTag("HighTemp")],
+            RawTags = AbCipRawTags.From(AlmdTag("HighTemp")),
             EnableAlarmProjection = true,
             AlarmPollInterval = TimeSpan.FromMilliseconds(20),
             EnableDeclarationOnlyUdtGrouping = true,
@@ -189,7 +189,7 @@ public sealed class AbCipAlarmProjectionTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [AlmdTag("HighTemp")],
+            RawTags = AbCipRawTags.From(AlmdTag("HighTemp")),
             EnableAlarmProjection = true,
             AlarmPollInterval = TimeSpan.FromMilliseconds(20),
             // The ALMD projection here drives the parent-UDT runtime via offset-keyed values,
@@ -230,7 +230,7 @@ public sealed class AbCipAlarmProjectionTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [AlmdTag("HighTemp")],
+            RawTags = AbCipRawTags.From(AlmdTag("HighTemp")),
             EnableAlarmProjection = true,
             AlarmPollInterval = TimeSpan.FromMilliseconds(20),
             // The ALMD projection here drives the parent-UDT runtime via offset-keyed values,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipArrayTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipArrayTests.cs
index 1df0b24f..e0e0c08f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipArrayTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipArrayTests.cs
@@ -9,20 +9,21 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
 ///     Phase 4c (Task 6) — 1-D array support for AbCip. Covers: discovery flips
 ///     <see cref="DriverAttributeInfo.IsArray"/> / <see cref="DriverAttributeInfo.ArrayDim"/>
 ///     for an array atomic tag + an array UDT member; the read path returns a typed CLR array
-///     boxed as <see cref="object"/>; and the equipment-tag resolver threads
-///     <c>arrayLength</c> from the TagConfig into the transient definition's element count so
-///     an <c>isArray</c> equipment tag reads the whole array.
+///     boxed as <see cref="object"/>; and the v3 tag mapper threads <c>arrayLength</c> from the
+///     TagConfig into the definition's element count so an <c>isArray</c> tag reads the whole array.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class AbCipArrayTests
 {
+    private const string Device = "ab://10.0.0.5/1,0";
+
     private static (AbCipDriver drv, FakeAbCipTagFactory factory) NewDriver(params AbCipTagDefinition[] tags)
     {
         var factory = new FakeAbCipTagFactory();
         var opts = new AbCipDriverOptions
         {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            Devices = [new AbCipDeviceOptions(Device)],
+            RawTags = AbCipRawTags.From(tags),
         };
         var drv = new AbCipDriver(opts, "drv-array", factory);
         return (drv, factory);
@@ -36,8 +37,8 @@ public sealed class AbCipArrayTests
     {
         var builder = new RecordingBuilder();
         var (drv, _) = NewDriver(
-            new AbCipTagDefinition("Recipe", "ab://10.0.0.5/1,0", "Recipe", AbCipDataType.DInt, ElementCount: 10),
-            new AbCipTagDefinition("Single", "ab://10.0.0.5/1,0", "Single", AbCipDataType.DInt));
+            new AbCipTagDefinition("Recipe", Device, "Recipe", AbCipDataType.DInt, ElementCount: 10, IsArray: true),
+            new AbCipTagDefinition("Single", Device, "Single", AbCipDataType.DInt));
         await drv.InitializeAsync("{}", CancellationToken.None);
 
         await drv.DiscoverAsync(builder, CancellationToken.None);
@@ -57,10 +58,10 @@ public sealed class AbCipArrayTests
     {
         var builder = new RecordingBuilder();
         var (drv, _) = NewDriver(
-            new AbCipTagDefinition("Motor", "ab://10.0.0.5/1,0", "Motor", AbCipDataType.Structure,
+            new AbCipTagDefinition("Motor", Device, "Motor", AbCipDataType.Structure,
                 Members:
                 [
-                    new AbCipStructureMember("Setpoints", AbCipDataType.Real, ElementCount: 4),
+                    new AbCipStructureMember("Setpoints", AbCipDataType.Real, ElementCount: 4, IsArray: true),
                     new AbCipStructureMember("Speed", AbCipDataType.DInt),
                 ]));
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -83,7 +84,7 @@ public sealed class AbCipArrayTests
     public async Task Array_DInt_read_returns_typed_int_array()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Recipe", "ab://10.0.0.5/1,0", "Recipe", AbCipDataType.DInt, ElementCount: 4));
+            new AbCipTagDefinition("Recipe", Device, "Recipe", AbCipDataType.DInt, ElementCount: 4, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new int[] { 11, 22, 33, 44 });
 
@@ -101,7 +102,7 @@ public sealed class AbCipArrayTests
     public async Task Array_Real_read_returns_typed_float_array()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Floats", "ab://10.0.0.5/1,0", "Floats", AbCipDataType.Real, ElementCount: 3));
+            new AbCipTagDefinition("Floats", Device, "Floats", AbCipDataType.Real, ElementCount: 3, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new float[] { 1.5f, 2.5f, 3.5f });
 
@@ -116,7 +117,7 @@ public sealed class AbCipArrayTests
     public async Task Array_Bool_read_returns_typed_bool_array()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Flags", "ab://10.0.0.5/1,0", "Flags", AbCipDataType.Bool, ElementCount: 3));
+            new AbCipTagDefinition("Flags", Device, "Flags", AbCipDataType.Bool, ElementCount: 3, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new bool[] { true, false, true });
 
@@ -131,7 +132,7 @@ public sealed class AbCipArrayTests
     public async Task Array_String_read_returns_typed_string_array()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Names", "ab://10.0.0.5/1,0", "Names", AbCipDataType.String, ElementCount: 2));
+            new AbCipTagDefinition("Names", Device, "Names", AbCipDataType.String, ElementCount: 2, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new string[] { "a", "b" });
 
@@ -146,7 +147,7 @@ public sealed class AbCipArrayTests
     public async Task Scalar_read_path_unchanged_for_element_count_one()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Speed", AbCipDataType.DInt));
+            new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new FakeAbCipTag(p) { Value = 4200 };
 
@@ -158,20 +159,18 @@ public sealed class AbCipArrayTests
 
     /// <summary>
     ///     Driver.AbCip-016 — a DECLARED UDT member that is a 1-D array (<c>Setpoints : REAL[4]</c>)
-    ///     must READ as a typed CLR array, matching the array node it discovers as. Before the fix
-    ///     the member fan-out in <c>InitializeAsync</c> dropped the member's <c>ElementCount</c> /
-    ///     <c>IsArray</c>, so the fanned-out runtime definition defaulted to scalar and the read
-    ///     returned a single element (or null) instead of the array — a declared-type-vs-runtime-value
-    ///     mismatch.
+    ///     must READ as a typed CLR array, matching the array node it discovers as. The member fan-out
+    ///     in <c>InitializeAsync</c> threads the member's <c>ElementCount</c> / <c>IsArray</c> into the
+    ///     fanned-out runtime definition.
     /// </summary>
     [Fact]
     public async Task Declared_udt_array_member_reads_as_typed_array()
     {
         var (drv, factory) = NewDriver(
-            new AbCipTagDefinition("Motor", "ab://10.0.0.5/1,0", "Motor", AbCipDataType.Structure,
+            new AbCipTagDefinition("Motor", Device, "Motor", AbCipDataType.Structure,
                 Members:
                 [
-                    new AbCipStructureMember("Setpoints", AbCipDataType.Real, ElementCount: 4),
+                    new AbCipStructureMember("Setpoints", AbCipDataType.Real, ElementCount: 4, IsArray: true),
                     new AbCipStructureMember("Speed", AbCipDataType.DInt),
                 ]));
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -187,24 +186,18 @@ public sealed class AbCipArrayTests
         factory.Tags["Motor.Setpoints"].CreationParams.IsArray.ShouldBeTrue();
     }
 
-    // ---- Resolver: arrayLength threading ----
+    // ---- Mapper: arrayLength threading ----
 
-    /// <summary>The equipment-tag resolver threads arrayLength into the def's ElementCount.</summary>
+    /// <summary>An authored array tag reads as a typed CLR array end-to-end.</summary>
     [Fact]
-    public async Task Equipment_ref_with_arrayLength_reads_as_a_typed_array()
+    public async Task Authored_array_tag_reads_as_a_typed_array()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":4}""";
-        var factory = new FakeAbCipTagFactory();
-        var opts = new AbCipDriverOptions
-        {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
-        };
-        var drv = new AbCipDriver(opts, "abcip-eq-array", factory);
+        var (drv, factory) = NewDriver(
+            new AbCipTagDefinition("Recipe", Device, "Recipe", AbCipDataType.DInt, ElementCount: 4, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new int[] { 7, 8, 9, 10 });
 
-        var snapshots = await drv.ReadAsync([json], CancellationToken.None);
+        var snapshots = await drv.ReadAsync(["Recipe"], CancellationToken.None);
 
         snapshots.Single().StatusCode.ShouldBe(AbCipStatusMapper.Good);
         var value = snapshots.Single().Value.ShouldBeOfType<int[]>();
@@ -212,80 +205,75 @@ public sealed class AbCipArrayTests
         factory.Tags["Recipe"].CreationParams.ElementCount.ShouldBe(4);
     }
 
-    /// <summary>The parser threads arrayLength into the transient definition's ElementCount and sets IsArray.</summary>
+    /// <summary>The mapper threads arrayLength into the definition's ElementCount and sets IsArray.</summary>
     [Fact]
-    public void Parser_threads_arrayLength_into_ElementCount()
+    public void Mapper_threads_arrayLength_into_ElementCount()
     {
         var json = """{"tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":8}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbCipTagDefinitionFactory.FromTagConfig(json, "line1/eq/tag", out var def).ShouldBeTrue();
         def!.ElementCount.ShouldBe(8);
         def.IsArray.ShouldBeTrue();
     }
 
-    /// <summary>A non-array equipment ref defaults ElementCount to 1 (scalar) and IsArray false.</summary>
+    /// <summary>A non-array TagConfig defaults ElementCount to 1 (scalar) and IsArray false.</summary>
     [Fact]
-    public void Parser_defaults_ElementCount_to_one_when_not_an_array()
+    public void Mapper_defaults_ElementCount_to_one_when_not_an_array()
     {
         var json = """{"tagPath":"Recipe","dataType":"DInt"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbCipTagDefinitionFactory.FromTagConfig(json, "line1/eq/tag", out var def).ShouldBeTrue();
         def!.ElementCount.ShouldBe(1);
         def.IsArray.ShouldBeFalse();
     }
 
     /// <summary>
     ///     Review finding I-2 — <c>isArray:true</c> with NO <c>arrayLength</c> is a DEGENERATE input
-    ///     that must parse as SCALAR (IsArray false, ElementCount 1), matching every other driver
-    ///     (Modbus, S7, TwinCAT, AbLegacy). The AdminUI validator blocks authoring this combination,
-    ///     but the parser contract must still be consistent cross-driver.
+    ///     that must map as SCALAR (IsArray false, ElementCount 1), matching every other driver.
     /// </summary>
     [Fact]
-    public void Parser_isArray_true_without_arrayLength_parses_as_scalar()
+    public void Mapper_isArray_true_without_arrayLength_maps_as_scalar()
     {
         var json = """{"tagPath":"Recipe","dataType":"DInt","isArray":true}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbCipTagDefinitionFactory.FromTagConfig(json, "line1/eq/tag", out var def).ShouldBeTrue();
         def!.IsArray.ShouldBeFalse();
         def.ElementCount.ShouldBe(1);
     }
 
     /// <summary>
     ///     Review finding I-2 — <c>isArray:true</c> with an invalid (zero) <c>arrayLength</c> also
-    ///     parses as SCALAR, consistent with the cross-driver rule.
+    ///     maps as SCALAR, consistent with the cross-driver rule.
     /// </summary>
     [Fact]
-    public void Parser_isArray_true_with_zero_arrayLength_parses_as_scalar()
+    public void Mapper_isArray_true_with_zero_arrayLength_maps_as_scalar()
     {
         var json = """{"tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":0}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbCipTagDefinitionFactory.FromTagConfig(json, "line1/eq/tag", out var def).ShouldBeTrue();
         def!.IsArray.ShouldBeFalse();
         def.ElementCount.ShouldBe(1);
     }
 
     /// <summary>
     ///     Review finding I-1 — a 1-element array (<c>isArray:true, arrayLength:1</c>) is a valid
-    ///     1-element array, NOT a scalar: the parser sets <see cref="AbCipTagDefinition.IsArray"/>
-    ///     true and <see cref="AbCipTagDefinition.ElementCount"/> 1.
+    ///     1-element array, NOT a scalar: the mapper sets IsArray true and ElementCount 1.
     /// </summary>
     [Fact]
-    public void Parser_treats_isArray_with_arrayLength_one_as_a_one_element_array()
+    public void Mapper_treats_isArray_with_arrayLength_one_as_a_one_element_array()
     {
         var json = """{"tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":1}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbCipTagDefinitionFactory.FromTagConfig(json, "line1/eq/tag", out var def).ShouldBeTrue();
         def!.IsArray.ShouldBeTrue();
         def.ElementCount.ShouldBe(1);
     }
 
     /// <summary>
-    ///     Review finding I-1 — <c>isArray:true, arrayLength:1</c> must DISCOVER as a [1] array node
-    ///     (IsArray + ArrayDim 1), matching the foundation's materialisation, not as a scalar.
+    ///     Review finding I-1 — a 1-element array tag must DISCOVER as a [1] array node (IsArray +
+    ///     ArrayDim 1), matching the foundation's materialisation, not as a scalar.
     /// </summary>
     [Fact]
-    public async Task Equipment_ref_isArray_arrayLength_one_discovers_as_one_element_array()
+    public async Task Authored_one_element_array_discovers_as_one_element_array()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":1}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-
         var builder = new RecordingBuilder();
-        var (drv, _) = NewDriver(def!);
+        var (drv, _) = NewDriver(
+            new AbCipTagDefinition("Recipe", Device, "Recipe", AbCipDataType.DInt, ElementCount: 1, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
 
         await drv.DiscoverAsync(builder, CancellationToken.None);
@@ -296,25 +284,17 @@ public sealed class AbCipArrayTests
     }
 
     /// <summary>
-    ///     Review finding I-1 — the I-1 case: an <c>isArray:true, arrayLength:1</c> equipment tag
-    ///     reads a 1-ELEMENT typed array, NOT a scalar. On current code (gate <c>ElementCount &gt; 1</c>)
-    ///     this reads a scalar; the explicit IsArray flag fixes it.
+    ///     Review finding I-1 — a 1-element array tag reads a 1-ELEMENT typed array, NOT a scalar.
     /// </summary>
     [Fact]
-    public async Task Equipment_ref_isArray_arrayLength_one_reads_as_one_element_array()
+    public async Task Authored_one_element_array_reads_as_one_element_array()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Recipe","dataType":"DInt","isArray":true,"arrayLength":1}""";
-        var factory = new FakeAbCipTagFactory();
-        var opts = new AbCipDriverOptions
-        {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
-        };
-        var drv = new AbCipDriver(opts, "abcip-eq-array1", factory);
+        var (drv, factory) = NewDriver(
+            new AbCipTagDefinition("Recipe", Device, "Recipe", AbCipDataType.DInt, ElementCount: 1, IsArray: true));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new ArrayFakeAbCipTag(p, new int[] { 99 });
 
-        var snapshots = await drv.ReadAsync([json], CancellationToken.None);
+        var snapshots = await drv.ReadAsync(["Recipe"], CancellationToken.None);
 
         snapshots.Single().StatusCode.ShouldBe(AbCipStatusMapper.Good);
         var value = snapshots.Single().Value.ShouldBeOfType<int[]>();
@@ -324,24 +304,18 @@ public sealed class AbCipArrayTests
     }
 
     /// <summary>
-    ///     Regression — a genuinely scalar equipment ref (<c>isArray:false</c>) reads a boxed
-    ///     scalar via <see cref="IAbCipTagRuntime.DecodeValue"/>, never an array.
+    ///     Regression — a genuinely scalar tag (<c>isArray:false</c>) reads a boxed scalar via
+    ///     <see cref="IAbCipTagRuntime.DecodeValue"/>, never an array.
     /// </summary>
     [Fact]
-    public async Task Equipment_ref_isArray_false_reads_as_scalar()
+    public async Task Scalar_tag_reads_as_scalar()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Speed","dataType":"DInt","isArray":false}""";
-        var factory = new FakeAbCipTagFactory();
-        var opts = new AbCipDriverOptions
-        {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
-        };
-        var drv = new AbCipDriver(opts, "abcip-eq-scalar", factory);
+        var (drv, factory) = NewDriver(
+            new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt));
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new FakeAbCipTag(p) { Value = 4200 };
 
-        var snapshots = await drv.ReadAsync([json], CancellationToken.None);
+        var snapshots = await drv.ReadAsync(["Speed"], CancellationToken.None);
 
         snapshots.Single().Value.ShouldBe(4200);
         snapshots.Single().Value.ShouldNotBeOfType<int[]>();
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipBoolInDIntRmwTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipBoolInDIntRmwTests.cs
index ad0f73c2..21bd9ddd 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipBoolInDIntRmwTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipBoolInDIntRmwTests.cs
@@ -29,10 +29,9 @@ public sealed class AbCipBoolInDIntRmwTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
-                new AbCipTagDefinition("Flag3", "ab://10.0.0.5/1,0", "Motor.Flags.3", AbCipDataType.Bool),
-            ],
+            RawTags = AbCipRawTags.From(
+                new AbCipTagDefinition("Flag3", "ab://10.0.0.5/1,0", "Motor.Flags.3", AbCipDataType.Bool))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -60,7 +59,7 @@ public sealed class AbCipBoolInDIntRmwTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("F", "ab://10.0.0.5/1,0", "Motor.Flags.3", AbCipDataType.Bool)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("F", "ab://10.0.0.5/1,0", "Motor.Flags.3", AbCipDataType.Bool)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -86,7 +85,7 @@ public sealed class AbCipBoolInDIntRmwTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -108,11 +107,10 @@ public sealed class AbCipBoolInDIntRmwTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("A", "ab://10.0.0.5/1,0", "Motor1.Flags.0", AbCipDataType.Bool),
-                new AbCipTagDefinition("B", "ab://10.0.0.5/1,0", "Motor2.Flags.0", AbCipDataType.Bool),
-            ],
+                new AbCipTagDefinition("B", "ab://10.0.0.5/1,0", "Motor2.Flags.0", AbCipDataType.Bool))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -135,11 +133,10 @@ public sealed class AbCipBoolInDIntRmwTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Bit0", "ab://10.0.0.5/1,0", "Flags.0", AbCipDataType.Bool),
-                new AbCipTagDefinition("Bit5", "ab://10.0.0.5/1,0", "Flags.5", AbCipDataType.Bool),
-            ],
+                new AbCipTagDefinition("Bit5", "ab://10.0.0.5/1,0", "Flags.5", AbCipDataType.Bool))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipConnectBackoffTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipConnectBackoffTests.cs
index 5c5ae0fd..4e1d4900 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipConnectBackoffTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipConnectBackoffTests.cs
@@ -17,7 +17,7 @@ public sealed class AbCipConnectBackoffTests
     private static AbCipDriverOptions Options(bool probeEnabled) => new()
     {
         Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-        Tags = [new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Motor1.Speed", AbCipDataType.DInt)],
+        RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Motor1.Speed", AbCipDataType.DInt)),
         Probe = new AbCipProbeOptions
         {
             Enabled = probeEnabled,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverCodeReviewRegressionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverCodeReviewRegressionTests.cs
index 477a6bb6..dbc39685 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverCodeReviewRegressionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverCodeReviewRegressionTests.cs
@@ -18,17 +18,18 @@ public sealed class AbCipDriverCodeReviewRegressionTests
 
     // ---- Driver.AbCip-001 — ReinitializeAsync must apply a changed config JSON ----
 
-    /// <summary>Tests that InitializeAsync applies devices and tags from the config JSON.</summary>
+    /// <summary>Tests that InitializeAsync applies devices and raw tags from the config JSON.</summary>
     [Fact]
     public async Task InitializeAsync_applies_devices_and_tags_from_the_config_json()
     {
-        // Constructed with NO devices/tags — the JSON is the only source of config.
+        // Constructed with NO devices/tags — the JSON is the only source of config. v3: tags arrive as
+        // RawTags (RawPath + TagConfig blob + DeviceName routing key).
         var drv = new AbCipDriver(new AbCipDriverOptions(), "drv-1");
         const string json = """
             {
               "Devices": [ { "HostAddress": "ab://10.0.0.9/1,0", "PlcFamily": "ControlLogix" } ],
-              "Tags": [ { "Name": "Speed", "DeviceHostAddress": "ab://10.0.0.9/1,0",
-                          "TagPath": "Speed", "DataType": "DInt" } ]
+              "RawTags": [ { "RawPath": "line1/speed", "TagConfig": "{\"tagPath\":\"Speed\",\"dataType\":\"DInt\"}",
+                             "WriteIdempotent": false, "DeviceName": "ab://10.0.0.9/1,0" } ]
             }
             """;
 
@@ -92,14 +93,12 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor", Device, "Motor", AbCipDataType.Structure, Members:
                 [
                     new AbCipStructureMember("Speed", AbCipDataType.DInt),
                     new AbCipStructureMember("Torque", AbCipDataType.Real),
-                ]),
-            ],
+                ])),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -186,7 +185,7 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -228,7 +227,7 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Counter", Device, "Counter", AbCipDataType.UDInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Counter", Device, "Counter", AbCipDataType.UDInt)),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -254,14 +253,12 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor", Device, "Motor", AbCipDataType.Structure, Members:
                 [
                     new AbCipStructureMember("Speed", AbCipDataType.DInt),
                     new AbCipStructureMember("Torque", AbCipDataType.Real),
-                ]),
-            ],
+                ])),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -281,11 +278,9 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt),
-                new AbCipTagDefinition("Speed", Device, "SpeedAlias", AbCipDataType.Real), // same name
-            ],
+                new AbCipTagDefinition("Speed", Device, "SpeedAlias", AbCipDataType.Real)), // same name
         }, "drv-1");
 
         Should.Throw<InvalidOperationException>(() =>
@@ -301,14 +296,12 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor", Device, "Motor", AbCipDataType.Structure, Members:
                 [
                     new AbCipStructureMember("Speed", AbCipDataType.DInt),
                 ]),
-                new AbCipTagDefinition("Motor.Speed", Device, "Motor.Speed", AbCipDataType.DInt), // collision
-            ],
+                new AbCipTagDefinition("Motor.Speed", Device, "Motor.Speed", AbCipDataType.DInt)), // collision
         }, "drv-1");
 
         Should.Throw<InvalidOperationException>(() =>
@@ -336,7 +329,7 @@ public sealed class AbCipDriverCodeReviewRegressionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverDiscoveryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverDiscoveryTests.cs
index 8c6e3342..8e860f9e 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverDiscoveryTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverDiscoveryTests.cs
@@ -19,11 +19,9 @@ public sealed class AbCipDriverDiscoveryTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0", DeviceName: "Line1-PLC")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Motor1.Speed", AbCipDataType.DInt),
-                new AbCipTagDefinition("Temperature", "ab://10.0.0.5/1,0", "T", AbCipDataType.Real, Writable: false),
-            ],
+                new AbCipTagDefinition("Temperature", "ab://10.0.0.5/1,0", "T", AbCipDataType.Real, Writable: false)),
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -61,12 +59,10 @@ public sealed class AbCipDriverDiscoveryTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("__DEFVAL_X", "ab://10.0.0.5/1,0", "__DEFVAL_X", AbCipDataType.DInt),
                 new AbCipTagDefinition("Routine:SomeRoutine", "ab://10.0.0.5/1,0", "R", AbCipDataType.DInt),
-                new AbCipTagDefinition("UserTag", "ab://10.0.0.5/1,0", "U", AbCipDataType.DInt),
-            ],
+                new AbCipTagDefinition("UserTag", "ab://10.0.0.5/1,0", "U", AbCipDataType.DInt)),
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -83,7 +79,7 @@ public sealed class AbCipDriverDiscoveryTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("Orphan", "ab://10.0.0.99/1,0", "O", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Orphan", "ab://10.0.0.99/1,0", "O", AbCipDataType.DInt)),
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -418,21 +414,19 @@ public sealed class AbCipDriverDiscoveryTests
     }
 
     /// <summary>
-    ///     A discovered member-path read goes end-to-end through the driver: with NO pre-declared
-    ///     tag for the member, <see cref="AbCipDriver.ReadAsync"/> resolves the authored TagConfig
-    ///     JSON blob (FullName = <c>Parent.Member</c>) via the equipment-tag resolver, materialises a
-    ///     runtime on the device, reads it, and decodes the member's atomic value — proving discovered
-    ///     members are readable with no extra registration. The libplctag tag name the driver builds
-    ///     for the member equals the dotted member path.
+    ///     A member-path read goes end-to-end through the driver: an authored raw tag whose TagConfig
+    ///     addresses a dotted member path (<c>Motor1.Status.Code</c>) is delivered as a
+    ///     <see cref="RawTagEntry"/>, resolves by its RawPath, materialises a runtime on the device, and
+    ///     decodes the member's atomic value. The libplctag tag name the driver builds equals the dotted
+    ///     member path (the TagConfig's tagPath), independent of the RawPath identity.
     /// </summary>
     [Fact]
-    public async Task Discovered_member_path_reads_through_driver_as_member_atomic_type()
+    public async Task Member_path_tag_reads_through_driver_as_member_atomic_type()
     {
         const string device = "ab://10.0.0.5/1,0";
-        // The wire reference handed to ReadAsync for a discovered member is the authored TagConfig
-        // JSON blob (FullName = Motor1.Status.Code, atomic type Real here). No tag is pre-declared.
-        const string tagConfig =
-            "{\"tagPath\":\"Motor1.Status.Code\",\"dataType\":\"Real\",\"deviceHostAddress\":\"ab://10.0.0.5/1,0\"}";
+        const string rawPath = "line1/motor1/status/code";
+        // The authored TagConfig addresses the dotted member path (atomic Real here).
+        const string tagConfig = "{\"tagPath\":\"Motor1.Status.Code\",\"dataType\":\"Real\"}";
 
         var tagFactory = new FakeAbCipTagFactory
         {
@@ -443,16 +437,17 @@ public sealed class AbCipDriverDiscoveryTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(device)],
+            RawTags = [new RawTagEntry(rawPath, tagConfig, WriteIdempotent: false, DeviceName: device)],
         }, "drv-1", tagFactory: tagFactory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var results = await drv.ReadAsync([tagConfig], CancellationToken.None);
+        var results = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         results.Count.ShouldBe(1);
         results[0].StatusCode.ShouldBe(AbCipStatusMapper.Good);
         results[0].Value.ShouldBe(12.5f);
         // The driver built a runtime under the dotted member tag name — confirming the member-path
-        // read addresses the member directly (no parent-UDT registration needed).
+        // read addresses the member directly.
         tagFactory.Tags.ShouldContainKey("Motor1.Status.Code");
     }
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverReadTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverReadTests.cs
index e37b1a0f..735a9c35 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverReadTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverReadTests.cs
@@ -15,7 +15,7 @@ public sealed class AbCipDriverReadTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
         };
         var drv = new AbCipDriver(opts, "drv-1", factory);
         return (drv, factory);
@@ -42,7 +42,7 @@ public sealed class AbCipDriverReadTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("Orphan", "ab://10.0.0.99/1,0", "Tag1", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Orphan", "ab://10.0.0.99/1,0", "Tag1", AbCipDataType.DInt)),
         };
         var drv = new AbCipDriver(opts, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWholeUdtReadTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWholeUdtReadTests.cs
index 56f48150..b5403ca9 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWholeUdtReadTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWholeUdtReadTests.cs
@@ -19,7 +19,7 @@ public sealed class AbCipDriverWholeUdtReadTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
             // Whole-UDT grouping is opt-in (Driver.AbCip-003) — these tests exercise the
             // grouping fast path, so they switch it on explicitly.
             EnableDeclarationOnlyUdtGrouping = true,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWriteTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWriteTests.cs
index 9340dec3..2417399b 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWriteTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipDriverWriteTests.cs
@@ -15,7 +15,7 @@ public sealed class AbCipDriverWriteTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
         }, "drv-1", factory);
         return (drv, factory);
     }
@@ -74,7 +74,7 @@ public sealed class AbCipDriverWriteTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("Flag3", "ab://10.0.0.5/1,0", "Flags.3", AbCipDataType.Bool)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Flag3", "ab://10.0.0.5/1,0", "Flags.3", AbCipDataType.Bool)),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -115,7 +115,7 @@ public sealed class AbCipDriverWriteTests
         var drv2 = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", "ab://10.0.0.5/1,0", "Speed", AbCipDataType.DInt)),
         }, "drv-2", factory);
         await drv2.InitializeAsync("{}", CancellationToken.None);
 
@@ -133,7 +133,7 @@ public sealed class AbCipDriverWriteTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("Narrow", "ab://10.0.0.5/1,0", "N", AbCipDataType.Int)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Narrow", "ab://10.0.0.5/1,0", "N", AbCipDataType.Int)),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -167,12 +167,11 @@ public sealed class AbCipDriverWriteTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("A", "ab://10.0.0.5/1,0", "A", AbCipDataType.DInt),
                 new AbCipTagDefinition("B", "ab://10.0.0.5/1,0", "B", AbCipDataType.DInt, Writable: false),
-                new AbCipTagDefinition("C", "ab://10.0.0.5/1,0", "C", AbCipDataType.DInt),
-            ],
+                new AbCipTagDefinition("C", "ab://10.0.0.5/1,0", "C", AbCipDataType.DInt))
+            ,
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserStrictnessTests.cs
index 0441f976..94b6c845 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserStrictnessTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserStrictnessTests.cs
@@ -12,14 +12,14 @@ public sealed class AbCipEquipmentTagParserStrictnessTests
     [Fact]
     public void Typo_dataType_rejects_the_tag()
     {
-        AbCipEquipmentTagParser.TryParse("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DIntt\"}", out _)
+        AbCipTagDefinitionFactory.FromTagConfig("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DIntt\"}", "line1/eq/tag", out _)
             .ShouldBeFalse();
     }
 
     [Fact]
     public void Valid_dataType_still_parses()
     {
-        AbCipEquipmentTagParser.TryParse("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}", out var def)
+        AbCipTagDefinitionFactory.FromTagConfig("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}", "line1/eq/tag", out var def)
             .ShouldBeTrue();
         def.DataType.ShouldBe(AbCipDataType.DInt);
     }
@@ -27,7 +27,7 @@ public sealed class AbCipEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_reports_typo_dataType()
     {
-        var warnings = AbCipEquipmentTagParser.Inspect("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DIntt\"}");
+        var warnings = AbCipTagDefinitionFactory.Inspect("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DIntt\"}");
         warnings.ShouldHaveSingleItem();
         warnings[0].ShouldContain("DIntt");
         warnings[0].ShouldContain("dataType");
@@ -36,13 +36,13 @@ public sealed class AbCipEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_clean_config_has_no_warnings()
     {
-        AbCipEquipmentTagParser.Inspect("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}").ShouldBeEmpty();
+        AbCipTagDefinitionFactory.Inspect("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}").ShouldBeEmpty();
     }
 
     [Fact]
     public void Writable_false_is_honoured_bit_identical()
     {
-        AbCipEquipmentTagParser.TryParse("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\",\"writable\":false}", out var def)
+        AbCipTagDefinitionFactory.FromTagConfig("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\",\"writable\":false}", "line1/eq/tag", out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeFalse();
     }
@@ -50,7 +50,7 @@ public sealed class AbCipEquipmentTagParserStrictnessTests
     [Fact]
     public void Writable_absent_defaults_to_true()
     {
-        AbCipEquipmentTagParser.TryParse("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}", out var def)
+        AbCipTagDefinitionFactory.FromTagConfig("{\"tagPath\":\"Motor.Speed\",\"dataType\":\"DInt\"}", "line1/eq/tag", out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeTrue();
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserTests.cs
deleted file mode 100644
index c434d1b4..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagParserTests.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.AbCip;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
-
-/// <summary>
-///     Dedicated unit tests for <see cref="AbCipEquipmentTagParser.TryParse"/>.
-///     Covers all distinct outcome branches: valid scalar, 1-element array, N-element array,
-///     degenerate array shapes, non-JSON input, non-object JSON, blank/missing tagPath,
-///     the <c>writable</c> field, and the <c>Structure</c> dataType path (Driver.AbCip.Contracts-004).
-/// </summary>
-[Trait("Category", "Unit")]
-public class AbCipEquipmentTagParserTests
-{
-    // ── Happy-path scalar ────────────────────────────────────────────────────────────────
-
-    [Fact]
-    public void Valid_scalar_round_trip_parses_all_fields()
-    {
-        var json = """{"deviceHostAddress":"ab://10.0.0.1/1,0","tagPath":"Motor.Speed","dataType":"Real"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
-        def.TagPath.ShouldBe("Motor.Speed");
-        def.DeviceHostAddress.ShouldBe("ab://10.0.0.1/1,0");
-        def.DataType.ShouldBe(AbCipDataType.Real);
-        def.Writable.ShouldBeTrue();
-        def.IsArray.ShouldBeFalse();
-        def.ElementCount.ShouldBe(1);
-    }
-
-    // ── Array shape ──────────────────────────────────────────────────────────────────────
-
-    [Fact]
-    public void One_element_array_isArray_true_arrayLength_1_is_an_array_not_a_scalar()
-    {
-        var json = """{"tagPath":"Tags[0]","dataType":"DInt","isArray":true,"arrayLength":1}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.IsArray.ShouldBeTrue();
-        def.ElementCount.ShouldBe(1);
-    }
-
-    [Fact]
-    public void N_element_array_isArray_true_arrayLength_N_parses_correctly()
-    {
-        var json = """{"tagPath":"Buf","dataType":"SInt","isArray":true,"arrayLength":8}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.IsArray.ShouldBeTrue();
-        def.ElementCount.ShouldBe(8);
-    }
-
-    [Fact]
-    public void IsArray_true_arrayLength_0_is_canonical_scalar()
-    {
-        // Canonical rule: isArray:true AND arrayLength < 1 → scalar.
-        var json = """{"tagPath":"PT_101","isArray":true,"arrayLength":0}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.IsArray.ShouldBeFalse();
-        def.ElementCount.ShouldBe(1);
-    }
-
-    [Fact]
-    public void IsArray_true_arrayLength_absent_is_canonical_scalar()
-    {
-        // Canonical rule: isArray:true but arrayLength absent → scalar.
-        var json = """{"tagPath":"PT_101","isArray":true}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.IsArray.ShouldBeFalse();
-        def.ElementCount.ShouldBe(1);
-    }
-
-    // ── Rejection paths ──────────────────────────────────────────────────────────────────
-
-    [Fact]
-    public void Non_JSON_input_returns_false()
-        => AbCipEquipmentTagParser.TryParse("not json at all", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Non_object_JSON_array_returns_false()
-        => AbCipEquipmentTagParser.TryParse("""["tagPath","foo"]""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Non_object_JSON_string_returns_false()
-        => AbCipEquipmentTagParser.TryParse("\"Motor.Speed\"", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Missing_tagPath_returns_false()
-        => AbCipEquipmentTagParser.TryParse("""{"dataType":"DInt"}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Blank_tagPath_returns_false()
-        => AbCipEquipmentTagParser.TryParse("""{"tagPath":"   "}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void TagPath_as_number_returns_false()
-        => AbCipEquipmentTagParser.TryParse("""{"tagPath":42}""", out _).ShouldBeFalse();
-
-    // ── Writable field (Driver.AbCip.Contracts-001) ───────────────────────────────────────
-
-    [Fact]
-    public void Writable_false_is_honoured()
-    {
-        var json = """{"tagPath":"Sensor.Val","writable":false}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Writable_absent_defaults_to_true()
-    {
-        var json = """{"tagPath":"Sensor.Val"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void Writable_true_explicit_is_honoured()
-    {
-        var json = """{"tagPath":"Sensor.Val","writable":true}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Writable.ShouldBeTrue();
-    }
-
-    // ── Structure dataType (Driver.AbCip.Contracts-001 Structure concern) ─────────────────
-
-    /// <summary>
-    ///     A "dataType":"Structure" equipment-tag input is accepted and produces a Structure-typed
-    ///     definition with Members:null. The driver treats the tag path as a black-box dotted-path
-    ///     read (libplctag resolves the full path); UDT member declarations are not supported in the
-    ///     equipment-tag flow. This test documents current behaviour so a future change to reject
-    ///     Structure is a conscious choice.
-    /// </summary>
-    [Fact]
-    public void Structure_dataType_is_accepted_with_null_Members_and_returns_true()
-    {
-        var json = """{"tagPath":"Motor","dataType":"Structure"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.DataType.ShouldBe(AbCipDataType.Structure);
-        def.Members.ShouldBeNull();
-        def.TagPath.ShouldBe("Motor");
-    }
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagTests.cs
index af351073..bfb8fa69 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipEquipmentTagTests.cs
@@ -7,14 +7,16 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
 [Trait("Category", "Unit")]
 public class AbCipEquipmentTagTests
 {
+    private const string Raw = "line1/eq/tag";
+
     [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
+    public void Parses_equipment_tagconfig_into_a_definition()
     {
         var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Motor1.Speed","dataType":"Real"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(Raw);
         def.TagPath.ShouldBe("Motor1.Speed");
-        def.DeviceHostAddress.ShouldBe("ab://10.0.0.5/1,0");
+        def.DeviceHostAddress.ShouldBe(""); // v3: mapper never reads deviceHostAddress
         def.DataType.ShouldBe(AbCipDataType.Real);
         def.Writable.ShouldBeTrue();
     }
@@ -23,83 +25,82 @@ public class AbCipEquipmentTagTests
     public void Defaults_optional_fields_when_only_the_mandatory_tagPath_is_present()
     {
         var json = """{"tagPath":"PT_101"}""";
-        AbCipEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(Raw);
         def.TagPath.ShouldBe("PT_101");
-        def.DeviceHostAddress.ShouldBe(""); // absent → empty, matching AbCipTagConfigModel default
+        def.DeviceHostAddress.ShouldBe(""); // routing key travels on the RawTagEntry, not the blob
         def.DataType.ShouldBe(AbCipDataType.DInt); // AbCipTagConfigModel's default atomic type
     }
 
     [Fact]
     public void Rejects_a_non_abcip_blob()
-        => AbCipEquipmentTagParser.TryParse("""{"region":"x"}""", out _).ShouldBeFalse();
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"region":"x"}""", Raw, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_a_blob_with_an_empty_tagPath()
-        => AbCipEquipmentTagParser.TryParse("""{"tagPath":"  ","dataType":"DInt"}""", out _).ShouldBeFalse();
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"tagPath":"  ","dataType":"DInt"}""", Raw, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_tagPath_given_as_a_non_string()
-        => AbCipEquipmentTagParser.TryParse("""{"tagPath":42}""", out _).ShouldBeFalse();
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"tagPath":42}""", Raw, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_garbage()
-        => AbCipEquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_a_plain_authored_name_without_a_leading_brace()
-        => AbCipEquipmentTagParser.TryParse("Motor1.Speed", out _).ShouldBeFalse();
+        => AbCipTagDefinitionFactory.FromTagConfig("not json", Raw, out _).ShouldBeFalse();
 
     /// <summary>
-    ///     End-to-end driver-level proof: an AbCip driver with NO authored tags can still read an
-    ///     equipment-tag ref (the raw TagConfig JSON) — the resolver parses it into a transient
-    ///     definition (whose DeviceHostAddress names a configured device) and the read goes to the
-    ///     wire instead of returning BadNodeIdUnknown.
+    ///     End-to-end driver-level proof: an authored raw AbCip tag (RawPath + TagConfig blob delivered as a
+    ///     <c>RawTagEntry</c>) resolves by its RawPath and the read goes to the wire instead of returning
+    ///     BadNodeIdUnknown. This is the v3 replacement for the retired blob-parse-fallback resolver.
     /// </summary>
     [Fact]
-    public async Task Driver_resolves_an_equipment_ref_and_reads_instead_of_BadNodeIdUnknown()
+    public async Task Driver_resolves_a_raw_tag_and_reads_instead_of_BadNodeIdUnknown()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Motor1.Speed","dataType":"DInt"}""";
+        const string device = "ab://10.0.0.5/1,0";
+        const string rawPath = "line1/motor/speed";
+        var tagConfig = """{"tagPath":"Motor1.Speed","dataType":"DInt"}""";
         var factory = new FakeAbCipTagFactory();
         var opts = new AbCipDriverOptions
         {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
+            Devices = [new AbCipDeviceOptions(device)],
+            RawTags = [new global::ZB.MOM.WW.OtOpcUa.Core.Abstractions.RawTagEntry(rawPath, tagConfig, WriteIdempotent: false, DeviceName: device)],
         };
         var drv = new AbCipDriver(opts, "abcip-eq", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new FakeAbCipTag(p) { Value = 4242 };
 
-        var snapshots = await drv.ReadAsync([json], CancellationToken.None);
+        var snapshots = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         snapshots.Single().StatusCode.ShouldBe(AbCipStatusMapper.Good);
         snapshots.Single().StatusCode.ShouldNotBe(AbCipStatusMapper.BadNodeIdUnknown);
         snapshots.Single().Value.ShouldBe(4242);
+        // The runtime is keyed by the resolved libplctag tag path, not the RawPath identity.
+        factory.Tags.ShouldContainKey("Motor1.Speed");
     }
 
     /// <summary>
-    ///     End-to-end driver-level proof of the R2-11 Phase C flip: an equipment-tag ref carrying a
-    ///     TYPO'd <c>dataType</c> enum now REJECTS at the resolver (strict parse ⇒ <c>TryParse</c> false)
-    ///     so the read surfaces <see cref="AbCipStatusMapper.BadNodeIdUnknown"/> — instead of the old
-    ///     lenient behaviour that silently defaulted to <c>DInt</c> and published a wrong-width
-    ///     <c>Good</c>. Same driver + device wiring as the clean-read proof above; only the enum is
-    ///     mistyped.
+    ///     R2-11 Phase C strictness end-to-end: a raw tag whose TagConfig carries a TYPO'd <c>dataType</c>
+    ///     fails to map (<c>FromTagConfig</c> ⇒ false) so it never enters the driver's RawPath table; a read
+    ///     of that RawPath surfaces <see cref="AbCipStatusMapper.BadNodeIdUnknown"/> instead of a
+    ///     silently-defaulted wrong-width Good.
     /// </summary>
     [Fact]
-    public async Task Driver_read_of_a_typod_dataType_ref_surfaces_BadNodeIdUnknown()
+    public async Task Driver_read_of_a_typod_dataType_tag_surfaces_BadNodeIdUnknown()
     {
-        var typoJson = """{"deviceHostAddress":"ab://10.0.0.5/1,0","tagPath":"Motor1.Speed","dataType":"DIntt"}""";
+        const string device = "ab://10.0.0.5/1,0";
+        const string rawPath = "line1/motor/speed";
+        var typoConfig = """{"tagPath":"Motor1.Speed","dataType":"DIntt"}""";
         var factory = new FakeAbCipTagFactory();
         var opts = new AbCipDriverOptions
         {
-            Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
+            Devices = [new AbCipDeviceOptions(device)],
+            RawTags = [new global::ZB.MOM.WW.OtOpcUa.Core.Abstractions.RawTagEntry(rawPath, typoConfig, WriteIdempotent: false, DeviceName: device)],
         };
         var drv = new AbCipDriver(opts, "abcip-eq", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => new FakeAbCipTag(p) { Value = 4242 };
 
-        var snapshots = await drv.ReadAsync([typoJson], CancellationToken.None);
+        var snapshots = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         snapshots.Single().StatusCode.ShouldBe(AbCipStatusMapper.BadNodeIdUnknown);
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipFactoryArrayTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipFactoryArrayTagTests.cs
index bda261fc..101d1154 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipFactoryArrayTagTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipFactoryArrayTagTests.cs
@@ -5,18 +5,18 @@ using ZB.MOM.WW.OtOpcUa.Driver.AbCip;
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
 
 /// <summary>
-///     Regression coverage for Driver.AbCip-018 — the driver-config factory path
-///     (<see cref="AbCipDriverFactoryExtensions.ParseOptions"/>) dropped the array shape of a
-///     pre-declared tag. A <c>tags[]</c> entry with <c>"isArray": true, "elementCount": 4</c>
-///     deserialised into a scalar <see cref="AbCipTagDefinition"/> (because <c>AbCipTagDto</c> /
-///     <c>AbCipMemberDto</c> had no <c>ElementCount</c> / <c>IsArray</c> fields), so the tag read
-///     as a single scalar despite the explicit array declaration. These tests assert the array
-///     shape now survives factory deserialization for both top-level tags and UDT members, and
-///     that omitting the fields keeps the legacy scalar default (additive change — no break).
+///     ParseOptions timeout hardening + the array-shape round-trip through the v3 tag mapper. Under v3 the
+///     factory no longer builds typed tag definitions (it carries authored <c>RawTags</c> blobs verbatim);
+///     the array/member shape survives the TagConfig round-trip in
+///     <see cref="AbCipTagDefinitionFactory.FromTagConfig"/> instead. These tests assert the array shape
+///     survives mapping for both top-level tags and declared UDT members, and that omitting the fields keeps
+///     the scalar default.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class AbCipFactoryArrayTagTests
 {
+    private const string Raw = "line1/eq/tag";
+
     /// <summary>
     ///     A non-positive <c>TimeoutMs</c> clamps to the 2 s default rather than reaching libplctag's
     ///     <c>Tag.Timeout</c> setter (which throws <see cref="ArgumentOutOfRangeException"/> for a
@@ -44,103 +44,56 @@ public sealed class AbCipFactoryArrayTagTests
         opts.Timeout.ShouldBe(TimeSpan.FromMilliseconds(500));
     }
 
-    /// <summary>A driver-config tag declaring isArray/elementCount produces an array definition.</summary>
+    /// <summary>A TagConfig declaring isArray/arrayLength maps to an array definition.</summary>
     [Fact]
-    public void ParseOptions_threads_isArray_and_elementCount_into_tag_definition()
+    public void FromTagConfig_threads_isArray_and_arrayLength_into_tag_definition()
     {
-        const string json = """
-            {
-              "Tags": [ {
-                "Name": "Setpoints",
-                "DeviceHostAddress": "ab://10.0.0.5/1,0",
-                "TagPath": "Setpoints",
-                "DataType": "Real",
-                "isArray": true,
-                "elementCount": 4
-              } ]
-            }
-            """;
+        const string tagConfig = """{"tagPath":"Setpoints","dataType":"Real","isArray":true,"arrayLength":4}""";
 
-        var opts = AbCipDriverFactoryExtensions.ParseOptions("drv-1", json);
+        AbCipTagDefinitionFactory.FromTagConfig(tagConfig, Raw, out var tag).ShouldBeTrue();
 
-        var tag = opts.Tags.Single();
         tag.IsArray.ShouldBeTrue();
         tag.ElementCount.ShouldBe(4);
     }
 
-    /// <summary>A driver-config UDT member declaring isArray/elementCount produces an array member.</summary>
+    /// <summary>A declared UDT member declaring isArray/arrayLength maps to an array member.</summary>
     [Fact]
-    public void ParseOptions_threads_isArray_and_elementCount_into_structure_member()
+    public void FromTagConfig_threads_isArray_and_arrayLength_into_structure_member()
     {
-        const string json = """
-            {
-              "Tags": [ {
-                "Name": "Motor",
-                "DeviceHostAddress": "ab://10.0.0.5/1,0",
-                "TagPath": "Motor",
-                "DataType": "Structure",
-                "Members": [ {
-                  "Name": "Setpoints",
-                  "DataType": "Real",
-                  "isArray": true,
-                  "elementCount": 4
-                } ]
-              } ]
-            }
+        const string tagConfig = """
+            {"tagPath":"Motor","dataType":"Structure",
+             "members":[{"name":"Setpoints","dataType":"Real","isArray":true,"arrayLength":4}]}
             """;
 
-        var opts = AbCipDriverFactoryExtensions.ParseOptions("drv-1", json);
+        AbCipTagDefinitionFactory.FromTagConfig(tagConfig, Raw, out var tag).ShouldBeTrue();
 
-        var member = opts.Tags.Single().Members!.Single();
+        var member = tag.Members!.Single();
         member.IsArray.ShouldBeTrue();
         member.ElementCount.ShouldBe(4);
     }
 
-    /// <summary>A driver-config tag without array fields stays scalar (additive change — no break).</summary>
+    /// <summary>A TagConfig without array fields stays scalar.</summary>
     [Fact]
-    public void ParseOptions_defaults_to_scalar_when_array_fields_absent()
+    public void FromTagConfig_defaults_to_scalar_when_array_fields_absent()
     {
-        const string json = """
-            {
-              "Tags": [ {
-                "Name": "Speed",
-                "DeviceHostAddress": "ab://10.0.0.5/1,0",
-                "TagPath": "Speed",
-                "DataType": "DInt"
-              } ]
-            }
-            """;
+        const string tagConfig = """{"tagPath":"Speed","dataType":"DInt"}""";
 
-        var opts = AbCipDriverFactoryExtensions.ParseOptions("drv-1", json);
+        AbCipTagDefinitionFactory.FromTagConfig(tagConfig, Raw, out var tag).ShouldBeTrue();
 
-        var tag = opts.Tags.Single();
         tag.IsArray.ShouldBeFalse();
         tag.ElementCount.ShouldBe(1);
     }
 
-    /// <summary>A non-positive elementCount falls back to the scalar count of 1 (positive-value guard).</summary>
+    /// <summary>A non-positive arrayLength falls back to the scalar count of 1 (canonical rule: scalar).</summary>
     [Fact]
-    public void ParseOptions_guards_against_non_positive_elementCount()
+    public void FromTagConfig_guards_against_non_positive_arrayLength()
     {
-        const string json = """
-            {
-              "Tags": [ {
-                "Name": "Speed",
-                "DeviceHostAddress": "ab://10.0.0.5/1,0",
-                "TagPath": "Speed",
-                "DataType": "DInt",
-                "isArray": true,
-                "elementCount": 0
-              } ]
-            }
-            """;
+        const string tagConfig = """{"tagPath":"Speed","dataType":"DInt","isArray":true,"arrayLength":0}""";
 
-        var opts = AbCipDriverFactoryExtensions.ParseOptions("drv-1", json);
+        AbCipTagDefinitionFactory.FromTagConfig(tagConfig, Raw, out var tag).ShouldBeTrue();
 
-        var tag = opts.Tags.Single();
-        // elementCount <= 0 is degenerate — count clamps to 1; the explicit IsArray flag still
-        // carries (a 1-element array is valid), mirroring the equipment-tag parser's contract.
+        // arrayLength <= 0 with isArray:true is degenerate — canonical rule collapses to scalar.
         tag.ElementCount.ShouldBe(1);
-        tag.IsArray.ShouldBeTrue();
+        tag.IsArray.ShouldBeFalse();
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipHostProbeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipHostProbeTests.cs
index 4e8366ec..bbb25483 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipHostProbeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipHostProbeTests.cs
@@ -172,11 +172,10 @@ public sealed class AbCipHostProbeTests
                 new AbCipDeviceOptions("ab://10.0.0.5/1,0"),
                 new AbCipDeviceOptions("ab://10.0.0.6/1,0"),
             ],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("A", "ab://10.0.0.5/1,0", "A", AbCipDataType.DInt),
-                new AbCipTagDefinition("B", "ab://10.0.0.6/1,0", "B", AbCipDataType.DInt),
-            ],
+                new AbCipTagDefinition("B", "ab://10.0.0.6/1,0", "B", AbCipDataType.DInt))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -216,11 +215,10 @@ public sealed class AbCipHostProbeTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.7/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.7/1,0", "Motor1", AbCipDataType.Structure,
-                    Members: [new AbCipStructureMember("Speed", AbCipDataType.DInt)]),
-            ],
+                    Members: [new AbCipStructureMember("Speed", AbCipDataType.DInt)]))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipLoggingTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipLoggingTests.cs
index 73f2f5b8..11123518 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipLoggingTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipLoggingTests.cs
@@ -93,7 +93,7 @@ public sealed class AbCipLoggingTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory, logger: logger);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -124,7 +124,7 @@ public sealed class AbCipLoggingTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory, logger: logger);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPerDeviceConnectionOptionsTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPerDeviceConnectionOptionsTests.cs
index c290672f..78077e41 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPerDeviceConnectionOptionsTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPerDeviceConnectionOptionsTests.cs
@@ -29,7 +29,7 @@ public sealed class AbCipPerDeviceConnectionOptionsTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device, AllowPacking: false)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -49,7 +49,7 @@ public sealed class AbCipPerDeviceConnectionOptionsTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -69,7 +69,7 @@ public sealed class AbCipPerDeviceConnectionOptionsTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(micro, AbCipPlcFamily.Micro800)],
-            Tags = [new AbCipTagDefinition("X", micro, "X", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("X", micro, "X", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -88,7 +88,7 @@ public sealed class AbCipPerDeviceConnectionOptionsTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device, ConnectionSize: 504)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -106,7 +106,7 @@ public sealed class AbCipPerDeviceConnectionOptionsTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(Device)],
-            Tags = [new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("Speed", Device, "Speed", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPlcFamilyTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPlcFamilyTests.cs
index 78b496c2..13acd500 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPlcFamilyTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipPlcFamilyTests.cs
@@ -109,7 +109,7 @@ public sealed class AbCipPlcFamilyTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://192.168.1.20/", AbCipPlcFamily.Micro800)],
-            Tags = [new AbCipTagDefinition("X", "ab://192.168.1.20/", "X", AbCipDataType.DInt)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("X", "ab://192.168.1.20/", "X", AbCipDataType.DInt)),
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -141,12 +141,11 @@ public sealed class AbCipPlcFamilyTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0", AbCipPlcFamily.GuardLogix)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("NormalTag", "ab://10.0.0.5/1,0", "N", AbCipDataType.DInt),
                 new AbCipTagDefinition("SafetyTag", "ab://10.0.0.5/1,0", "S", AbCipDataType.DInt,
-                    Writable: true, SafetyTag: true),
-            ],
+                    Writable: true, SafetyTag: true))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -167,11 +166,10 @@ public sealed class AbCipPlcFamilyTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0", AbCipPlcFamily.GuardLogix)],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("SafetySet", "ab://10.0.0.5/1,0", "S", AbCipDataType.DInt,
-                    Writable: true, SafetyTag: true),
-            ],
+                    Writable: true, SafetyTag: true))
+            ,
             Probe = new AbCipProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRawTags.cs
new file mode 100644
index 00000000..f663a2c4
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRawTags.cs
@@ -0,0 +1,26 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
+
+/// <summary>
+///     Test helper bridging the pre-v3 pre-declared-tag authoring style (a typed
+///     <see cref="AbCipTagDefinition"/>) to the v3 RawPath seam the driver now consumes
+///     (<see cref="RawTagEntry"/>). Each typed def is serialised to its <c>TagConfig</c> blob via
+///     <see cref="AbCipTagDefinitionFactory.ToTagConfig"/>, and the def's identity (<c>Name</c> → RawPath),
+///     device routing key (<c>DeviceHostAddress</c> → <see cref="RawTagEntry.DeviceName"/>) and write-idempotence
+///     travel on the entry — exactly the shape the deploy artifact delivers. Lets the driver's read / write /
+///     discovery suites keep expressing fixtures as typed definitions while exercising the v3
+///     <c>RawTags</c> → <c>FromTagConfig</c> table-build path.
+/// </summary>
+internal static class AbCipRawTags
+{
+    /// <summary>Projects typed definitions to the driver's <c>RawTags</c> option shape.</summary>
+    /// <param name="defs">The typed definitions to project.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/> list.</returns>
+    public static IReadOnlyList<RawTagEntry> From(params AbCipTagDefinition[] defs) =>
+        [.. defs.Select(d => new RawTagEntry(
+            RawPath: d.Name,
+            TagConfig: AbCipTagDefinitionFactory.ToTagConfig(d),
+            WriteIdempotent: d.WriteIdempotent,
+            DeviceName: d.DeviceHostAddress))];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipResolveHostTests.cs
index fd305b8f..687acbc6 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipResolveHostTests.cs
@@ -1,14 +1,15 @@
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.AbCip;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
 
 /// <summary>
 ///     CONV-4 — <see cref="AbCipDriver.ResolveHost"/> keys per-host resilience (bulkhead / circuit
-///     breaker). It must resolve an equipment-tag reference (raw TagConfig JSON) to its OWN device
-///     host, not fall back to the first device — otherwise a broken device B trips device A's
-///     breaker. Authored tags and unknown refs keep the current fallback.
+///     breaker). It must resolve an authored tag (by its RawPath) to its OWN device host, not fall back
+///     to the first device — otherwise a broken device B trips device A's breaker. Unknown refs keep the
+///     current first-device fallback.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class AbCipResolveHostTests
@@ -16,21 +17,27 @@ public sealed class AbCipResolveHostTests
     private const string DeviceA = "ab://10.0.0.5/1,0";
     private const string DeviceB = "ab://10.0.0.6/1,0";
 
-    private static AbCipDriver NewDriver() => new(
+    private static AbCipDriver NewDriver(params RawTagEntry[] rawTags) => new(
         new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions(DeviceA), new AbCipDeviceOptions(DeviceB)],
+            RawTags = rawTags,
             Probe = new AbCipProbeOptions { Enabled = false },
         },
         "abcip-1", new FakeAbCipTagFactory());
 
-    /// <summary>An equipment-tag ref naming device B resolves to device B's host, not the first device.</summary>
+    /// <summary>An authored tag routed to device B resolves to device B's host, not the first device.</summary>
     [Fact]
-    public void ResolveHost_EquipmentTagRef_ReturnsItsOwnDeviceHost()
+    public async Task ResolveHost_TagRoutedToDeviceB_ReturnsItsOwnDeviceHost()
     {
-        var drv = NewDriver();
-        var json = $$"""{"deviceHostAddress":"{{DeviceB}}","tagPath":"Motor1.Speed","dataType":"DInt"}""";
-        drv.ResolveHost(json).ShouldBe(DeviceB);
+        var drv = NewDriver(new RawTagEntry(
+            RawPath: "line1/motorB/speed",
+            TagConfig: """{"tagPath":"Motor1.Speed","dataType":"DInt"}""",
+            WriteIdempotent: false,
+            DeviceName: DeviceB));
+        await drv.InitializeAsync("{}", CancellationToken.None);
+
+        drv.ResolveHost("line1/motorB/speed").ShouldBe(DeviceB);
     }
 
     /// <summary>An unresolvable ref keeps the current first-device fallback.</summary>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRuntimeConcurrencyTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRuntimeConcurrencyTests.cs
index 118ad5a9..8c9bb24f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRuntimeConcurrencyTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipRuntimeConcurrencyTests.cs
@@ -70,7 +70,7 @@ public sealed class AbCipRuntimeConcurrencyTests
         var opts = new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
         };
         return new AbCipDriver(opts, "drv-1", factory);
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipSubscriptionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipSubscriptionTests.cs
index 1bb8c48c..901589a1 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipSubscriptionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipSubscriptionTests.cs
@@ -15,7 +15,7 @@ public sealed class AbCipSubscriptionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbCipRawTags.From(tags),
         }, "drv-1", factory);
         return (drv, factory);
     }
@@ -161,11 +161,10 @@ public sealed class AbCipSubscriptionTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.5/1,0", "Motor1", AbCipDataType.Structure,
-                    Members: [new AbCipStructureMember("Speed", AbCipDataType.DInt)]),
-            ],
+                    Members: [new AbCipStructureMember("Speed", AbCipDataType.DInt)]))
+            ,
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
         factory.Customise = p => p.TagName == "Motor1.Speed"
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipTagDefinitionFactoryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipTagDefinitionFactoryTests.cs
new file mode 100644
index 00000000..62468459
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipTagDefinitionFactoryTests.cs
@@ -0,0 +1,182 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Driver.AbCip;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests;
+
+/// <summary>
+///     Dedicated unit tests for <see cref="AbCipTagDefinitionFactory.FromTagConfig"/>.
+///     Covers all distinct outcome branches: valid scalar, 1-element array, N-element array,
+///     degenerate array shapes, non-JSON input, non-object JSON, blank/missing tagPath,
+///     the <c>writable</c> field, and the <c>Structure</c> dataType path. Under v3 the definition's
+///     identity (<c>Name</c>) is the RawPath the mapper is handed, not the blob, and the mapper does
+///     NOT read <c>deviceHostAddress</c> (device placement travels on the RawTagEntry).
+/// </summary>
+[Trait("Category", "Unit")]
+public class AbCipTagDefinitionFactoryTests
+{
+    private const string Raw = "line1/eq/tag";
+
+    // ── Happy-path scalar ────────────────────────────────────────────────────────────────
+
+    [Fact]
+    public void Valid_scalar_round_trip_parses_all_fields()
+    {
+        var json = """{"deviceHostAddress":"ab://10.0.0.1/1,0","tagPath":"Motor.Speed","dataType":"Real"}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(Raw);
+        def.TagPath.ShouldBe("Motor.Speed");
+        def.DeviceHostAddress.ShouldBe(""); // v3: mapper never reads deviceHostAddress
+        def.DataType.ShouldBe(AbCipDataType.Real);
+        def.Writable.ShouldBeTrue();
+        def.IsArray.ShouldBeFalse();
+        def.ElementCount.ShouldBe(1);
+    }
+
+    // ── Array shape ──────────────────────────────────────────────────────────────────────
+
+    [Fact]
+    public void One_element_array_isArray_true_arrayLength_1_is_an_array_not_a_scalar()
+    {
+        var json = """{"tagPath":"Tags[0]","dataType":"DInt","isArray":true,"arrayLength":1}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.IsArray.ShouldBeTrue();
+        def.ElementCount.ShouldBe(1);
+    }
+
+    [Fact]
+    public void N_element_array_isArray_true_arrayLength_N_parses_correctly()
+    {
+        var json = """{"tagPath":"Buf","dataType":"SInt","isArray":true,"arrayLength":8}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.IsArray.ShouldBeTrue();
+        def.ElementCount.ShouldBe(8);
+    }
+
+    [Fact]
+    public void IsArray_true_arrayLength_0_is_canonical_scalar()
+    {
+        // Canonical rule: isArray:true AND arrayLength < 1 → scalar.
+        var json = """{"tagPath":"PT_101","isArray":true,"arrayLength":0}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.IsArray.ShouldBeFalse();
+        def.ElementCount.ShouldBe(1);
+    }
+
+    [Fact]
+    public void IsArray_true_arrayLength_absent_is_canonical_scalar()
+    {
+        // Canonical rule: isArray:true but arrayLength absent → scalar.
+        var json = """{"tagPath":"PT_101","isArray":true}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.IsArray.ShouldBeFalse();
+        def.ElementCount.ShouldBe(1);
+    }
+
+    // ── Rejection paths ──────────────────────────────────────────────────────────────────
+
+    [Fact]
+    public void Non_JSON_input_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("not json at all", Raw, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Non_object_JSON_array_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("""["tagPath","foo"]""", Raw, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Non_object_JSON_string_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("\"Motor.Speed\"", Raw, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Missing_tagPath_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"dataType":"DInt"}""", Raw, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Blank_tagPath_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"tagPath":"   "}""", Raw, out _).ShouldBeFalse();
+
+    [Fact]
+    public void TagPath_as_number_returns_false()
+        => AbCipTagDefinitionFactory.FromTagConfig("""{"tagPath":42}""", Raw, out _).ShouldBeFalse();
+
+    // ── Writable field ────────────────────────────────────────────────────────────────────
+
+    [Fact]
+    public void Writable_false_is_honoured()
+    {
+        var json = """{"tagPath":"Sensor.Val","writable":false}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Writable.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Writable_absent_defaults_to_true()
+    {
+        var json = """{"tagPath":"Sensor.Val"}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Writable.ShouldBeTrue();
+    }
+
+    [Fact]
+    public void Writable_true_explicit_is_honoured()
+    {
+        var json = """{"tagPath":"Sensor.Val","writable":true}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.Writable.ShouldBeTrue();
+    }
+
+    // ── Structure dataType ────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    ///     A "dataType":"Structure" equipment-tag input is accepted and produces a Structure-typed
+    ///     definition with Members:null. The driver treats the tag path as a black-box dotted-path
+    ///     read (libplctag resolves the full path); UDT member declarations are not authored via the
+    ///     production equipment-tag flow (AbCipTagConfigModel emits no members key).
+    /// </summary>
+    [Fact]
+    public void Structure_dataType_is_accepted_with_null_Members_and_returns_true()
+    {
+        var json = """{"tagPath":"Motor","dataType":"Structure"}""";
+        AbCipTagDefinitionFactory.FromTagConfig(json, Raw, out var def).ShouldBeTrue();
+        def!.DataType.ShouldBe(AbCipDataType.Structure);
+        def.Members.ShouldBeNull();
+        def.TagPath.ShouldBe("Motor");
+    }
+
+    // ── ToTagConfig / FromTagConfig round-trip (v3 RawTagEntry carrier) ────────────────────
+
+    /// <summary>
+    ///     A typed definition serialised via <see cref="AbCipTagDefinitionFactory.ToTagConfig"/> and
+    ///     re-read via <see cref="AbCipTagDefinitionFactory.FromTagConfig"/> reproduces every per-tag
+    ///     field except the out-of-band device routing key + WriteIdempotent (which travel on the
+    ///     RawTagEntry, not the blob). Covers the array + declared-member round-trip the driver-test
+    ///     AbCipRawTags helper relies on.
+    /// </summary>
+    [Fact]
+    public void ToTagConfig_FromTagConfig_round_trips_arrays_and_members()
+    {
+        var def = new AbCipTagDefinition(
+            Name: "Motor1", DeviceHostAddress: "ab://10.0.0.5/1,0", TagPath: "Motor1",
+            DataType: AbCipDataType.Structure, Writable: false, SafetyTag: true,
+            Members:
+            [
+                new AbCipStructureMember("Speed", AbCipDataType.DInt),
+                new AbCipStructureMember("Buf", AbCipDataType.Real, Writable: false, ElementCount: 4, IsArray: true),
+            ]);
+
+        var blob = AbCipTagDefinitionFactory.ToTagConfig(def);
+        AbCipTagDefinitionFactory.FromTagConfig(blob, "Motor1", out var back).ShouldBeTrue();
+
+        back!.Name.ShouldBe("Motor1");
+        back.DeviceHostAddress.ShouldBe(""); // routing key not in the blob
+        back.TagPath.ShouldBe("Motor1");
+        back.DataType.ShouldBe(AbCipDataType.Structure);
+        back.Writable.ShouldBeFalse();
+        back.SafetyTag.ShouldBeTrue();
+        back.Members!.Count.ShouldBe(2);
+        back.Members[0].Name.ShouldBe("Speed");
+        back.Members[1].IsArray.ShouldBeTrue();
+        back.Members[1].ElementCount.ShouldBe(4);
+        back.Members[1].Writable.ShouldBeFalse();
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipUdtMemberTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipUdtMemberTests.cs
index fea9b9f6..50aab447 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipUdtMemberTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/AbCipUdtMemberTests.cs
@@ -16,8 +16,7 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition(
                     Name: "Motor1",
                     DeviceHostAddress: "ab://10.0.0.5/1,0",
@@ -28,8 +27,8 @@ public sealed class AbCipUdtMemberTests
                         new AbCipStructureMember("Speed", AbCipDataType.DInt),
                         new AbCipStructureMember("Running", AbCipDataType.Bool, Writable: false),
                         new AbCipStructureMember("SetPoint", AbCipDataType.Real, WriteIdempotent: true),
-                    ]),
-            ],
+                    ]))
+            ,
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -63,15 +62,14 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.5/1,0", "Motor1", AbCipDataType.Structure,
                     Members:
                     [
                         new AbCipStructureMember("Speed", AbCipDataType.DInt),
                         new AbCipStructureMember("Running", AbCipDataType.Bool),
-                    ]),
-            ],
+                    ]))
+            ,
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -91,14 +89,13 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.5/1,0", "Motor1", AbCipDataType.Structure,
                     Members:
                     [
                         new AbCipStructureMember("SetPoint", AbCipDataType.Real),
-                    ]),
-            ],
+                    ]))
+            ,
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -117,14 +114,13 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.5/1,0", "Motor1", AbCipDataType.Structure,
                     Members:
                     [
                         new AbCipStructureMember("Status", AbCipDataType.DInt, Writable: false),
-                    ]),
-            ],
+                    ]))
+            ,
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -145,7 +141,7 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("OpaqueUdt", "ab://10.0.0.5/1,0", "OpaqueUdt", AbCipDataType.Structure)],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("OpaqueUdt", "ab://10.0.0.5/1,0", "OpaqueUdt", AbCipDataType.Structure)),
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -163,7 +159,7 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbCipTagDefinition("EmptyUdt", "ab://10.0.0.5/1,0", "E", AbCipDataType.Structure, Members: [])],
+            RawTags = AbCipRawTags.From(new AbCipTagDefinition("EmptyUdt", "ab://10.0.0.5/1,0", "E", AbCipDataType.Structure, Members: [])),
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -181,16 +177,15 @@ public sealed class AbCipUdtMemberTests
         var drv = new AbCipDriver(new AbCipDriverOptions
         {
             Devices = [new AbCipDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
-            [
+            RawTags = AbCipRawTags.From(
                 new AbCipTagDefinition("FlatA", "ab://10.0.0.5/1,0", "A", AbCipDataType.DInt),
                 new AbCipTagDefinition("Motor1", "ab://10.0.0.5/1,0", "Motor1", AbCipDataType.Structure,
                     Members:
                     [
                         new AbCipStructureMember("Speed", AbCipDataType.DInt),
                     ]),
-                new AbCipTagDefinition("FlatB", "ab://10.0.0.5/1,0", "B", AbCipDataType.Real),
-            ],
+                new AbCipTagDefinition("FlatB", "ab://10.0.0.5/1,0", "B", AbCipDataType.Real))
+            ,
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyRawTags.cs
new file mode 100644
index 00000000..ba0babd1
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyRawTags.cs
@@ -0,0 +1,32 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="AbLegacyTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + owning
+///     DeviceName), and the driver rebuilds the typed definitions via
+///     <see cref="AbLegacyTagDefinitionFactory"/>. These integration smoke tests keep expressing their
+///     intent as typed definitions; this helper serialises each back to its TagConfig blob (via
+///     <see cref="AbLegacyTagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> and whose <see cref="RawTagEntry.DeviceName"/> is the def's
+///     <c>DeviceHostAddress</c> — so the round-trip through the real mapper reproduces the same definition
+///     the test authored, keyed by the same name the read/write/subscribe call sites use and routed to the
+///     same device (the driver matches DeviceName against a configured device's Name or HostAddress).
+///     Mirrors the unit-test project's helper of the same name.
+/// </summary>
+internal static class AbLegacyRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(AbLegacyTagDefinition def)
+        => new(def.Name, AbLegacyTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, DeviceName: def.DeviceHostAddress);
+
+    /// <summary>Serialises typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert (array, params, or a collection expression).</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params AbLegacyTagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs
index 0aa29fc6..313892ce 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs
@@ -51,13 +51,12 @@ public sealed class AbLegacyReadSmokeTests(AbLegacyServerFixture sim)
         await using var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions(deviceUri, profile.Family)],
-            Tags = [
+            RawTags = AbLegacyRawTags.Entries(
                 new AbLegacyTagDefinition(
                     Name: "IntCounter",
                     DeviceHostAddress: deviceUri,
                     Address: "N7:0",
-                    DataType: AbLegacyDataType.Int),
-            ],
+                    DataType: AbLegacyDataType.Int)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, driverInstanceId: $"ablegacy-smoke-{profile.Family}");
@@ -96,14 +95,13 @@ public sealed class AbLegacyReadSmokeTests(AbLegacyServerFixture sim)
         await using var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions(deviceUri, AbLegacyPlcFamily.Slc500)],
-            Tags = [
+            RawTags = AbLegacyRawTags.Entries(
                 new AbLegacyTagDefinition(
                     Name: "Scratch",
                     DeviceHostAddress: deviceUri,
                     Address: "N7:5",
                     DataType: AbLegacyDataType.Int,
-                    Writable: true),
-            ],
+                    Writable: true)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, driverInstanceId: "ablegacy-smoke-rw");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyArrayTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyArrayTests.cs
index 3123f85f..b01bfbee 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyArrayTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyArrayTests.cs
@@ -22,7 +22,7 @@ public sealed class AbLegacyArrayTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbLegacyRawTags.Entries(tags),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "ablegacy-array", factory);
         return (drv, factory);
@@ -169,7 +169,7 @@ public sealed class AbLegacyArrayTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Vector", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int, ArrayLength: 8)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Vector", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int, ArrayLength: 8)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "ablegacy-array", new FakeAbLegacyTagFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -231,30 +231,30 @@ public sealed class AbLegacyArrayTests
 
     // ---- Equipment-tag resolver threads arrayLength ----
 
-    /// <summary>The equipment-tag parser threads <c>arrayLength</c> into the transient definition.</summary>
+    /// <summary>The tag-definition factory threads <c>arrayLength</c> into the definition.</summary>
     [Fact]
-    public void EquipmentTagParser_threads_arrayLength()
+    public void TagDefinitionFactory_threads_arrayLength()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":true,"arrayLength":10}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":10}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBe(10);
     }
 
-    /// <summary>The parser caps <c>arrayLength</c> at the PCCC 256-word file maximum (isArray:true).</summary>
+    /// <summary>The factory caps <c>arrayLength</c> at the PCCC 256-word file maximum (isArray:true).</summary>
     [Fact]
-    public void EquipmentTagParser_caps_arrayLength_at_256()
+    public void TagDefinitionFactory_caps_arrayLength_at_256()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":true,"arrayLength":99999}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":99999}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBe(256);
     }
 
-    /// <summary>A scalar equipment tag (no arrayLength) leaves ArrayLength null.</summary>
+    /// <summary>A scalar tag (no arrayLength) leaves ArrayLength null.</summary>
     [Fact]
-    public void EquipmentTagParser_scalar_leaves_arrayLength_null()
+    public void TagDefinitionFactory_scalar_leaves_arrayLength_null()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int"}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int"}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
@@ -264,19 +264,19 @@ public sealed class AbLegacyArrayTests
     ///     cleared / absent isArray must leave ArrayLength null and never produce an orphan array.
     /// </summary>
     [Fact]
-    public void EquipmentTagParser_arrayLength_without_isArray_is_scalar()
+    public void TagDefinitionFactory_arrayLength_without_isArray_is_scalar()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","arrayLength":8}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int","arrayLength":8}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
     /// <summary>C-2 regression: <c>isArray:false</c> with a positive arrayLength is a SCALAR.</summary>
     [Fact]
-    public void EquipmentTagParser_isArray_false_with_arrayLength_is_scalar()
+    public void TagDefinitionFactory_isArray_false_with_arrayLength_is_scalar()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":false,"arrayLength":8}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int","isArray":false,"arrayLength":8}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
@@ -286,32 +286,33 @@ public sealed class AbLegacyArrayTests
     ///     as a 1-element array.
     /// </summary>
     [Fact]
-    public void EquipmentTagParser_isArray_true_arrayLength_one_is_one_element_array()
+    public void TagDefinitionFactory_isArray_true_arrayLength_one_is_one_element_array()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":true,"arrayLength":1}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var json = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":1}""";
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, "eq/a", out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBe(1);
     }
 
     /// <summary>
-    ///     End-to-end: an AbLegacy driver with NO authored tags reads an equipment-tag ref whose
-    ///     TagConfig carries <c>isArray:true</c> + <c>arrayLength</c> — the resolver threads the
-    ///     count and the read surfaces a typed array, capping the libplctag element count at 256.
+    ///     End-to-end: an AbLegacy driver reads a raw tag authored as a <see cref="RawTagEntry"/> whose
+    ///     TagConfig carries <c>isArray:true</c> + <c>arrayLength</c> — the mapper threads the count and
+    ///     the read surfaces a typed array, capping the libplctag element count at 256.
     /// </summary>
     [Fact]
-    public async Task Driver_reads_equipment_array_ref_as_typed_array()
+    public async Task Driver_reads_array_rawtag_as_typed_array()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":true,"arrayLength":3}""";
+        const string rawPath = "cell/ablegacy/dev1/Vec";
+        var tagConfig = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":3}""";
         var factory = new FakeAbLegacyTagFactory { Customise = p => new FakeAbLegacyTag(p) { ArrayValue = new short[] { 11, 22, 33 } } };
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
+            RawTags = [new RawTagEntry(rawPath, tagConfig, WriteIdempotent: false, DeviceName: "ab://10.0.0.5/1,0")],
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "ablegacy-eq-array", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(AbLegacyStatusMapper.Good);
         var arr = r[0].Value.ShouldBeOfType<short[]>();
@@ -320,24 +321,25 @@ public sealed class AbLegacyArrayTests
     }
 
     /// <summary>
-    ///     C-2 end-to-end: an equipment-tag ref carrying <c>isArray:false, arrayLength:8</c> reads
-    ///     a single SCALAR value (the parser drops the orphan length), so the read never decodes a
+    ///     C-2 end-to-end: a raw tag whose TagConfig carries <c>isArray:false, arrayLength:8</c> reads
+    ///     a single SCALAR value (the mapper drops the orphan length), so the read never decodes a
     ///     phantom 8-element array against a scalar node. ElementCount stays 1.
     /// </summary>
     [Fact]
     public async Task Driver_reads_isArray_false_with_arrayLength_as_scalar()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int","isArray":false,"arrayLength":8}""";
+        const string rawPath = "cell/ablegacy/dev1/Scl";
+        var tagConfig = """{"address":"N7:0","dataType":"Int","isArray":false,"arrayLength":8}""";
         var factory = new FakeAbLegacyTagFactory { Customise = p => new FakeAbLegacyTag(p) { Value = 99 } };
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
+            RawTags = [new RawTagEntry(rawPath, tagConfig, WriteIdempotent: false, DeviceName: "ab://10.0.0.5/1,0")],
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "ablegacy-eq-scalar", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(AbLegacyStatusMapper.Good);
         r[0].Value.ShouldBe(99);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitIndexRangeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitIndexRangeTests.cs
index 3fde086d..321b1e02 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitIndexRangeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitIndexRangeTests.cs
@@ -80,7 +80,7 @@ public sealed class AbLegacyBitIndexRangeTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("LBit20", "ab://10.0.0.5/1,0", "L9:0/20", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("LBit20", "ab://10.0.0.5/1,0", "L9:0/20", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -105,7 +105,7 @@ public sealed class AbLegacyBitIndexRangeTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Bit0", "ab://10.0.0.5/1,0", "N7:0/0", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Bit0", "ab://10.0.0.5/1,0", "N7:0/0", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitRmwTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitRmwTests.cs
index f9941642..53824c40 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitRmwTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyBitRmwTests.cs
@@ -19,7 +19,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Flag3", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Flag3", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -43,7 +43,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -67,7 +67,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbLegacyRawTags.Entries(tags),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -89,11 +89,11 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
+            RawTags = AbLegacyRawTags.Entries(
             [
                 new AbLegacyTagDefinition("Bit0", "ab://10.0.0.5/1,0", "N7:0/0", AbLegacyDataType.Bit),
                 new AbLegacyTagDefinition("Bit5", "ab://10.0.0.5/1,0", "N7:0/5", AbLegacyDataType.Bit),
-            ],
+            ]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -120,7 +120,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", bitAddr, AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", bitAddr, AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -143,7 +143,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "B3:0/3", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "B3:0/3", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -167,7 +167,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbLegacyRawTags.Entries(tags),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -195,7 +195,7 @@ public sealed class AbLegacyBitRmwTests
         var opts = new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Bit2", "ab://10.0.0.5/1,0", "N7:0/2", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Bit2", "ab://10.0.0.5/1,0", "N7:0/2", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         };
 
@@ -241,7 +241,7 @@ public sealed class AbLegacyBitRmwTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "I:0/3", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("F", "ab://10.0.0.5/1,0", "I:0/3", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyCapabilityTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyCapabilityTests.cs
index fa4cdcef..99977356 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyCapabilityTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyCapabilityTests.cs
@@ -19,11 +19,11 @@ public sealed class AbLegacyCapabilityTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0", DeviceName: "Press-SLC-1")],
-            Tags =
+            RawTags = AbLegacyRawTags.Entries(
             [
                 new AbLegacyTagDefinition("Speed", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int),
                 new AbLegacyTagDefinition("Temperature", "ab://10.0.0.5/1,0", "F8:0", AbLegacyDataType.Float, Writable: false),
-            ],
+            ]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -50,7 +50,7 @@ public sealed class AbLegacyCapabilityTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -75,7 +75,7 @@ public sealed class AbLegacyCapabilityTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -190,11 +190,11 @@ public sealed class AbLegacyCapabilityTests
                 new AbLegacyDeviceOptions("ab://10.0.0.5/1,0"),
                 new AbLegacyDeviceOptions("ab://10.0.0.6/1,0"),
             ],
-            Tags =
+            RawTags = AbLegacyRawTags.Entries(
             [
                 new AbLegacyTagDefinition("A", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int),
                 new AbLegacyTagDefinition("B", "ab://10.0.0.6/1,0", "N7:0", AbLegacyDataType.Int),
-            ],
+            ]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDisposeAndResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDisposeAndResolveHostTests.cs
index 1037ab08..c629e285 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDisposeAndResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDisposeAndResolveHostTests.cs
@@ -29,7 +29,7 @@ public sealed class AbLegacyDisposeAndResolveHostTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0", AbLegacyPlcFamily.Slc500)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-dispose", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -72,7 +72,7 @@ public sealed class AbLegacyDisposeAndResolveHostTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -135,7 +135,7 @@ public sealed class AbLegacyDisposeAndResolveHostTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
         }, "drv-1");
         drv.ResolveHost("X").ShouldBe("ab://10.0.0.5/1,0");
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDriverTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDriverTests.cs
index ee0266ab..16a38802 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDriverTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyDriverTests.cs
@@ -134,7 +134,7 @@ public sealed class AbLegacyDriverTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/", AbLegacyPlcFamily.Slc500)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -154,7 +154,7 @@ public sealed class AbLegacyDriverTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,2", AbLegacyPlcFamily.Slc500)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,2", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,2", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -171,7 +171,7 @@ public sealed class AbLegacyDriverTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/", AbLegacyPlcFamily.MicroLogix)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/", "L9:0", AbLegacyDataType.Long)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/", "L9:0", AbLegacyDataType.Long)]),
         }, "drv-1");
 
         var ex = await Should.ThrowAsync<InvalidOperationException>(
@@ -188,7 +188,7 @@ public sealed class AbLegacyDriverTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0", AbLegacyPlcFamily.Slc500)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "L9:0", AbLegacyDataType.Long)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "L9:0", AbLegacyDataType.Long)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1");
 
@@ -209,7 +209,7 @@ public sealed class AbLegacyDriverTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0", AbLegacyPlcFamily.Plc5)],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "L9:0", AbLegacyDataType.Long)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "L9:0", AbLegacyDataType.Long)]),
         }, "drv-1");
 
         var ex = await Should.ThrowAsync<InvalidOperationException>(
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagParserStrictnessTests.cs
index 67f4dfbd..d0464854 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagParserStrictnessTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagParserStrictnessTests.cs
@@ -4,30 +4,34 @@ using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests;
 
-/// <summary>R2-11 Phase C strictness surface for the AbLegacy equipment-tag parser: the runtime is now STRICT —
-/// a typo'd <c>dataType</c> rejects the tag (<c>TryParse</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
-/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true).</summary>
+/// <summary>R2-11 Phase C strictness surface for the AbLegacy tag-definition factory: the runtime is now STRICT —
+/// a typo'd <c>dataType</c> rejects the tag (<c>FromTagConfig</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
+/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true). Under v3 the mapped
+/// definition's <c>Name</c> is the RawPath the factory was handed, not the blob.</summary>
 public sealed class AbLegacyEquipmentTagParserStrictnessTests
 {
+    private const string RawPath = "cell/ablegacy/dev1/T1";
+
     [Fact]
     public void Typo_dataType_rejects_the_tag()
     {
-        AbLegacyEquipmentTagParser.TryParse("{\"address\":\"N7:0\",\"dataType\":\"Intt\"}", out _)
+        AbLegacyTagDefinitionFactory.FromTagConfig("{\"address\":\"N7:0\",\"dataType\":\"Intt\"}", RawPath, out _)
             .ShouldBeFalse();
     }
 
     [Fact]
     public void Valid_dataType_still_parses()
     {
-        AbLegacyEquipmentTagParser.TryParse("{\"address\":\"N7:0\",\"dataType\":\"Int\"}", out var def)
+        AbLegacyTagDefinitionFactory.FromTagConfig("{\"address\":\"N7:0\",\"dataType\":\"Int\"}", RawPath, out var def)
             .ShouldBeTrue();
         def.DataType.ShouldBe(AbLegacyDataType.Int);
+        def.Name.ShouldBe(RawPath);
     }
 
     [Fact]
     public void Inspect_reports_typo_dataType()
     {
-        var warnings = AbLegacyEquipmentTagParser.Inspect("{\"address\":\"N7:0\",\"dataType\":\"Intt\"}");
+        var warnings = AbLegacyTagDefinitionFactory.Inspect("{\"address\":\"N7:0\",\"dataType\":\"Intt\"}");
         warnings.ShouldHaveSingleItem();
         warnings[0].ShouldContain("Intt");
         warnings[0].ShouldContain("dataType");
@@ -36,13 +40,13 @@ public sealed class AbLegacyEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_clean_config_has_no_warnings()
     {
-        AbLegacyEquipmentTagParser.Inspect("{\"address\":\"N7:0\",\"dataType\":\"Int\"}").ShouldBeEmpty();
+        AbLegacyTagDefinitionFactory.Inspect("{\"address\":\"N7:0\",\"dataType\":\"Int\"}").ShouldBeEmpty();
     }
 
     [Fact]
     public void Writable_false_is_honoured()
     {
-        AbLegacyEquipmentTagParser.TryParse("{\"address\":\"N7:0\",\"dataType\":\"Int\",\"writable\":false}", out var def)
+        AbLegacyTagDefinitionFactory.FromTagConfig("{\"address\":\"N7:0\",\"dataType\":\"Int\",\"writable\":false}", RawPath, out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeFalse();
     }
@@ -50,7 +54,7 @@ public sealed class AbLegacyEquipmentTagParserStrictnessTests
     [Fact]
     public void Writable_absent_defaults_to_true()
     {
-        AbLegacyEquipmentTagParser.TryParse("{\"address\":\"N7:0\",\"dataType\":\"Int\"}", out var def)
+        AbLegacyTagDefinitionFactory.FromTagConfig("{\"address\":\"N7:0\",\"dataType\":\"Int\"}", RawPath, out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeTrue();
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagTests.cs
index 5433cdef..dba23a33 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEquipmentTagTests.cs
@@ -8,34 +8,38 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests;
 [Trait("Category", "Unit")]
 public sealed class AbLegacyEquipmentTagTests
 {
+    private const string RawPath = "cell/ablegacy/dev1/Counter";
+
     [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
+    public void Maps_tagconfig_into_a_definition_keyed_by_rawpath()
     {
+        // v3: the deviceHostAddress key is dropped by the mapper (device routing travels on the
+        // RawTagEntry's DeviceName). The mapped definition is keyed by the RawPath, not the blob.
         var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int"}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(RawPath);
         def.Address.ShouldBe("N7:0");
         def.DataType.ShouldBe(AbLegacyDataType.Int);
-        def.DeviceHostAddress.ShouldBe("ab://10.0.0.5/1,0");
+        def.DeviceHostAddress.ShouldBe("");  // dropped — resolved from RawTagEntry.DeviceName at table-build time
     }
 
     [Fact]
     public void Rejects_a_non_address_blob()
-        => AbLegacyEquipmentTagParser.TryParse("""{"FullName":"x"}""", out _).ShouldBeFalse();
+        => AbLegacyTagDefinitionFactory.FromTagConfig("""{"FullName":"x"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_garbage()
-        => AbLegacyEquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
+        => AbLegacyTagDefinitionFactory.FromTagConfig("not json", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_address_as_a_json_number()
-        => AbLegacyEquipmentTagParser.TryParse(
-            """{"address":7,"dataType":"Int"}""", out _).ShouldBeFalse();
+        => AbLegacyTagDefinitionFactory.FromTagConfig(
+            """{"address":7,"dataType":"Int"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_empty_address()
-        => AbLegacyEquipmentTagParser.TryParse(
-            """{"address":"","dataType":"Int"}""", out _).ShouldBeFalse();
+        => AbLegacyTagDefinitionFactory.FromTagConfig(
+            """{"address":"","dataType":"Int"}""", RawPath, out _).ShouldBeFalse();
 
     // -002 regression: isArray:true without a valid positive arrayLength → scalar (null ArrayLength).
 
@@ -43,7 +47,7 @@ public sealed class AbLegacyEquipmentTagTests
     public void IsArray_true_with_arrayLength_zero_produces_scalar()
     {
         var json = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":0}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
@@ -51,7 +55,7 @@ public sealed class AbLegacyEquipmentTagTests
     public void IsArray_true_with_no_arrayLength_produces_scalar()
     {
         var json = """{"address":"N7:0","dataType":"Int","isArray":true}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
@@ -59,28 +63,30 @@ public sealed class AbLegacyEquipmentTagTests
     public void IsArray_true_with_negative_arrayLength_produces_scalar()
     {
         var json = """{"address":"N7:0","dataType":"Int","isArray":true,"arrayLength":-5}""";
-        AbLegacyEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        AbLegacyTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
     /// <summary>
-    ///     End-to-end driver-level proof: an AbLegacy driver with NO authored tags can still read an
-    ///     equipment-tag ref (the raw TagConfig JSON) — the resolver parses it into a transient
-    ///     definition and the read goes to the fake runtime instead of returning BadNodeIdUnknown.
+    ///     End-to-end driver-level proof: a raw tag authored as a <see cref="RawTagEntry"/> (RawPath
+    ///     identity + TagConfig blob) is resolved by the driver's RawPath → def table and read against the
+    ///     fake runtime, returning Good instead of BadNodeIdUnknown. Under v3 the read reference is always
+    ///     a RawPath — the driver no longer parses a raw TagConfig blob handed as the reference.
     /// </summary>
     [Fact]
-    public async Task Driver_resolves_an_equipment_ref_and_reads_instead_of_BadNodeIdUnknown()
+    public async Task Driver_resolves_a_rawpath_ref_and_reads_instead_of_BadNodeIdUnknown()
     {
-        var json = """{"deviceHostAddress":"ab://10.0.0.5/1,0","address":"N7:0","dataType":"Int"}""";
+        var tagConfig = """{"address":"N7:0","dataType":"Int"}""";
         var factory = new FakeAbLegacyTagFactory { Customise = p => new FakeAbLegacyTag(p) { Value = 4242 } };
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [],
+            RawTags = [new RawTagEntry(RawPath, tagConfig, WriteIdempotent: false, DeviceName: "ab://10.0.0.5/1,0")],
+            Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "ablegacy-eq", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([RawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(AbLegacyStatusMapper.Good);
         r[0].StatusCode.ShouldNotBe(AbLegacyStatusMapper.BadNodeIdUnknown);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEvictOnFailureTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEvictOnFailureTests.cs
index fbc2850c..428c1144 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEvictOnFailureTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyEvictOnFailureTests.cs
@@ -25,7 +25,7 @@ public sealed class AbLegacyEvictOnFailureTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions(Device)],
-            Tags = tags,
+            RawTags = AbLegacyRawTags.Entries(tags),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         return (drv, factory);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyLoggerInjectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyLoggerInjectionTests.cs
index 2167da4d..af28965a 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyLoggerInjectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyLoggerInjectionTests.cs
@@ -79,7 +79,7 @@ public sealed class AbLegacyLoggerInjectionTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-logged", factory, logger);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRawTags.cs
new file mode 100644
index 00000000..86d2b2c6
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRawTags.cs
@@ -0,0 +1,31 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="AbLegacyTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + owning
+///     DeviceName), and the driver rebuilds the typed definitions via
+///     <see cref="AbLegacyTagDefinitionFactory"/>. These tests keep expressing their intent as typed
+///     definitions; this helper serialises each back to its TagConfig blob (via
+///     <see cref="AbLegacyTagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> and whose <see cref="RawTagEntry.DeviceName"/> is the def's
+///     <c>DeviceHostAddress</c> — so the round-trip through the real mapper reproduces the same definition
+///     the test authored, keyed by the same name the read/write/subscribe call sites use and routed to the
+///     same device (the driver matches DeviceName against a configured device's Name or HostAddress).
+/// </summary>
+internal static class AbLegacyRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(AbLegacyTagDefinition def)
+        => new(def.Name, AbLegacyTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, DeviceName: def.DeviceHostAddress);
+
+    /// <summary>Serialises typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert (array, params, or a collection expression).</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params AbLegacyTagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyReadWriteTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyReadWriteTests.cs
index 2c7e9856..45d36552 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyReadWriteTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyReadWriteTests.cs
@@ -15,7 +15,7 @@ public sealed class AbLegacyReadWriteTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = tags,
+            RawTags = AbLegacyRawTags.Entries(tags),
         }, "drv-1", factory);
         return (drv, factory);
     }
@@ -179,7 +179,7 @@ public sealed class AbLegacyReadWriteTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Bit3", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Bit3", "ab://10.0.0.5/1,0", "N7:0/3", AbLegacyDataType.Bit)]),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -206,7 +206,7 @@ public sealed class AbLegacyReadWriteTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("Flag", "ab://10.0.0.5/1,0", "B3:0", AbLegacyDataType.Bit)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("Flag", "ab://10.0.0.5/1,0", "B3:0", AbLegacyDataType.Bit)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -245,11 +245,11 @@ public sealed class AbLegacyReadWriteTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags =
+            RawTags = AbLegacyRawTags.Entries(
             [
                 new AbLegacyTagDefinition("A", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int),
                 new AbLegacyTagDefinition("B", "ab://10.0.0.5/1,0", "N7:1", AbLegacyDataType.Int, Writable: false),
-            ],
+            ]),
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyResolveHostTests.cs
index 52109f9d..7189db65 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyResolveHostTests.cs
@@ -1,13 +1,15 @@
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests;
 
 /// <summary>
-///     CONV-4 — <see cref="AbLegacyDriver.ResolveHost"/> must resolve an equipment-tag reference
-///     (raw TagConfig JSON) to its OWN device host so per-host breaker keys are correct for
-///     equipment tags, not the first-device fallback.
+///     CONV-4 — <see cref="AbLegacyDriver.ResolveHost"/> must resolve a RawPath reference to its OWN
+///     device host so per-host breaker keys are correct for multi-device tags, not the first-device
+///     fallback. v3: the tag's device travels on the <see cref="RawTagEntry.DeviceName"/> the deploy
+///     artifact delivers; the driver resolves it to that device's host at table-build time.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class AbLegacyResolveHostTests
@@ -15,21 +17,25 @@ public sealed class AbLegacyResolveHostTests
     private const string DeviceA = "ab://10.0.0.5/1,0";
     private const string DeviceB = "ab://10.0.0.6/1,0";
 
-    private static AbLegacyDriver NewDriver() => new(
+    private static AbLegacyDriver NewDriver(params RawTagEntry[] rawTags) => new(
         new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions(DeviceA), new AbLegacyDeviceOptions(DeviceB)],
+            RawTags = rawTags,
             Probe = new AbLegacyProbeOptions { Enabled = false },
         },
         "ablegacy-1", new FakeAbLegacyTagFactory());
 
-    /// <summary>An equipment-tag ref naming device B resolves to device B's host, not the first device.</summary>
+    /// <summary>A raw tag owned by device B resolves to device B's host, not the first device.</summary>
     [Fact]
-    public void ResolveHost_EquipmentTagRef_ReturnsItsOwnDeviceHost()
+    public async Task ResolveHost_RawTagRef_ReturnsItsOwnDeviceHost()
     {
-        var drv = NewDriver();
-        var json = $$"""{"deviceHostAddress":"{{DeviceB}}","address":"N7:0","dataType":"Int"}""";
-        drv.ResolveHost(json).ShouldBe(DeviceB);
+        const string rawPath = "cell/ablegacy/devB/T1";
+        var drv = NewDriver(new RawTagEntry(
+            rawPath, """{"address":"N7:0","dataType":"Int"}""", WriteIdempotent: false, DeviceName: DeviceB));
+        await drv.InitializeAsync("{}", CancellationToken.None);
+
+        drv.ResolveHost(rawPath).ShouldBe(DeviceB);
     }
 
     /// <summary>An unresolvable ref keeps the current first-device fallback.</summary>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRuntimeConcurrencyTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRuntimeConcurrencyTests.cs
index e48c81d5..9b423904 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRuntimeConcurrencyTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/AbLegacyRuntimeConcurrencyTests.cs
@@ -84,7 +84,7 @@ public sealed class AbLegacyRuntimeConcurrencyTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -117,7 +117,7 @@ public sealed class AbLegacyRuntimeConcurrencyTests
         var drv = new AbLegacyDriver(new AbLegacyDriverOptions
         {
             Devices = [new AbLegacyDeviceOptions("ab://10.0.0.5/1,0")],
-            Tags = [new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)],
+            RawTags = AbLegacyRawTags.Entries([new AbLegacyTagDefinition("X", "ab://10.0.0.5/1,0", "N7:0", AbLegacyDataType.Int)]),
             Probe = new AbLegacyProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/FocasRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/FocasRawTags.cs
new file mode 100644
index 00000000..200d5c6b
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/FocasRawTags.cs
@@ -0,0 +1,31 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="FocasTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + DeviceName),
+///     and the driver rebuilds the typed definitions via <see cref="FocasTagDefinitionFactory"/> and routes
+///     each to its device by <see cref="RawTagEntry.DeviceName"/>. These integration wire tests keep
+///     expressing their intent as typed definitions; this helper serialises each back to its TagConfig blob
+///     (via <see cref="FocasTagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> and whose DeviceName is the def's <c>DeviceHostAddress</c> — so
+///     the round-trip through the real mapper + device match reproduces the same definition the test authored,
+///     keyed by the same name the read/write/subscribe call sites use. Mirrors the unit-test project's helper
+///     of the same name.
+/// </summary>
+internal static class FocasRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(FocasTagDefinition def)
+        => new(def.Name, FocasTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, def.DeviceHostAddress);
+
+    /// <summary>Serialises typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert (array, params, or a collection expression).</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params FocasTagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendCoverageTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendCoverageTests.cs
index 1da9f2c6..f09d7e39 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendCoverageTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendCoverageTests.cs
@@ -54,12 +54,10 @@ public sealed class WireBackendCoverageTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags =
-            [
+            RawTags = FocasRawTags.Entries(
                 new FocasTagDefinition("Param6711", DeviceHost, "PARAM:6711", FocasDataType.Int32, Writable: false),
                 new FocasTagDefinition("Macro500",  DeviceHost, "MACRO:500",  FocasDataType.Float64, Writable: false),
-                new FocasTagDefinition("R100",      DeviceHost, "R100",       FocasDataType.Byte, Writable: false),
-            ],
+                new FocasTagDefinition("R100",      DeviceHost, "R100",       FocasDataType.Byte, Writable: false)),
             Probe = new FocasProbeOptions { Enabled = false },
         }, driverInstanceId: "wire-usertags", clientFactory: new WireFocasClientFactory());
 
@@ -86,11 +84,9 @@ public sealed class WireBackendCoverageTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost, DeviceName: "Lathe-1")],
-            Tags =
-            [
+            RawTags = FocasRawTags.Entries(
                 new FocasTagDefinition("Run",   DeviceHost, "R100", FocasDataType.Byte, Writable: false),
-                new FocasTagDefinition("Speed", DeviceHost, "MACRO:500", FocasDataType.Float64, Writable: false),
-            ],
+                new FocasTagDefinition("Speed", DeviceHost, "MACRO:500", FocasDataType.Float64, Writable: false)),
             Probe = new FocasProbeOptions { Enabled = false },
         }, driverInstanceId: "wire-discover", clientFactory: new WireFocasClientFactory());
 
@@ -127,7 +123,7 @@ public sealed class WireBackendCoverageTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [new FocasTagDefinition("Run", DeviceHost, "R100", FocasDataType.Byte, Writable: false)],
+            RawTags = FocasRawTags.Entries(new FocasTagDefinition("Run", DeviceHost, "R100", FocasDataType.Byte, Writable: false)),
             Probe = new FocasProbeOptions { Enabled = false },
         }, driverInstanceId: "wire-subscribe", clientFactory: new WireFocasClientFactory());
 
@@ -172,7 +168,7 @@ public sealed class WireBackendCoverageTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             AlarmProjection = new FocasAlarmProjectionOptions
             {
@@ -275,7 +271,7 @@ public sealed class WireBackendCoverageTests
         var driver = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost, PositionDecimalPlaces: 1)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             FixedTree = new FocasFixedTreeOptions
             {
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendTests.cs
index ec373748..6eff4b42 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendTests.cs
@@ -57,7 +57,7 @@ public sealed class WireBackendTests
         var driver = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             FixedTree = new FocasFixedTreeOptions
             {
@@ -120,7 +120,7 @@ public sealed class WireBackendTests
         var driver = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             FixedTree = new FocasFixedTreeOptions
             {
@@ -175,7 +175,7 @@ public sealed class WireBackendTests
         var driver = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             FixedTree = new FocasFixedTreeOptions
             {
@@ -242,7 +242,7 @@ public sealed class WireBackendTests
         var driver = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(DeviceHost)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             FixedTree = new FocasFixedTreeOptions
             {
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasAlarmProjectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasAlarmProjectionTests.cs
index 31663e29..0bb541b5 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasAlarmProjectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasAlarmProjectionTests.cs
@@ -15,7 +15,7 @@ public sealed class FocasAlarmProjectionTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions(Host)],
-            Tags = [],
+            RawTags = [],
             Probe = new FocasProbeOptions { Enabled = false },
             AlarmProjection = new FocasAlarmProjectionOptions
             {
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityTests.cs
index 2b6597d0..54c6243d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityTests.cs
@@ -19,11 +19,11 @@ public sealed class FocasCapabilityTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193", DeviceName: "Lathe-1")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition("Run", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte),
                 new FocasTagDefinition("Alarm", "focas://10.0.0.5:8193", "R200", FocasDataType.Byte, Writable: false),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -51,7 +51,7 @@ public sealed class FocasCapabilityTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -77,7 +77,7 @@ public sealed class FocasCapabilityTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -181,11 +181,11 @@ public sealed class FocasCapabilityTests
                 new FocasDeviceOptions("focas://10.0.0.5:8193"),
                 new FocasDeviceOptions("focas://10.0.0.6:8193"),
             ],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition("A", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte),
                 new FocasTagDefinition("B", "focas://10.0.0.6:8193", "R100", FocasDataType.Byte),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasConnectBackoffTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasConnectBackoffTests.cs
index 318ecd1d..42bacb46 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasConnectBackoffTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasConnectBackoffTests.cs
@@ -17,7 +17,7 @@ public sealed class FocasConnectBackoffTests
     private static FocasDriverOptions Options(bool probeEnabled) => new()
     {
         Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-        Tags = [new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+        RawTags = [FocasRawTags.Entry(new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
         Probe = new FocasProbeOptions
         {
             Enabled = probeEnabled,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasDriverMediumFindingsTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasDriverMediumFindingsTests.cs
index a3d99867..9a7c517e 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasDriverMediumFindingsTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasDriverMediumFindingsTests.cs
@@ -27,11 +27,11 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
-                // DeviceHostAddress has a port typo — not in Devices
+                // DeviceHostAddress (→ RawTagEntry.DeviceName) has a port typo — not in Devices
                 new FocasTagDefinition("X", "focas://10.0.0.5:9999", "R100", FocasDataType.Byte),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
 
@@ -49,11 +49,11 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 // Correct address so address validation passes
                 new FocasTagDefinition("TypoTag", "focas://10.0.0.99:8193", "R100", FocasDataType.Byte),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
 
@@ -74,11 +74,11 @@ public sealed class FocasDriverMediumFindingsTests
                 new FocasDeviceOptions("focas://10.0.0.5:8193"),
                 new FocasDeviceOptions("focas://10.0.0.6:8193"),
             ],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition("A", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte),
                 new FocasTagDefinition("B", "focas://10.0.0.6:8193", "R100", FocasDataType.Byte),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
 
@@ -97,12 +97,12 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 // Writable: true is the default — must still be ViewOnly
                 new FocasTagDefinition("Speed", "focas://10.0.0.5:8193", "R100", FocasDataType.Int16, Writable: true),
                 new FocasTagDefinition("Alarm", "focas://10.0.0.5:8193", "R200", FocasDataType.Byte, Writable: false),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -132,11 +132,11 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition("Idempotent",    "focas://10.0.0.5:8193", "R100", FocasDataType.Int16, WriteIdempotent: true),
                 new FocasTagDefinition("NonIdempotent", "focas://10.0.0.5:8193", "R200", FocasDataType.Int16, WriteIdempotent: false),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", new FakeFocasClientFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -162,7 +162,7 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -191,7 +191,7 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -227,7 +227,7 @@ public sealed class FocasDriverMediumFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagCapabilityGateTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagCapabilityGateTests.cs
index bda91d72..0694be12 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagCapabilityGateTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagCapabilityGateTests.cs
@@ -5,57 +5,54 @@ using ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
 namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
 
 /// <summary>
-///     R2-11 (05/UNDER-6): an equipment-tag reference whose address violates the device series'
-///     capability matrix must fail to RESOLVE (surfacing <c>BadNodeIdUnknown</c>) — the same pre-flight
-///     authored tags get at <c>InitializeAsync</c> — instead of reaching the wire and failing later with a
-///     wire error. A capability-valid equipment tag still resolves + reads.
+///     R2-11 (05/UNDER-6): an authored raw tag whose address violates the device series' capability matrix
+///     must be dropped from the driver's table at <c>InitializeAsync</c> and surface <c>BadNodeIdUnknown</c>
+///     at read (a resolver miss) — instead of reaching the wire and failing later with a wire error. A
+///     capability-valid tag still resolves + reads. An authored tag routed to an unknown device is a
+///     driver-level config error that fails init fast (Driver.FOCAS-003).
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class FocasEquipmentTagCapabilityGateTests
 {
     private const string Host = "focas://10.0.0.5:8193";
 
-    private static FocasDriver NewDriver() => new(new FocasDriverOptions
+    // Series 16i: macro range 0..999 — MACRO:9500 is out of range.
+    private static FocasDriver NewDriver(params FocasTagDefinition[] tags) => new(new FocasDriverOptions
     {
-        // Series 16i: macro range 0..999 — MACRO:9500 is out of range.
         Devices = [new FocasDeviceOptions(Host, Series: FocasCncSeries.Sixteen_i)],
+        RawTags = FocasRawTags.Entries(tags),
         Probe = new FocasProbeOptions { Enabled = false },
     }, "drv-1", new FakeFocasClientFactory());
 
-    private static string EquipTag(string address) =>
-        $"{{\"address\":\"{address}\",\"dataType\":\"Int32\",\"deviceHostAddress\":\"{Host}\"}}";
-
     [Fact]
-    public async Task Capability_violating_equipment_tag_does_not_resolve()
+    public async Task Capability_violating_authored_tag_does_not_resolve()
     {
-        var drv = NewDriver();
+        var drv = NewDriver(new FocasTagDefinition("eq/Bad", Host, "MACRO:9500", FocasDataType.Int32));
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var results = await drv.ReadAsync([EquipTag("MACRO:9500")], CancellationToken.None);
+        var results = await drv.ReadAsync(["eq/Bad"], CancellationToken.None);
 
         results.Single().StatusCode.ShouldBe(FocasStatusMapper.BadNodeIdUnknown);
     }
 
     [Fact]
-    public async Task Capability_valid_equipment_tag_resolves_and_reads()
+    public async Task Capability_valid_authored_tag_resolves_and_reads()
     {
-        var drv = NewDriver();
+        var drv = NewDriver(new FocasTagDefinition("eq/Good", Host, "MACRO:100", FocasDataType.Int32));
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var results = await drv.ReadAsync([EquipTag("MACRO:100")], CancellationToken.None);
+        var results = await drv.ReadAsync(["eq/Good"], CancellationToken.None);
 
         results.Single().StatusCode.ShouldNotBe(FocasStatusMapper.BadNodeIdUnknown);
     }
 
     [Fact]
-    public async Task Equipment_tag_for_unknown_device_does_not_resolve()
+    public async Task Authored_tag_for_unknown_device_fails_init()
     {
-        var drv = NewDriver();
-        await drv.InitializeAsync("{}", CancellationToken.None);
+        var drv = NewDriver(new FocasTagDefinition("eq/BadDevice", "focas://10.9.9.9:8193", "MACRO:100", FocasDataType.Int32));
 
-        var badDevice = "{\"address\":\"MACRO:100\",\"dataType\":\"Int32\",\"deviceHostAddress\":\"focas://10.9.9.9:8193\"}";
-        var results = await drv.ReadAsync([badDevice], CancellationToken.None);
-
-        results.Single().StatusCode.ShouldBe(FocasStatusMapper.BadNodeIdUnknown);
+        var ex = await Should.ThrowAsync<InvalidOperationException>(
+            () => drv.InitializeAsync("{}", CancellationToken.None));
+        ex.Message.ShouldContain("not in the Devices list");
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagParserStrictnessTests.cs
deleted file mode 100644
index 846b0b52..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagParserStrictnessTests.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
-
-/// <summary>
-///     R2-11 Phase C (+ 05/UNDER-1) strictness surface for the FOCAS equipment-tag parser: the runtime is now
-///     STRICT — a typo'd <c>dataType</c> rejects the tag (<c>TryParse</c> ⇒ <see langword="false"/> ⇒
-///     <c>BadNodeIdUnknown</c>); FOCAS tags remain forced read-only (<c>Writable == false</c> regardless of any
-///     authored <c>writable:true</c>), and <c>Inspect</c> reports the typo + the write-request.
-/// </summary>
-public sealed class FocasEquipmentTagParserStrictnessTests
-{
-    [Fact]
-    public void Typo_dataType_rejects_the_tag()
-    {
-        FocasEquipmentTagParser.TryParse("{\"address\":\"D0100\",\"dataType\":\"Int322\"}", out _)
-            .ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Valid_dataType_still_parses()
-    {
-        FocasEquipmentTagParser.TryParse("{\"address\":\"D0100\",\"dataType\":\"Int32\"}", out var def)
-            .ShouldBeTrue();
-        def.DataType.ShouldBe(FocasDataType.Int32);
-    }
-
-    [Fact]
-    public void Writable_is_always_false_even_when_requested_true()
-    {
-        FocasEquipmentTagParser.TryParse("{\"address\":\"D0100\",\"dataType\":\"Int32\",\"writable\":true}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Writable_is_false_when_absent()
-    {
-        FocasEquipmentTagParser.TryParse("{\"address\":\"D0100\",\"dataType\":\"Int32\"}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Inspect_warns_on_writable_true_request()
-    {
-        var warnings = FocasEquipmentTagParser.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int32\",\"writable\":true}");
-        warnings.ShouldContain(w => w.Contains("read-only") && w.Contains("writable"));
-    }
-
-    [Fact]
-    public void Inspect_reports_typo_dataType()
-    {
-        var warnings = FocasEquipmentTagParser.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int322\"}");
-        warnings.ShouldContain(w => w.Contains("Int322") && w.Contains("dataType"));
-    }
-
-    [Fact]
-    public void Inspect_clean_read_only_config_has_no_warnings()
-    {
-        FocasEquipmentTagParser.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int32\"}").ShouldBeEmpty();
-    }
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagTests.cs
index 70fa441a..86c3825a 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasEquipmentTagTests.cs
@@ -4,61 +4,68 @@ using ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
 
+/// <summary>
+///     v3 authored-tag surface for FOCAS. Under v3 a tag's wire reference is its <b>RawPath</b> and the
+///     driver builds its <c>RawPath → definition</c> table from the authored <c>RawTagEntry</c> list via
+///     <see cref="FocasTagDefinitionFactory.FromTagConfig"/> at <c>InitializeAsync</c> — there is no longer
+///     a blob-parse fallback where the read reference IS the raw TagConfig JSON (a miss is a miss ⇒
+///     BadNodeIdUnknown). These tests cover the mapper's parse/reject cases and the driver's authored-tag
+///     read path.
+/// </summary>
 [Trait("Category", "Unit")]
 public class FocasEquipmentTagTests
 {
+    private const string RawPath = "area/line/lathe/Run";
+
     [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
+    public void Maps_tagconfig_into_a_definition_keyed_by_rawpath()
     {
-        var json = """{"deviceHostAddress":"focas://10.0.0.5:8193","address":"R100","dataType":"Byte"}""";
-        FocasEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
-        def.DeviceHostAddress.ShouldBe("focas://10.0.0.5:8193");
+        var json = """{"address":"R100","dataType":"Byte"}""";
+        FocasTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(RawPath);
         def.Address.ShouldBe("R100");
         def.DataType.ShouldBe(FocasDataType.Byte);
     }
 
     [Fact]
     public void Rejects_a_non_address_blob()
-        => FocasEquipmentTagParser.TryParse("""{"FullName":"x"}""", out _).ShouldBeFalse();
+        => FocasTagDefinitionFactory.FromTagConfig("""{"FullName":"x"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_garbage()
-        => FocasEquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
+        => FocasTagDefinitionFactory.FromTagConfig("not json", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_address_as_a_json_number()
-        => FocasEquipmentTagParser.TryParse(
-            """{"address":100,"dataType":"Int32"}""", out _).ShouldBeFalse();
+        => FocasTagDefinitionFactory.FromTagConfig(
+            """{"address":100,"dataType":"Int32"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_a_blank_address()
-        => FocasEquipmentTagParser.TryParse(
-            """{"address":"   ","dataType":"Int32"}""", out _).ShouldBeFalse();
+        => FocasTagDefinitionFactory.FromTagConfig(
+            """{"address":"   ","dataType":"Int32"}""", RawPath, out _).ShouldBeFalse();
 
     // FOCAS's only mandatory address field is the canonical Address STRING (no narrow numeric
     // TagConfig field like Modbus's ushort register address), so the Modbus "numeric out-of-range"
     // rejection case has no analog here — covered instead by the json-number + blank-address cases.
 
     /// <summary>
-    ///     End-to-end driver-level proof: a FOCAS driver with NO authored tags can still read an
-    ///     equipment-tag ref (the raw TagConfig JSON) — the resolver parses it into a transient
-    ///     definition and the read goes to the wire instead of returning BadNodeIdUnknown.
+    ///     End-to-end driver-level proof: a FOCAS driver serving an authored raw tag resolves it by its
+    ///     RawPath and reads the wire instead of returning BadNodeIdUnknown.
     /// </summary>
     [Fact]
-    public async Task Driver_resolves_an_equipment_ref_and_reads_instead_of_BadNodeIdUnknown()
+    public async Task Driver_resolves_an_authored_rawtag_and_reads_instead_of_BadNodeIdUnknown()
     {
-        var json = """{"deviceHostAddress":"focas://10.0.0.5:8193","address":"R100","dataType":"Byte"}""";
         var factory = new FakeFocasClientFactory { Customise = () => new FakeFocasClient { Values = { ["R100"] = (sbyte)42 } } };
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition(RawPath, "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "focas-eq", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([RawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(FocasStatusMapper.Good);
         r[0].StatusCode.ShouldNotBe(FocasStatusMapper.BadNodeIdUnknown);
@@ -66,33 +73,47 @@ public class FocasEquipmentTagTests
     }
 
     /// <summary>
-    ///     Regression guard for Driver.FOCAS-008 equipment-tag path: the parsed
-    ///     <see cref="FocasAddress"/> for a resolver-produced (equipment) tag must be
-    ///     cached after the first read so subsequent reads and writes skip re-parsing
-    ///     the raw TagConfig JSON on every call.
+    ///     A read reference that is NOT an authored RawPath (e.g. a raw TagConfig JSON — the retired
+    ///     equipment-tag blob-ref) is a resolver miss and surfaces BadNodeIdUnknown; the blob-parse
+    ///     fallback is gone in v3.
     /// </summary>
     [Fact]
-    public async Task Equipment_tag_parsed_address_is_cached_after_first_read()
+    public async Task Blob_reference_is_a_resolver_miss_in_v3()
     {
-        var equipRef = """{"deviceHostAddress":"focas://10.0.0.5:8193","address":"R100","dataType":"Byte"}""";
-        var factory = new FakeFocasClientFactory
-        {
-            Customise = () => new FakeFocasClient { Values = { ["R100"] = (sbyte)7 } },
-        };
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [],
+            RawTags = [],
+            Probe = new FocasProbeOptions { Enabled = false },
+        }, "focas-eq", new FakeFocasClientFactory());
+        await drv.InitializeAsync("{}", CancellationToken.None);
+
+        var blob = """{"address":"R100","dataType":"Byte"}""";
+        var r = await drv.ReadAsync([blob], CancellationToken.None);
+
+        r[0].StatusCode.ShouldBe(FocasStatusMapper.BadNodeIdUnknown);
+    }
+
+    /// <summary>
+    ///     Regression guard for Driver.FOCAS-008: the parsed <see cref="FocasAddress"/> for an authored
+    ///     tag is cached at <c>InitializeAsync</c> (v3 pre-caches the whole table) so reads/writes skip
+    ///     re-parsing the address string on every call.
+    /// </summary>
+    [Fact]
+    public async Task Authored_tag_parsed_address_is_cached_at_init()
+    {
+        var factory = new FakeFocasClientFactory { Customise = () => new FakeFocasClient { Values = { ["R100"] = (sbyte)7 } } };
+        var drv = new FocasDriver(new FocasDriverOptions
+        {
+            Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition(RawPath, "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "focas-eq-cache", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        // Before any read the parsed address must NOT be in the cache.
-        drv.IsParsedAddressCached(equipRef).ShouldBeFalse();
-
-        // After a successful read the parsed address MUST be cached.
-        var r = await drv.ReadAsync([equipRef], CancellationToken.None);
+        // v3 builds the table eagerly at init, so the parsed address is cached before any read.
+        drv.IsParsedAddressCached(RawPath).ShouldBeTrue();
+        var r = await drv.ReadAsync([RawPath], CancellationToken.None);
         r[0].StatusCode.ShouldBe(FocasStatusMapper.Good);
-        drv.IsParsedAddressCached(equipRef).ShouldBeTrue();
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasHandleRecycleTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasHandleRecycleTests.cs
index ffb64f10..97042231 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasHandleRecycleTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasHandleRecycleTests.cs
@@ -14,7 +14,7 @@ public sealed class FocasHandleRecycleTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
             HandleRecycle = new FocasHandleRecycleOptions
             {
@@ -47,7 +47,7 @@ public sealed class FocasHandleRecycleTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("R", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasIoSerializationTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasIoSerializationTests.cs
index 4bc271f6..a09c85bb 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasIoSerializationTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasIoSerializationTests.cs
@@ -110,7 +110,7 @@ public sealed class FocasIoSerializationTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("CustomVar", "focas://10.0.0.5:8193", "MACRO:500", FocasDataType.Float64)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("CustomVar", "focas://10.0.0.5:8193", "MACRO:500", FocasDataType.Float64))],
             Probe = new FocasProbeOptions { Enabled = false },
             Timeout = TimeSpan.FromMilliseconds(150),
         }, "drv-1", factory);
@@ -133,7 +133,7 @@ public sealed class FocasIoSerializationTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("CustomVar", "focas://10.0.0.5:8193", "MACRO:500", FocasDataType.Float64)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("CustomVar", "focas://10.0.0.5:8193", "MACRO:500", FocasDataType.Float64))],
             Probe = new FocasProbeOptions { Enabled = false },
             Timeout = TimeSpan.FromMilliseconds(120),
         }, "drv-1", factory);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasLowFindingsTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasLowFindingsTests.cs
index 670c8ec1..5e09df86 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasLowFindingsTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasLowFindingsTests.cs
@@ -43,7 +43,7 @@ public sealed class FocasLowFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte)],
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -73,11 +73,11 @@ public sealed class FocasLowFindingsTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition(
                     "X", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte, Writable: true),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPmcBitRmwTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPmcBitRmwTests.cs
index edd897f2..f3b357e0 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPmcBitRmwTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPmcBitRmwTests.cs
@@ -59,7 +59,7 @@ public sealed class FocasPmcBitRmwTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = tags,
+            RawTags = FocasRawTags.Entries(tags),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         return (drv, fake);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPollErrorHealthTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPollErrorHealthTests.cs
index dd0dc166..f738c275 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPollErrorHealthTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasPollErrorHealthTests.cs
@@ -45,7 +45,8 @@ public sealed class FocasPollErrorHealthTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = [new FocasTagDefinition("X", "focas://10.0.0.5:9999", "R100", FocasDataType.Byte)],
+            // DeviceName "…:9999" is not in Devices → InitializeAsync fails fast → Faulted.
+            RawTags = [FocasRawTags.Entry(new FocasTagDefinition("X", "focas://10.0.0.5:9999", "R100", FocasDataType.Byte))],
             Probe = new FocasProbeOptions { Enabled = false },
         }, "focas-1", new FakeFocasClientFactory());
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasRawTags.cs
new file mode 100644
index 00000000..a6e66bf8
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasRawTags.cs
@@ -0,0 +1,30 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="FocasTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + DeviceName),
+///     and the driver rebuilds the typed definitions via <see cref="FocasTagDefinitionFactory"/> and routes
+///     each to its device by <see cref="RawTagEntry.DeviceName"/>. These tests keep expressing their intent
+///     as typed definitions; this helper serialises each back to its TagConfig blob (via
+///     <see cref="FocasTagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> and whose DeviceName is the def's <c>DeviceHostAddress</c> — so
+///     the round-trip through the real mapper + device match reproduces the same definition the test authored,
+///     keyed by the same name the read/write/subscribe call sites use.
+/// </summary>
+internal static class FocasRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(FocasTagDefinition def)
+        => new(def.Name, FocasTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, def.DeviceHostAddress);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(IEnumerable<FocasTagDefinition> defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasReadWriteTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasReadWriteTests.cs
index 09df7adc..d95397a1 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasReadWriteTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasReadWriteTests.cs
@@ -14,7 +14,7 @@ public sealed class FocasReadWriteTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags = tags,
+            RawTags = FocasRawTags.Entries(tags),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         return (drv, factory);
@@ -221,11 +221,11 @@ public sealed class FocasReadWriteTests
         var drv = new FocasDriver(new FocasDriverOptions
         {
             Devices = [new FocasDeviceOptions("focas://10.0.0.5:8193")],
-            Tags =
+            RawTags = FocasRawTags.Entries(
             [
                 new FocasTagDefinition("A", "focas://10.0.0.5:8193", "R100", FocasDataType.Byte),
                 new FocasTagDefinition("B", "focas://10.0.0.5:8193", "R101", FocasDataType.Byte, Writable: false),
-            ],
+            ]),
             Probe = new FocasProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasResolveHostTests.cs
index 1fe06c2c..6d66e5fc 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasResolveHostTests.cs
@@ -5,10 +5,9 @@ using ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
 namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
 
 /// <summary>
-///     CONV-4 — <see cref="FocasDriver.ResolveHost"/> must resolve an equipment-tag reference (raw
-///     TagConfig JSON) to its OWN device host so per-host breaker keys are correct for equipment
-///     tags. An address-less equipment ref (FOCAS coalesces a missing <c>deviceHostAddress</c> to
-///     <c>""</c>) must fall back rather than key an empty host.
+///     CONV-4 — <see cref="FocasDriver.ResolveHost"/> must resolve an authored raw tag (by its RawPath)
+///     to its OWN device host so per-host breaker keys are correct for multi-device drivers. A reference
+///     that resolves to no authored tag falls back to the first device rather than keying an empty host.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class FocasResolveHostTests
@@ -16,15 +15,16 @@ public sealed class FocasResolveHostTests
     private const string DeviceA = "focas://10.0.0.5:8193";
     private const string DeviceB = "focas://10.0.0.6:8193";
 
-    // FOCAS's equipment-ref resolver validates against the initialized Devices map, so — unlike
-    // the other drivers — the driver must be initialized (as it always is when ResolveHost runs at
-    // runtime) before an equipment ref resolves. Probe off / no connect: init just parses devices.
-    private static async Task<FocasDriver> NewDriverAsync()
+    // The driver builds its RawPath → definition table (with each tag's resolved device host) at
+    // InitializeAsync, so the driver must be initialized before ResolveHost can resolve a tag — as it
+    // always is when ResolveHost runs at runtime. Probe off / no connect: init just parses devices + tags.
+    private static async Task<FocasDriver> NewDriverAsync(params FocasTagDefinition[] tags)
     {
         var drv = new FocasDriver(
             new FocasDriverOptions
             {
                 Devices = [new FocasDeviceOptions(DeviceA), new FocasDeviceOptions(DeviceB)],
+                RawTags = FocasRawTags.Entries(tags),
                 Probe = new FocasProbeOptions { Enabled = false },
             },
             "focas-1", new FakeFocasClientFactory());
@@ -32,18 +32,17 @@ public sealed class FocasResolveHostTests
         return drv;
     }
 
-    /// <summary>An equipment-tag ref naming device B resolves to device B's host, not the first device.</summary>
+    /// <summary>An authored tag routed to device B resolves to device B's host, not the first device.</summary>
     [Fact]
-    public async Task ResolveHost_EquipmentTagRef_ReturnsItsOwnDeviceHost()
+    public async Task ResolveHost_AuthoredTag_ReturnsItsOwnDeviceHost()
     {
-        var drv = await NewDriverAsync();
-        var json = $$"""{"deviceHostAddress":"{{DeviceB}}","address":"R100","dataType":"Byte"}""";
-        drv.ResolveHost(json).ShouldBe(DeviceB);
+        var drv = await NewDriverAsync(new FocasTagDefinition("eq/onB", DeviceB, "R100", FocasDataType.Byte));
+        drv.ResolveHost("eq/onB").ShouldBe(DeviceB);
     }
 
-    /// <summary>An equipment ref with no deviceHostAddress falls back to the first device, not an empty host.</summary>
+    /// <summary>A reference that resolves to no authored tag falls back to the first device, not an empty host.</summary>
     [Fact]
-    public async Task ResolveHost_EquipmentTagRef_WithoutDeviceHost_FallsBack()
+    public async Task ResolveHost_UnresolvedRef_FallsBack()
     {
         var drv = await NewDriverAsync();
         var json = """{"address":"R100","dataType":"Byte"}""";
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasTagDefinitionFactoryStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasTagDefinitionFactoryStrictnessTests.cs
new file mode 100644
index 00000000..eb65616d
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasTagDefinitionFactoryStrictnessTests.cs
@@ -0,0 +1,70 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Driver.FOCAS;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests;
+
+/// <summary>
+///     R2-11 Phase C (+ 05/UNDER-1) strictness surface for the v3 <see cref="FocasTagDefinitionFactory"/>:
+///     the runtime is STRICT — a typo'd <c>dataType</c> rejects the tag (<c>FromTagConfig</c> ⇒
+///     <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>); the produced definition's <c>Name</c> is the
+///     RawPath (not the blob). Writability lives on the Tag entity / node ACL, so the authored FOCAS
+///     TagConfig has no <c>writable</c> key: an absent key ⇒ read-only (<c>Writable == false</c>), while an
+///     explicit <c>writable:true</c> is honoured for the driver's internal write gate (the wire is still
+///     read-only, which <c>Inspect</c> warns about).
+/// </summary>
+public sealed class FocasTagDefinitionFactoryStrictnessTests
+{
+    private const string RawPath = "area/line/equip/tag";
+
+    [Fact]
+    public void Typo_dataType_rejects_the_tag()
+        => FocasTagDefinitionFactory.FromTagConfig(
+            "{\"address\":\"D0100\",\"dataType\":\"Int322\"}", RawPath, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Valid_dataType_still_parses_and_names_by_rawPath()
+    {
+        FocasTagDefinitionFactory.FromTagConfig(
+            "{\"address\":\"D0100\",\"dataType\":\"Int32\"}", RawPath, out var def).ShouldBeTrue();
+        def.DataType.ShouldBe(FocasDataType.Int32);
+        def.Name.ShouldBe(RawPath);
+        def.Address.ShouldBe("D0100");
+        // The device host is not carried in the blob — the driver fills it from the RawTagEntry.DeviceName.
+        def.DeviceHostAddress.ShouldBe("");
+    }
+
+    [Fact]
+    public void Writable_is_honoured_when_requested_true()
+    {
+        FocasTagDefinitionFactory.FromTagConfig(
+            "{\"address\":\"D0100\",\"dataType\":\"Int32\",\"writable\":true}", RawPath, out var def).ShouldBeTrue();
+        def.Writable.ShouldBeTrue();
+    }
+
+    [Fact]
+    public void Writable_is_false_when_absent()
+    {
+        FocasTagDefinitionFactory.FromTagConfig(
+            "{\"address\":\"D0100\",\"dataType\":\"Int32\"}", RawPath, out var def).ShouldBeTrue();
+        def.Writable.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Inspect_warns_on_writable_true_request()
+    {
+        var warnings = FocasTagDefinitionFactory.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int32\",\"writable\":true}");
+        warnings.ShouldContain(w => w.Contains("read-only") && w.Contains("writable"));
+    }
+
+    [Fact]
+    public void Inspect_reports_typo_dataType()
+    {
+        var warnings = FocasTagDefinitionFactory.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int322\"}");
+        warnings.ShouldContain(w => w.Contains("Int322") && w.Contains("dataType"));
+    }
+
+    [Fact]
+    public void Inspect_clean_read_only_config_has_no_warnings()
+        => FocasTagDefinitionFactory.Inspect("{\"address\":\"D0100\",\"dataType\":\"Int32\"}").ShouldBeEmpty();
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Browse/GalaxyDiscovererTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Browse/GalaxyDiscovererTests.cs
index 62a3af03..258e3ae3 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Browse/GalaxyDiscovererTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Browse/GalaxyDiscovererTests.cs
@@ -289,6 +289,72 @@ public sealed class GalaxyDiscovererTests
         info.AckMsgWriteRef.ShouldBe("Tank1_Level.HiHi.AckMsg");
     }
 
+    /// <summary>
+    ///     v3 RawPath keying: when a resolver maps a discovered Galaxy attributeRef to its authored
+    ///     <see cref="RawTagEntry"/>, the emitted node reference (<see cref="DriverAttributeInfo.FullName"/>)
+    ///     is the entry's <b>RawPath</b> — not the attributeRef — and the entry's WriteIdempotent flag flows
+    ///     onto the descriptor. Unmapped attributes degrade to the attributeRef with WriteIdempotent=false.
+    /// </summary>
+    [Fact]
+    public async Task DiscoverAsync_WithRawPathResolver_EmitsRawPathAsFullName_AndThreadsWriteIdempotent()
+    {
+        var src = new FakeHierarchySource([
+            Obj("Tank1_Level", "Level", Attr("PV", mxDataType: 2), Attr("SP", mxDataType: 2)),
+        ]);
+        // Authored: Tank1_Level.PV → RawPath "area/line/tank1/level" (write-idempotent). SP is NOT authored.
+        var authored = new Dictionary<string, RawTagEntry>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["Tank1_Level.PV"] = new RawTagEntry(
+                "area/line/tank1/level", "{\"attributeRef\":\"Tank1_Level.PV\"}", WriteIdempotent: true),
+        };
+        var discoverer = new GalaxyDiscoverer(src, attrRef => authored.GetValueOrDefault(attrRef));
+        var builder = new FakeBuilder();
+
+        await discoverer.DiscoverAsync(builder, CancellationToken.None);
+
+        var pv = builder.Variables.Single(v => v.AttributeName == "PV").Info;
+        pv.FullName.ShouldBe("area/line/tank1/level"); // RawPath, not the attributeRef
+        pv.WriteIdempotent.ShouldBeTrue();
+
+        var sp = builder.Variables.Single(v => v.AttributeName == "SP").Info;
+        sp.FullName.ShouldBe("Tank1_Level.SP"); // unmapped → attributeRef fallback
+        sp.WriteIdempotent.ShouldBeFalse();
+    }
+
+    /// <summary>
+    ///     v3 alarm keying: the alarm condition identity (<see cref="AlarmConditionInfo.SourceName"/>, and
+    ///     the ConditionId the driver reports) is the tag's <b>RawPath</b>, while the five live-state /
+    ///     ack sub-refs are dialled off the Galaxy <b>attributeRef</b> — so the server subscribes the real
+    ///     MXAccess attributes while correlating the condition to its RawPath-keyed node.
+    /// </summary>
+    [Fact]
+    public async Task DiscoverAsync_WithRawPathResolver_AlarmConditionUsesRawPathIdentity_AndAttributeRefSubRefs()
+    {
+        var src = new FakeHierarchySource([
+            Obj("Tank1_Level", "Level", Attr("HiHi", mxDataType: 0, isAlarm: true)),
+        ]);
+        var authored = new Dictionary<string, RawTagEntry>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["Tank1_Level.HiHi"] = new RawTagEntry(
+                "area/line/tank1/hihi", "{\"attributeRef\":\"Tank1_Level.HiHi\"}", WriteIdempotent: false),
+        };
+        var discoverer = new GalaxyDiscoverer(src, attrRef => authored.GetValueOrDefault(attrRef));
+        var builder = new FakeBuilder();
+
+        await discoverer.DiscoverAsync(builder, CancellationToken.None);
+
+        // Alarm declaration is keyed (by the fake builder) on the variable's FullReference = RawPath.
+        builder.AlarmDeclarations.ShouldContainKey("area/line/tank1/hihi");
+        var info = builder.AlarmDeclarations["area/line/tank1/hihi"];
+        info.SourceName.ShouldBe("area/line/tank1/hihi"); // RawPath identity
+        // Sub-refs dial off the Galaxy attributeRef (tag_name.AttributeName), NOT the RawPath.
+        info.InAlarmRef.ShouldBe("Tank1_Level.HiHi.InAlarm");
+        info.PriorityRef.ShouldBe("Tank1_Level.HiHi.Priority");
+        info.DescAttrNameRef.ShouldBe("Tank1_Level.HiHi.DescAttrName");
+        info.AckedRef.ShouldBe("Tank1_Level.HiHi.Acked");
+        info.AckMsgWriteRef.ShouldBe("Tank1_Level.HiHi.AckMsg");
+    }
+
     /// <summary>Verifies that non-alarm attributes are not marked as alarm conditions.</summary>
     [Fact]
     public async Task DiscoverAsync_NonAlarmAttribute_DoesNotMarkCondition()
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/GalaxyDriverFactoryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/GalaxyDriverFactoryTests.cs
index e3886373..8e4e5ccc 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/GalaxyDriverFactoryTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/GalaxyDriverFactoryTests.cs
@@ -79,6 +79,38 @@ public sealed class GalaxyDriverFactoryTests
         driver.Options.Reconnect.ReplayOnSessionLost.ShouldBeFalse();
     }
 
+    /// <summary>Verifies that the factory binds the v3 RawTags array from the driver config JSON.</summary>
+    [Fact]
+    public void CreateInstance_BindsRawTags_FromConfig()
+    {
+        const string configWithRawTags = """
+            {
+              "Gateway": { "Endpoint": "https://mxgw.test:5001", "ApiKeySecretRef": "galaxy:apiKey" },
+              "MxAccess": { "ClientName": "OtOpcUa-A" },
+              "RawTags": [
+                { "RawPath": "area/line/tank1/level", "TagConfig": "{\"attributeRef\":\"Tank1.Level\"}", "WriteIdempotent": true },
+                { "RawPath": "area/line/tank1/sp", "TagConfig": "{\"attributeRef\":\"Tank1.SP\"}", "WriteIdempotent": false }
+              ]
+            }
+            """;
+
+        var driver = GalaxyDriverFactoryExtensions.CreateInstance("galaxy-rawtags", configWithRawTags);
+
+        driver.Options.RawTags.Count.ShouldBe(2);
+        driver.Options.RawTags[0].RawPath.ShouldBe("area/line/tank1/level");
+        driver.Options.RawTags[0].TagConfig.ShouldContain("Tank1.Level");
+        driver.Options.RawTags[0].WriteIdempotent.ShouldBeTrue();
+        driver.Options.RawTags[1].WriteIdempotent.ShouldBeFalse();
+    }
+
+    /// <summary>Verifies that config without a RawTags array binds to an empty list (identity path).</summary>
+    [Fact]
+    public void CreateInstance_NoRawTags_DefaultsToEmpty()
+    {
+        var driver = GalaxyDriverFactoryExtensions.CreateInstance("galaxy-none", MinimalConfig);
+        driver.Options.RawTags.ShouldBeEmpty();
+    }
+
     /// <summary>Verifies that missing endpoint throws an exception.</summary>
     [Fact]
     public void CreateInstance_MissingEndpoint_Throws()
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Runtime/GalaxyDriverRawPathKeyingTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Runtime/GalaxyDriverRawPathKeyingTests.cs
new file mode 100644
index 00000000..69569dd9
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/Runtime/GalaxyDriverRawPathKeyingTests.cs
@@ -0,0 +1,260 @@
+using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browse;
+using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Config;
+using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Runtime;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests.Runtime;
+
+/// <summary>
+///     v3 RawPath identity: the server addresses Galaxy nodes by RawPath, while MXAccess dials the
+///     Galaxy attributeRef (<c>tag_name.AttributeName</c>). These tests pin the driver-side boundary
+///     translation built from <see cref="GalaxyDriverOptions.RawTags"/> — RawPath → attributeRef on
+///     read / write / subscribe / ack (forward dial), and attributeRef → RawPath on the value fan-out
+///     and alarm ConditionId (reverse), so the alarm resolves back to the same RawPath the value path
+///     surfaces. Each entry's <c>TagConfig</c> carries the dialled address under the camelCase key
+///     <c>attributeRef</c>.
+/// </summary>
+public sealed class GalaxyDriverRawPathKeyingTests
+{
+    private const string RawPath = "area/line/tank1/level";
+    private const string AttributeRef = "Tank1.Level";
+
+    private static GalaxyDriverOptions OptsWithRawTags(bool writeIdempotent = false) => new(
+        new GalaxyGatewayOptions("https://mxgw.test:5001", "key"),
+        new GalaxyMxAccessOptions("OtOpcUa-A"),
+        new GalaxyRepositoryOptions(),
+        new GalaxyReconnectOptions())
+    {
+        RawTags = [new RawTagEntry(RawPath, $"{{\"attributeRef\":\"{AttributeRef}\"}}", writeIdempotent)],
+    };
+
+    // ===== Read: RawPath in → attributeRef dialled =====
+
+    /// <summary>ReadAsync translates the incoming RawPath to the Galaxy attributeRef before dialling.</summary>
+    [Fact]
+    public async Task ReadAsync_TranslatesRawPath_ToAttributeRef()
+    {
+        var reader = new RecordingReader();
+        using var driver = new GalaxyDriver("g", OptsWithRawTags(), hierarchySource: null, dataReader: reader);
+
+        await driver.ReadAsync([RawPath], CancellationToken.None);
+
+        reader.LastRequest.ShouldBe([AttributeRef]);
+    }
+
+    /// <summary>An unmapped RawPath dials as-is (identity) — the gateway then rejects an unknown address.</summary>
+    [Fact]
+    public async Task ReadAsync_UnmappedRawPath_DialsIdentity()
+    {
+        var reader = new RecordingReader();
+        using var driver = new GalaxyDriver("g", OptsWithRawTags(), hierarchySource: null, dataReader: reader);
+
+        await driver.ReadAsync(["not/authored"], CancellationToken.None);
+
+        reader.LastRequest.ShouldBe(["not/authored"]);
+    }
+
+    // ===== Write: RawPath in → attributeRef dialled, security resolved by RawPath =====
+
+    /// <summary>
+    ///     WriteAsync dials the attributeRef, and the security the writer resolves is the one captured at
+    ///     discovery under the tag's RawPath (the discoverer emitted FullName = RawPath) — proving the
+    ///     reverse mapping the resolver applies (attributeRef → RawPath) lands on the right classification.
+    /// </summary>
+    [Fact]
+    public async Task WriteAsync_DialsAttributeRef_AndResolvesSecurityByRawPath()
+    {
+        var writer = new RecordingWriter();
+        // Hierarchy: Tank1.Level classified Operate (sec 1). Discovery keys security by the RawPath.
+        var src = new FakeHierarchySource([Obj("Tank1", Attr("Level", sec: 1))]);
+        using var driver = new GalaxyDriver(
+            "g", OptsWithRawTags(), hierarchySource: src, dataReader: null, dataWriter: writer);
+
+        await driver.DiscoverAsync(new CapturingBuilder(), CancellationToken.None);
+        await driver.WriteAsync([new WriteRequest(RawPath, 42.0)], CancellationToken.None);
+
+        writer.Calls.ShouldHaveSingleItem();
+        writer.Calls[0].FullRef.ShouldBe(AttributeRef);                       // dialled address
+        writer.Calls[0].Resolved.ShouldBe(SecurityClassification.Operate);    // resolved by RawPath
+    }
+
+    // ===== Subscribe + value fan-out: RawPath in → attributeRef dialled → RawPath out =====
+
+    /// <summary>
+    ///     SubscribeAsync dials the attributeRef; the resulting value fan-out surfaces on the public
+    ///     OnDataChange keyed by the tag's RawPath — the same identity the alarm ConditionId uses.
+    /// </summary>
+    [Fact]
+    public async Task Subscribe_DialsAttributeRef_AndValueFanOutSurfacesRawPath()
+    {
+        var subscriber = new GalaxyDriverSubscribeTests.FakeSubscriber();
+        using var driver = new GalaxyDriver(
+            "g", OptsWithRawTags(), hierarchySource: null, dataReader: null, dataWriter: null, subscriber: subscriber);
+
+        var captured = new List<DataChangeEventArgs>();
+        driver.OnDataChange += (_, args) => captured.Add(args);
+
+        await driver.SubscribeAsync([RawPath], TimeSpan.FromSeconds(1), CancellationToken.None);
+
+        // The gateway saw the dialled attributeRef, not the RawPath.
+        subscriber.Map.ShouldContainKey(AttributeRef);
+        subscriber.Map.ShouldNotContainKey(RawPath);
+
+        await subscriber.EmitOnDataChangeAsync(subscriber.Map[AttributeRef], 42.0);
+        await WaitForAsync(() => captured.Count >= 1);
+
+        captured.ShouldHaveSingleItem();
+        captured[0].FullReference.ShouldBe(RawPath); // surfaced under the RawPath identity
+        ((double)captured[0].Snapshot.Value!).ShouldBe(42.0);
+    }
+
+    // ===== Alarm: ConditionId is the RawPath; ack round-trips back to the attributeRef =====
+
+    /// <summary>
+    ///     The alarm feed reports the Galaxy attributeRef; the driver surfaces the transition with
+    ///     ConditionId = the tag's RawPath (matching the value path), and a subsequent ack keyed by that
+    ///     RawPath dials back down to the attributeRef the gateway acknowledges.
+    /// </summary>
+    [Fact]
+    public async Task Alarm_ConditionIdIsRawPath_AndAckRoundTripsToAttributeRef()
+    {
+        var feed = new FakeAlarmFeed();
+        var ack = new RecordingAcknowledger();
+        using var driver = new GalaxyDriver(
+            "g", OptsWithRawTags(), hierarchySource: null, alarmAcknowledger: ack, alarmFeed: feed);
+
+        var handle = await driver.SubscribeAlarmsAsync(["Tank1"], CancellationToken.None);
+        var observed = new List<AlarmEventArgs>();
+        driver.OnAlarmEvent += (_, args) => observed.Add(args);
+
+        // Feed reports the dialled attributeRef.
+        feed.Emit(NewTransition(AttributeRef, "Tank1"));
+
+        observed.ShouldHaveSingleItem();
+        observed[0].ConditionId.ShouldBe(RawPath);            // reverse-mapped to the RawPath identity
+        observed[0].SubscriptionHandle.ShouldBe(handle);
+
+        // Ack keyed by the RawPath the driver reported → dials back to the attributeRef.
+        await driver.AcknowledgeAsync(
+            [new AlarmAcknowledgeRequest("Tank1", RawPath, "ack it")], CancellationToken.None);
+
+        ack.Calls.ShouldHaveSingleItem();
+        ack.Calls[0].AlarmRef.ShouldBe(AttributeRef);
+    }
+
+    // ===== helpers / fakes =====
+
+    private static async Task WaitForAsync(Func<bool> condition, int timeoutMs = 2000)
+    {
+        var deadline = DateTime.UtcNow.AddMilliseconds(timeoutMs);
+        while (DateTime.UtcNow < deadline)
+        {
+            if (condition()) return;
+            await Task.Delay(10);
+        }
+    }
+
+    private static GalaxyAttribute Attr(string name, int sec)
+        => new() { AttributeName = name, MxDataType = 2 /*Float32*/, SecurityClassification = sec };
+
+    private static GalaxyObject Obj(string tag, params GalaxyAttribute[] attrs)
+    {
+        var o = new GalaxyObject { TagName = tag, ContainedName = tag };
+        o.Attributes.AddRange(attrs);
+        return o;
+    }
+
+    private static GalaxyAlarmTransition NewTransition(string alarmFullReference, string source)
+        => new(
+            AlarmFullReference: alarmFullReference,
+            SourceObjectReference: source,
+            AlarmTypeName: "AnalogLimitAlarm.HiHi",
+            TransitionKind: GalaxyAlarmTransitionKind.Raise,
+            SeverityBucket: AlarmSeverity.High,
+            OpcUaSeverity: 800,
+            RawMxAccessSeverity: 750,
+            OriginalRaiseTimestampUtc: null,
+            TransitionTimestampUtc: DateTime.UtcNow,
+            OperatorUser: string.Empty,
+            OperatorComment: string.Empty,
+            Category: "Process",
+            Description: "high level");
+
+    private sealed class FakeHierarchySource(IReadOnlyList<GalaxyObject> objects) : IGalaxyHierarchySource
+    {
+        public Task<IReadOnlyList<GalaxyObject>> GetHierarchyAsync(CancellationToken cancellationToken)
+            => Task.FromResult(objects);
+    }
+
+    /// <summary>Minimal builder — discovery only needs the SecurityCapturingBuilder wrapper to run.</summary>
+    private sealed class CapturingBuilder : IAddressSpaceBuilder
+    {
+        public IAddressSpaceBuilder Folder(string browseName, string displayName) => this;
+        public IVariableHandle Variable(string browseName, string displayName, DriverAttributeInfo attributeInfo)
+            => new Handle(attributeInfo.FullName);
+        public void AddProperty(string browseName, DriverDataType dataType, object? value) { }
+
+        private sealed class Handle(string fullRef) : IVariableHandle
+        {
+            public string FullReference { get; } = fullRef;
+            public IAlarmConditionSink MarkAsAlarmCondition(AlarmConditionInfo info) => new Sink();
+            private sealed class Sink : IAlarmConditionSink { public void OnTransition(AlarmEventArgs args) { } }
+        }
+    }
+
+    private sealed class RecordingReader : IGalaxyDataReader
+    {
+        public IReadOnlyList<string>? LastRequest { get; private set; }
+
+        public Task<IReadOnlyList<DataValueSnapshot>> ReadAsync(
+            IReadOnlyList<string> fullReferences, CancellationToken cancellationToken)
+        {
+            LastRequest = fullReferences;
+            return Task.FromResult<IReadOnlyList<DataValueSnapshot>>(
+                fullReferences.Select(_ => new DataValueSnapshot(0.0, StatusCodeMap.Good, null, DateTime.UtcNow)).ToArray());
+        }
+    }
+
+    private sealed class RecordingWriter : IGalaxyDataWriter
+    {
+        public List<(string FullRef, object? Value, SecurityClassification Resolved)> Calls { get; } = [];
+
+        public Task<IReadOnlyList<WriteResult>> WriteAsync(
+            IReadOnlyList<WriteRequest> writes,
+            Func<string, SecurityClassification> securityResolver,
+            CancellationToken cancellationToken)
+        {
+            var results = new WriteResult[writes.Count];
+            for (var i = 0; i < writes.Count; i++)
+            {
+                Calls.Add((writes[i].FullReference, writes[i].Value, securityResolver(writes[i].FullReference)));
+                results[i] = new WriteResult(StatusCodeMap.Good);
+            }
+            return Task.FromResult<IReadOnlyList<WriteResult>>(results);
+        }
+
+        public void InvalidateHandleCaches() { }
+    }
+
+    private sealed class FakeAlarmFeed : IGalaxyAlarmFeed
+    {
+        public event EventHandler<GalaxyAlarmTransition>? OnAlarmTransition;
+        public void Start() { }
+        public void Emit(GalaxyAlarmTransition transition) => OnAlarmTransition?.Invoke(this, transition);
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+
+    private sealed class RecordingAcknowledger : IGalaxyAlarmAcknowledger
+    {
+        public List<(string AlarmRef, string Comment, string Operator)> Calls { get; } = [];
+
+        public Task AcknowledgeAsync(string alarmFullReference, string comment, string operatorUser, CancellationToken cancellationToken)
+        {
+            Calls.Add((alarmFullReference, comment, operatorUser));
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/AddressingGrammarTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/AddressingGrammarTests.cs
index a53ccfb2..2d372eba 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/AddressingGrammarTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/AddressingGrammarTests.cs
@@ -27,7 +27,7 @@ public sealed class AddressingGrammarTests
     {
         var opts = new ModbusDriverOptions
         {
-            Host = _sim.Host, Port = _sim.Port, Tags = tags,
+            Host = _sim.Host, Port = _sim.Port, RawTags = ModbusRawTags.Entries(tags),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         var drv = new ModbusDriver(opts, "addressing-e2e");
@@ -108,7 +108,7 @@ public sealed class AddressingGrammarTests
         var t3 = new ModbusTagDefinition("T3", ModbusRegion.HoldingRegisters, 204, ModbusDataType.Int16);
         var opts = new ModbusDriverOptions
         {
-            Host = _sim.Host, Port = _sim.Port, Tags = [t1, t2, t3], MaxReadGap = 5,
+            Host = _sim.Host, Port = _sim.Port, RawTags = ModbusRawTags.Entries([t1, t2, t3]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         var drv = new ModbusDriver(opts, "addressing-e2e");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205BcdQuirkTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205BcdQuirkTests.cs
index 8fbf8e40..b3ae07e1 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205BcdQuirkTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205BcdQuirkTests.cs
@@ -31,15 +31,14 @@ public sealed class DL205BcdQuirkTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("DL205_Count_Bcd",
                     ModbusRegion.HoldingRegisters, Address: 1072,
                     DataType: ModbusDataType.Bcd16, Writable: false),
                 new ModbusTagDefinition("DL205_Count_Int16",
                     ModbusRegion.HoldingRegisters, Address: 1072,
                     DataType: ModbusDataType.Int16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-bcd");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205CoilMappingTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205CoilMappingTests.cs
index b77b635f..3b5019b6 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205CoilMappingTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205CoilMappingTests.cs
@@ -106,7 +106,7 @@ public sealed class DL205CoilMappingTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags = tags,
+            RawTags = ModbusRawTags.Entries(tags),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205ExceptionCodeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205ExceptionCodeTests.cs
index 4a7e166f..e7a3773f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205ExceptionCodeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205ExceptionCodeTests.cs
@@ -36,12 +36,11 @@ public sealed class DL205ExceptionCodeTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("Unmapped",
                     ModbusRegion.HoldingRegisters, Address: 16383,
                     DataType: ModbusDataType.UInt16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-exc");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205FloatCdabQuirkTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205FloatCdabQuirkTests.cs
index fecfce23..a90fa677 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205FloatCdabQuirkTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205FloatCdabQuirkTests.cs
@@ -33,8 +33,7 @@ public sealed class DL205FloatCdabQuirkTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("DL205_Float_CDAB",
                     ModbusRegion.HoldingRegisters, Address: 1056,
                     DataType: ModbusDataType.Float32, Writable: false,
@@ -44,7 +43,7 @@ public sealed class DL205FloatCdabQuirkTests(ModbusSimulatorFixture sim)
                     ModbusRegion.HoldingRegisters, Address: 1056,
                     DataType: ModbusDataType.Float32, Writable: false,
                     ByteOrder: ModbusByteOrder.BigEndian),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-cdab");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs
index 80b0c08f..5f635de1 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs
@@ -37,15 +37,14 @@ public static class DL205Profile
         Port = port,
         UnitId = 1,
         Timeout = TimeSpan.FromSeconds(2),
-        Tags =
-        [
+        RawTags = ModbusRawTags.Entries([
             new ModbusTagDefinition(
                 Name: "Smoke_HReg200",
                 Region: ModbusRegion.HoldingRegisters,
                 Address: SmokeHoldingRegister,
                 DataType: ModbusDataType.Int16,
                 Writable: true),
-        ],
+        ]),
         // Disable the background probe loop — integration tests drive reads explicitly and
         // the probe would race with assertions.
         Probe = new ModbusProbeOptions { Enabled = false },
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205StringQuirkTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205StringQuirkTests.cs
index 3614de57..0ff12dbf 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205StringQuirkTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205StringQuirkTests.cs
@@ -40,8 +40,7 @@ public sealed class DL205StringQuirkTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition(
                     Name: "DL205_Hello_Low",
                     Region: ModbusRegion.HoldingRegisters,
@@ -60,7 +59,7 @@ public sealed class DL205StringQuirkTests(ModbusSimulatorFixture sim)
                     Writable: false,
                     StringLength: 5,
                     StringByteOrder: ModbusStringByteOrder.HighByteFirst),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-string");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205VMemoryQuirkTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205VMemoryQuirkTests.cs
index 7242d680..01c679ef 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205VMemoryQuirkTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205VMemoryQuirkTests.cs
@@ -36,12 +36,11 @@ public sealed class DL205VMemoryQuirkTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("DL205_V2000",
                     ModbusRegion.HoldingRegisters, Address: pdu,
                     DataType: ModbusDataType.UInt16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-vmem");
@@ -75,12 +74,11 @@ public sealed class DL205VMemoryQuirkTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("DL205_V40400",
                     ModbusRegion.HoldingRegisters, Address: pdu,
                     DataType: ModbusDataType.UInt16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "dl205-sysv");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205XInputTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205XInputTests.cs
index 201a46a8..41cfa428 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205XInputTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205XInputTests.cs
@@ -66,7 +66,7 @@ public sealed class DL205XInputTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags = tags,
+            RawTags = ModbusRawTags.Entries(tags),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ExceptionInjectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ExceptionInjectionTests.cs
index 05dee5be..0cb5d767 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ExceptionInjectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ExceptionInjectionTests.cs
@@ -47,12 +47,11 @@ public sealed class ExceptionInjectionTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition(tagName,
                     ModbusRegion.HoldingRegisters, Address: (ushort)address,
                     DataType: ModbusDataType.UInt16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(opts, driverInstanceId: "modbus-exc");
@@ -112,12 +111,11 @@ public sealed class ExceptionInjectionTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition(tag,
                     ModbusRegion.HoldingRegisters, Address: (ushort)address,
                     DataType: ModbusDataType.UInt16, Writable: true),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(opts, driverInstanceId: "modbus-exc-write");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs
index f831e5e0..e60ef47d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs
@@ -32,15 +32,14 @@ public static class MitsubishiProfile
         Port = port,
         UnitId = 1,
         Timeout = TimeSpan.FromSeconds(2),
-        Tags =
-        [
+        RawTags = ModbusRawTags.Entries([
             new ModbusTagDefinition(
                 Name: "Smoke_HReg200",
                 Region: ModbusRegion.HoldingRegisters,
                 Address: SmokeHoldingRegister,
                 DataType: ModbusDataType.Int16,
                 Writable: true),
-        ],
+        ]),
         Probe = new ModbusProbeOptions { Enabled = false },
     };
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiQuirkTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiQuirkTests.cs
index 8d28ecbc..6b2f1712 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiQuirkTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiQuirkTests.cs
@@ -176,7 +176,7 @@ public sealed class MitsubishiQuirkTests(ModbusSimulatorFixture sim)
                 Port = sim.Port,
                 UnitId = 1,
                 Timeout = TimeSpan.FromSeconds(2),
-                Tags = tags,
+                RawTags = ModbusRawTags.Entries(tags),
                 Probe = new ModbusProbeOptions { Enabled = false },
             },
             driverInstanceId: "melsec-quirk");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ModbusRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ModbusRawTags.cs
new file mode 100644
index 00000000..265ed4bf
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ModbusRawTags.cs
@@ -0,0 +1,29 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="ModbusTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob), and the
+///     driver rebuilds the typed definitions via <see cref="ModbusTagDefinitionFactory"/>. These integration
+///     profiles + quirk tests keep expressing their intent as typed definitions; this helper serialises each
+///     back to its TagConfig blob (via <see cref="ModbusTagDefinitionFactory.ToTagConfig"/>) and packages it
+///     as a <see cref="RawTagEntry"/> whose RawPath is the def's <c>Name</c> — so the round-trip through the
+///     real mapper reproduces the same definition the test authored, keyed by the same name the
+///     read/write/subscribe call sites use. Mirrors the unit-test project's helper of the same name.
+/// </summary>
+internal static class ModbusRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(ModbusTagDefinition def)
+        => new(def.Name, ModbusTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(IEnumerable<ModbusTagDefinition> defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs
index adfcdac3..0cb75b0a 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs
@@ -32,15 +32,14 @@ public static class S7_1500Profile
         Port = port,
         UnitId = 1,
         Timeout = TimeSpan.FromSeconds(2),
-        Tags =
-        [
+        RawTags = ModbusRawTags.Entries([
             new ModbusTagDefinition(
                 Name: "Smoke_HReg200",
                 Region: ModbusRegion.HoldingRegisters,
                 Address: SmokeHoldingRegister,
                 DataType: ModbusDataType.Int16,
                 Writable: true),
-        ],
+        ]),
         // Disable the background probe loop — integration tests drive reads explicitly and
         // the probe would race with assertions.
         Probe = new ModbusProbeOptions { Enabled = false },
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_ByteOrderTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_ByteOrderTests.cs
index f604dbf3..2d3c6c4c 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_ByteOrderTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_ByteOrderTests.cs
@@ -33,8 +33,7 @@ public sealed class S7_ByteOrderTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("S7_Float_ABCD",
                     ModbusRegion.HoldingRegisters, Address: 100,
                     DataType: ModbusDataType.Float32, Writable: false,
@@ -45,7 +44,7 @@ public sealed class S7_ByteOrderTests(ModbusSimulatorFixture sim)
                     ModbusRegion.HoldingRegisters, Address: 100,
                     DataType: ModbusDataType.Float32, Writable: false,
                     ByteOrder: ModbusByteOrder.WordSwap),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "s7-float-abcd");
@@ -79,13 +78,12 @@ public sealed class S7_ByteOrderTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("S7_Int32_ABCD",
                     ModbusRegion.HoldingRegisters, Address: 300,
                     DataType: ModbusDataType.Int32, Writable: false,
                     ByteOrder: ModbusByteOrder.BigEndian),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "s7-int-abcd");
@@ -117,12 +115,11 @@ public sealed class S7_ByteOrderTests(ModbusSimulatorFixture sim)
             Port = sim.Port,
             UnitId = 1,
             Timeout = TimeSpan.FromSeconds(2),
-            Tags =
-            [
+            RawTags = ModbusRawTags.Entries([
                 new ModbusTagDefinition("S7_Fingerprint",
                     ModbusRegion.HoldingRegisters, Address: 0,
                     DataType: ModbusDataType.UInt16, Writable: false),
-            ],
+            ]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         await using var driver = new ModbusDriver(options, driverInstanceId: "s7-fingerprint");
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusArrayTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusArrayTests.cs
index 889a80f0..1f09df5f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusArrayTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusArrayTests.cs
@@ -16,7 +16,7 @@ public sealed class ModbusArrayTests
     private static (ModbusDriver driver, ModbusDriverTests.FakeTransport fake) NewDriver(params ModbusTagDefinition[] tags)
     {
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = tags };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries(tags)};
         var drv = new ModbusDriver(opts, "modbus-array", _ => fake);
         return (drv, fake);
     }
@@ -274,14 +274,14 @@ public sealed class ModbusArrayTests
     {
         var json = """{"region":"HoldingRegisters","address":20,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":true,"arrayLength":3}""";
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [] };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = [new RawTagEntry("cell/modbus/arr20", json, false)] };
         var drv = new ModbusDriver(opts, "modbus-eq-arr", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
         fake.HoldingRegisters[20] = 100;
         fake.HoldingRegisters[21] = 200;
         fake.HoldingRegisters[22] = 300;
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync(["cell/modbus/arr20"], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(0u);
         var arr = r[0].Value.ShouldBeOfType<short[]>();
@@ -297,12 +297,12 @@ public sealed class ModbusArrayTests
     {
         var json = """{"region":"HoldingRegisters","address":30,"dataType":"UInt16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0}""";
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [] };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = [new RawTagEntry("cell/modbus/scalar30", json, false)] };
         var drv = new ModbusDriver(opts, "modbus-eq-scalar", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
         fake.HoldingRegisters[30] = 1234;
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync(["cell/modbus/scalar30"], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(0u);
         r[0].Value.ShouldBe((ushort)1234);
@@ -316,7 +316,7 @@ public sealed class ModbusArrayTests
     public void Equipment_Tag_Parser_Threads_ArrayLength_Into_ArrayCount()
     {
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":true,"arrayLength":5}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/arr", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBe(5);
     }
 
@@ -328,7 +328,7 @@ public sealed class ModbusArrayTests
     public void Equipment_Tag_Parser_No_ArrayLength_Leaves_ArrayCount_Null()
     {
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/arr", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBeNull();
     }
 
@@ -345,7 +345,7 @@ public sealed class ModbusArrayTests
     {
         // isArray:false, arrayLength:8 → must be scalar (ArrayCount == null).
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":false,"arrayLength":8}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/arr", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBeNull();
     }
 
@@ -359,12 +359,12 @@ public sealed class ModbusArrayTests
         // isArray:false, arrayLength:8 → scalar read; only register[40] is consumed.
         var json = """{"region":"HoldingRegisters","address":40,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":false,"arrayLength":8}""";
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [] };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = [new RawTagEntry("cell/modbus/c1scalar40", json, false)] };
         var drv = new ModbusDriver(opts, "modbus-c1-scalar", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
         fake.HoldingRegisters[40] = 9999;
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync(["cell/modbus/c1scalar40"], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(0u);
         // Must be a scalar short, NOT a short[].
@@ -380,7 +380,7 @@ public sealed class ModbusArrayTests
     public void Parser_IsArrayTrue_ArrayLength1_Gives_ArrayCount_1()
     {
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":true,"arrayLength":1}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/arr", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBe(1);
     }
 
@@ -393,12 +393,12 @@ public sealed class ModbusArrayTests
     {
         var json = """{"region":"HoldingRegisters","address":50,"dataType":"Int16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0,"isArray":true,"arrayLength":1}""";
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [] };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = [new RawTagEntry("cell/modbus/c1arr50", json, false)] };
         var drv = new ModbusDriver(opts, "modbus-c1-arr1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
         fake.HoldingRegisters[50] = 777;
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync(["cell/modbus/c1arr50"], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(0u);
         // Must be a short[] of length 1, NOT a scalar short.
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusBitRmwTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusBitRmwTests.cs
index 57064124..cb8325d2 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusBitRmwTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusBitRmwTests.cs
@@ -64,7 +64,7 @@ public sealed class ModbusBitRmwTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = tags,
+            RawTags = ModbusRawTags.Entries(tags),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         return (new ModbusDriver(opts, "modbus-1", _ => fake), fake);
@@ -198,7 +198,7 @@ public sealed class ModbusBitRmwTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("Bit5", ModbusRegion.HoldingRegisters, 10, ModbusDataType.BitInRegister, BitIndex: 5)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("Bit5", ModbusRegion.HoldingRegisters, 10, ModbusDataType.BitInRegister, BitIndex: 5)]),
             Probe = new ModbusProbeOptions { Enabled = false },
         };
         var drv = new ModbusDriver(opts, "modbus-rmw-trunc", _ => truncated);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCapTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCapTests.cs
index ddb768bf..68fed67d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCapTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCapTests.cs
@@ -66,7 +66,7 @@ public sealed class ModbusCapTests
         var tag = new ModbusTagDefinition("S", ModbusRegion.HoldingRegisters, 0, ModbusDataType.String,
             StringLength: 40); // 20 regs — fits in default cap (125).
         var transport = new RecordingTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
@@ -91,7 +91,7 @@ public sealed class ModbusCapTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [tag],
+            RawTags = ModbusRawTags.Entries([tag]),
             MaxRegistersPerRead = 100,
             Probe = new ModbusProbeOptions { Enabled = false },
         };
@@ -119,7 +119,7 @@ public sealed class ModbusCapTests
         var tag = new ModbusTagDefinition("MitString", ModbusRegion.HoldingRegisters, 0, ModbusDataType.String,
             StringLength: 200);
         var transport = new RecordingTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], MaxRegistersPerRead = 64, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), MaxRegistersPerRead = 64, Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
@@ -140,7 +140,7 @@ public sealed class ModbusCapTests
         var tag = new ModbusTagDefinition("LongStringWrite", ModbusRegion.HoldingRegisters, 0, ModbusDataType.String,
             StringLength: 220); // 110 regs.
         var transport = new RecordingTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], MaxRegistersPerWrite = 100, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), MaxRegistersPerWrite = 100, Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
@@ -161,7 +161,7 @@ public sealed class ModbusCapTests
         var tag = new ModbusTagDefinition("ShortStringWrite", ModbusRegion.HoldingRegisters, 0, ModbusDataType.String,
             StringLength: 40); // 20 regs.
         var transport = new RecordingTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], MaxRegistersPerWrite = 100, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), MaxRegistersPerWrite = 100, Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingAutoRecoveryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingAutoRecoveryTests.cs
index e821208a..06a5497f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingAutoRecoveryTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingAutoRecoveryTests.cs
@@ -65,7 +65,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -89,7 +89,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -122,7 +122,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(100),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
@@ -149,7 +149,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(100),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
@@ -176,7 +176,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", UnitId = 7, Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", UnitId = 7, RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -211,7 +211,7 @@ public sealed class ModbusCoalescingAutoRecoveryTests
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
         var t200 = new ModbusTagDefinition("T200", ModbusRegion.HoldingRegisters, 200, ModbusDataType.Int16);
         var t202 = new ModbusTagDefinition("T202", ModbusRegion.HoldingRegisters, 202, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104, t200, t202], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104, t200, t202]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingBisectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingBisectionTests.cs
index 5351e005..4d9dd4d6 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingBisectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingBisectionTests.cs
@@ -65,7 +65,7 @@ public sealed class ModbusCoalescingBisectionTests
         var tags = Enumerable.Range(100, 11)
             .Select(i => new ModbusTagDefinition($"T{i}", ModbusRegion.HoldingRegisters, (ushort)i, ModbusDataType.Int16))
             .ToArray();
-        var opts = new ModbusDriverOptions { Host = "f", Tags = tags, MaxReadGap = 10,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries(tags), MaxReadGap = 10,
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(100),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
@@ -108,7 +108,7 @@ public sealed class ModbusCoalescingBisectionTests
         var tags = Enumerable.Range(100, 11)
             .Select(i => new ModbusTagDefinition($"T{i}", ModbusRegion.HoldingRegisters, (ushort)i, ModbusDataType.Int16))
             .ToArray();
-        var opts = new ModbusDriverOptions { Host = "f", Tags = tags, MaxReadGap = 10,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries(tags), MaxReadGap = 10,
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(100),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
@@ -140,7 +140,7 @@ public sealed class ModbusCoalescingBisectionTests
         var tags = Enumerable.Range(100, 11)
             .Select(i => new ModbusTagDefinition($"T{i}", ModbusRegion.HoldingRegisters, (ushort)i, ModbusDataType.Int16))
             .ToArray();
-        var opts = new ModbusDriverOptions { Host = "f", Tags = tags, MaxReadGap = 10,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries(tags), MaxReadGap = 10,
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(100),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => twoHole);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingTests.cs
index da79cb6a..8bdea55f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusCoalescingTests.cs
@@ -49,7 +49,7 @@ public sealed class ModbusCoalescingTests
         var fake = new CountingTransport();
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2], MaxReadGap = 0,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2]), MaxReadGap = 0,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -70,7 +70,7 @@ public sealed class ModbusCoalescingTests
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t3 = new ModbusTagDefinition("T3", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2, t3], MaxReadGap = 2,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2, t3]), MaxReadGap = 2,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -92,7 +92,7 @@ public sealed class ModbusCoalescingTests
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t3 = new ModbusTagDefinition("T3", ModbusRegion.HoldingRegisters, 200, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2, t3], MaxReadGap = 10,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2, t3]), MaxReadGap = 10,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -111,7 +111,7 @@ public sealed class ModbusCoalescingTests
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16, CoalesceProhibited: true);
         var t3 = new ModbusTagDefinition("T3", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2, t3], MaxReadGap = 10,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2, t3]), MaxReadGap = 10,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -132,7 +132,7 @@ public sealed class ModbusCoalescingTests
         // Same Region + adjacent addresses but different UnitIds → must NOT coalesce.
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16, UnitId: 1);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16, UnitId: 2);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2], MaxReadGap = 100,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2]), MaxReadGap = 100,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -154,7 +154,7 @@ public sealed class ModbusCoalescingTests
         // resulting span exceeds the cap — it falls back to two separate reads.
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 200, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2], MaxReadGap = 300,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2]), MaxReadGap = 300,
             MaxRegistersPerRead = 125, Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -174,7 +174,7 @@ public sealed class ModbusCoalescingTests
         var fake = new CountingTransport();
         var t1 = new ModbusTagDefinition("T1", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t2 = new ModbusTagDefinition("T2", ModbusRegion.HoldingRegisters, 101, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t1, t2], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t1, t2]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverConfigEnumSerializationTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverConfigEnumSerializationTests.cs
index 2508b26d..63f61f83 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverConfigEnumSerializationTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverConfigEnumSerializationTests.cs
@@ -6,44 +6,49 @@ using Xunit;
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 
 /// <summary>
-///     Regression guard for the 2026-06-19 enum-serialization bug (the FB-9 Modbus-Int64 authoring
-///     case). The AdminUI Modbus page now serialises tag enums (<see cref="ModbusRegion"/>,
-///     <see cref="ModbusDataType"/>, byte-order) as STRINGS. This proves the factory parses that
-///     AdminUI-shaped Int64-tag blob, and documents that the pre-fix NUMERIC form threw because the
-///     <c>ModbusTagDto</c> enum fields are <c>string?</c>.
+///     v3 factory RawTags binding. Under v3 tags are delivered as authored raw tags
+///     (<c>{rawPath, tagConfig, writeIdempotent}</c>) — the tag's address enums live INSIDE the opaque
+///     <c>tagConfig</c> blob (authored by the AdminUI <c>ModbusTagConfigModel</c>), not in the driver
+///     config DTO. This proves the factory binds a <c>rawTags</c> array and documents that the legacy
+///     structured/AddressString <c>tags</c> path (and the FB-9 numeric-vs-string tag-enum bug class it
+///     carried) is retired.
 /// </summary>
 public sealed class ModbusDriverConfigEnumSerializationTests
 {
-    // Mirrors the (now fixed) AdminUI ModbusDriverPage._jsonOpts: camelCase + string enums.
+    // Mirrors the AdminUI ModbusDriverPage._jsonOpts: camelCase + string enums.
     private static readonly JsonSerializerOptions _adminPageOpts = new()
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         Converters = { new JsonStringEnumConverter() },
     };
 
-    /// <summary>Verifies the factory parses an AdminUI-authored Modbus config carrying an Int64
-    /// holding-register tag (string enums) without throwing.</summary>
+    /// <summary>Verifies the factory binds an AdminUI-authored Modbus config carrying an Int64
+    /// holding-register raw tag (string enums inside the tagConfig blob) without throwing.</summary>
     [Fact]
-    public void Factory_parses_admin_authored_int64_string_enum_config()
+    public void Factory_binds_admin_authored_rawTags_config()
     {
-        var tag = new ModbusTagDefinition("Int64Tag", ModbusRegion.HoldingRegisters, (ushort)100, ModbusDataType.Int64);
-        var opts = new ModbusDriverOptions { Host = "10.0.0.5", Port = 502, UnitId = 1, Tags = new[] { tag } };
+        var tag = new ModbusTagDefinition("cell/modbus/dev1/Int64Tag", ModbusRegion.HoldingRegisters, (ushort)100, ModbusDataType.Int64);
+        var opts = new ModbusDriverOptions { Host = "10.0.0.5", Port = 502, UnitId = 1, RawTags = ModbusRawTags.Entries(new[] { tag }) };
         var blob = JsonSerializer.Serialize(opts, _adminPageOpts);
-        // The fixed AdminUI page must emit tag enums as strings, not numbers.
-        blob.ShouldContain("\"dataType\":\"Int64\"");
+        // The raw tag serialises as {rawPath, tagConfig, writeIdempotent}; the address enums live
+        // inside the (string-encoded) tagConfig blob.
+        blob.ShouldContain("\"rawPath\":\"cell/modbus/dev1/Int64Tag\"");
+        blob.ShouldContain("Int64");
 
         using var driver = ModbusDriverFactoryExtensions.CreateInstance("mb-test", blob);
         driver.DriverType.ShouldBe("Modbus");
     }
 
-    /// <summary>Documents the original bug: the pre-fix AdminUI page emitted numeric tag enums
-    /// (<c>"dataType":5,"region":3</c>) which the string-typed tag DTO cannot bind, so the factory throws.</summary>
+    /// <summary>Documents the retirement of the legacy structured <c>tags</c> path: a legacy tag array
+    /// (including the pre-fix numeric-enum shape) is no longer a recognised property, so it binds nothing
+    /// and the factory succeeds rather than throwing on its enum shape.</summary>
     [Fact]
-    public void Factory_throws_on_the_numeric_enum_form_the_pre_fix_page_emitted()
+    public void Factory_ignores_the_retired_structured_tags_array()
     {
-        const string numericBlob =
+        const string legacyBlob =
             "{\"host\":\"10.0.0.5\",\"port\":502,\"unitId\":1,\"tags\":[" +
             "{\"name\":\"Int64Tag\",\"region\":3,\"address\":100,\"dataType\":5}]}";
-        Should.Throw<Exception>(() => ModbusDriverFactoryExtensions.CreateInstance("mb-test", numericBlob));
+        using var driver = ModbusDriverFactoryExtensions.CreateInstance("mb-test", legacyBlob);
+        driver.DriverType.ShouldBe("Modbus");
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverTests.cs
index 8b445a81..7a686ace 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusDriverTests.cs
@@ -118,7 +118,7 @@ public sealed class ModbusDriverTests
     private static (ModbusDriver driver, FakeTransport fake) NewDriver(params ModbusTagDefinition[] tags)
     {
         var fake = new FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = tags };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries(tags)};
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         return (drv, fake);
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEdgeCaseValidationTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEdgeCaseValidationTests.cs
index f36fd7ea..a9879e8d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEdgeCaseValidationTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEdgeCaseValidationTests.cs
@@ -7,9 +7,10 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 ///     Regression coverage for Driver.Modbus-009: two configuration edge cases that previously
 ///     silently produced wrong wire behaviour.
 ///     (1) <c>StringLength = 0</c> for a <c>String</c>-typed tag — used to flow into an FC03
-///     with quantity 0, a spec-illegal request the PLC rejects with exception 03. Now bind-time
-///     validation in <c>ModbusDriverFactoryExtensions</c> rejects the misconfiguration with a
-///     clear diagnostic.
+///     with quantity 0, a spec-illegal request the PLC rejects with exception 03. In v3 the guard
+///     moved to the pure mapper (<see cref="ModbusTagDefinitionFactory.FromTagConfig"/>): a String
+///     tag with <c>stringLength &lt; 1</c> fails to map (⇒ the driver skips it / surfaces
+///     <c>BadNodeIdUnknown</c>) instead of the factory throwing at bind time.
 ///     (2) Sub-second <see cref="TimeSpan"/> values on <c>ModbusKeepAliveOptions.Time</c> /
 ///     <c>Interval</c> — the int-cast in <c>EnableKeepAlive</c> truncated <c>500&#160;ms</c> to
 ///     <c>0</c>, which most OSes interpret as "use the default", silently defeating the
@@ -19,71 +20,41 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 [Trait("Category", "Unit")]
 public sealed class ModbusEdgeCaseValidationTests
 {
-    /// <summary>Verifies that string tags with zero length are rejected during factory creation.</summary>
+    private const string RawPath = "cell/modbus/dev1/Greeting";
+
+    /// <summary>Verifies that a String tag with an explicit zero length fails to map.</summary>
     [Fact]
-    public void Factory_rejects_String_tag_with_StringLength_zero_via_structured_form()
+    public void Mapper_rejects_String_tag_with_StringLength_zero_explicit()
     {
-        const string json = """
-        {
-          "host": "10.0.0.10",
-          "tags": [
-            { "name": "Greeting", "region": "HoldingRegisters", "address": 100, "dataType": "String", "stringLength": 0 }
-          ]
-        }
-        """;
-        var ex = Should.Throw<InvalidOperationException>(
-            () => ModbusDriverFactoryExtensions.CreateInstance("modbus-1", json));
-        ex.Message.ShouldContain("StringLength");
-        ex.Message.ShouldContain("Greeting");
+        const string json = """{"region":"HoldingRegisters","address":100,"dataType":"String","stringLength":0}""";
+        ModbusTagDefinitionFactory.FromTagConfig(json, RawPath, out _).ShouldBeFalse();
     }
 
-    /// <summary>Verifies that omitted string length defaults to zero and is rejected.</summary>
+    /// <summary>Verifies that a String tag with an omitted length (defaults to zero) fails to map.</summary>
     [Fact]
-    public void Factory_rejects_String_tag_with_StringLength_zero_via_missing_field()
+    public void Mapper_rejects_String_tag_with_StringLength_zero_missing_field()
     {
-        // No stringLength → defaults to 0. Same misconfiguration via a different DTO shape.
-        const string json = """
-        {
-          "host": "10.0.0.10",
-          "tags": [
-            { "name": "Greeting", "region": "HoldingRegisters", "address": 100, "dataType": "String" }
-          ]
-        }
-        """;
-        var ex = Should.Throw<InvalidOperationException>(
-            () => ModbusDriverFactoryExtensions.CreateInstance("modbus-1", json));
-        ex.Message.ShouldContain("StringLength");
+        // No stringLength → defaults to 0. Same misconfiguration via a different blob shape.
+        const string json = """{"region":"HoldingRegisters","address":100,"dataType":"String"}""";
+        ModbusTagDefinitionFactory.FromTagConfig(json, RawPath, out _).ShouldBeFalse();
     }
 
-    /// <summary>Verifies that string tags with length one are accepted.</summary>
+    /// <summary>Verifies that a String tag with length one maps successfully.</summary>
     [Fact]
-    public void Factory_accepts_String_tag_with_StringLength_one()
+    public void Mapper_accepts_String_tag_with_StringLength_one()
     {
-        const string json = """
-        {
-          "host": "10.0.0.10",
-          "tags": [
-            { "name": "Greeting", "region": "HoldingRegisters", "address": 100, "dataType": "String", "stringLength": 1 }
-          ]
-        }
-        """;
-        Should.NotThrow(() => ModbusDriverFactoryExtensions.CreateInstance("modbus-1", json));
+        const string json = """{"region":"HoldingRegisters","address":100,"dataType":"String","stringLength":1}""";
+        ModbusTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
+        def.StringLength.ShouldBe((ushort)1);
     }
 
-    /// <summary>Verifies that non-string tags are unaffected by string length zero.</summary>
+    /// <summary>Verifies that non-String tags are unaffected by a zero string length.</summary>
     [Fact]
-    public void Factory_accepts_non_String_tag_with_StringLength_zero()
+    public void Mapper_accepts_non_String_tag_with_StringLength_zero()
     {
-        // The validation only kicks in for String tags — Int16 tags with StringLength=0 are normal.
-        const string json = """
-        {
-          "host": "10.0.0.10",
-          "tags": [
-            { "name": "Level", "region": "HoldingRegisters", "address": 100, "dataType": "Int16" }
-          ]
-        }
-        """;
-        Should.NotThrow(() => ModbusDriverFactoryExtensions.CreateInstance("modbus-1", json));
+        // The guard only kicks in for String tags — Int16 tags with StringLength=0 are normal.
+        const string json = """{"region":"HoldingRegisters","address":100,"dataType":"Int16"}""";
+        ModbusTagDefinitionFactory.FromTagConfig(json, RawPath, out _).ShouldBeTrue();
     }
 
     /// <summary>Verifies that sub-second time spans are rounded up to at least one second.</summary>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusExceptionMapperTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusExceptionMapperTests.cs
index 7a13f5b0..c22118d5 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusExceptionMapperTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusExceptionMapperTests.cs
@@ -54,7 +54,7 @@ public sealed class ModbusExceptionMapperTests
     {
         var transport = new ExceptionRaisingTransport(exceptionCode: 0x02);
         var tag = new ModbusTagDefinition("T", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
@@ -68,7 +68,7 @@ public sealed class ModbusExceptionMapperTests
     {
         var transport = new ExceptionRaisingTransport(exceptionCode: 0x04);
         var tag = new ModbusTagDefinition("T", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => transport);
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
@@ -104,7 +104,7 @@ public sealed class ModbusExceptionMapperTests
         // Socket drop / timeout / malformed frame → transport-layer failure. Should surface
         // distinctly from tag-level faults so operators know to check the network, not the config.
         var tag = new ModbusTagDefinition("T", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         await using var drv = new ModbusDriver(opts, "modbus-1", _ => new NonModbusFailureTransport());
         await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLifecycleHygieneTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLifecycleHygieneTests.cs
index 007ad260..c82b234e 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLifecycleHygieneTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLifecycleHygieneTests.cs
@@ -76,12 +76,12 @@ public sealed class ModbusLifecycleHygieneTests
     }
 
     /// <summary>
-    ///     Returns a snapshot of the driver's private <c>_tagsByName</c> dictionary so the
+    ///     Returns a snapshot of the driver's private <c>_tagsByRawPath</c> dictionary so the
     ///     hygiene tests can confirm the cache is empty after teardown.
     /// </summary>
     private static System.Collections.IDictionary GetTagsByName(ModbusDriver drv) =>
         (System.Collections.IDictionary)typeof(ModbusDriver)
-            .GetField("_tagsByName", BindingFlags.NonPublic | BindingFlags.Instance)!
+            .GetField("_tagsByRawPath", BindingFlags.NonPublic | BindingFlags.Instance)!
             .GetValue(drv)!;
 
     // -------------------- Finding -002 / -012 (2) --------------------
@@ -97,7 +97,7 @@ public sealed class ModbusLifecycleHygieneTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -116,8 +116,8 @@ public sealed class ModbusLifecycleHygieneTests
         {
             Host = "fake",
             WriteOnChangeOnly = true,
-            Tags = [new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16,
-                Deadband: 1.0)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16,
+                Deadband: 1.0)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -164,7 +164,7 @@ public sealed class ModbusLifecycleHygieneTests
             },
             // Re-probe loop also opted in so DisposeAsync exercises both CTS cancellations.
             AutoProhibitReprobeInterval = TimeSpan.FromMilliseconds(50),
-            Tags = [new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -195,7 +195,7 @@ public sealed class ModbusLifecycleHygieneTests
         {
             Host = "fake",
             Probe = new ModbusProbeOptions { Enabled = false },
-            Tags = [new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -258,7 +258,7 @@ public sealed class ModbusLifecycleHygieneTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("Level", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("Level", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -278,7 +278,7 @@ public sealed class ModbusLifecycleHygieneTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("Level", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("Level", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -300,7 +300,7 @@ public sealed class ModbusLifecycleHygieneTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("Coil", ModbusRegion.Coils, 0, ModbusDataType.Bool)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("Coil", ModbusRegion.Coils, 0, ModbusDataType.Bool)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         drv.InitializeAsync("{}", CancellationToken.None).GetAwaiter().GetResult();
@@ -347,7 +347,7 @@ public sealed class ModbusLifecycleHygieneTests
         var opts = new ModbusDriverOptions
         {
             Host = "fake",
-            Tags = [new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)],
+            RawTags = ModbusRawTags.Entries([new ModbusTagDefinition("A", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16)]),
         };
         var drv = new ModbusDriver(opts, "modbus-1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLoggerInjectionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLoggerInjectionTests.cs
index 0ec88d81..f4caef3f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLoggerInjectionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusLoggerInjectionTests.cs
@@ -85,7 +85,7 @@ public sealed class ModbusLoggerInjectionTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "drv-logged", _ => fake, logger: logger);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -116,7 +116,7 @@ public sealed class ModbusLoggerInjectionTests
         var t100 = new ModbusTagDefinition("T100", ModbusRegion.HoldingRegisters, 100, ModbusDataType.Int16);
         var t102 = new ModbusTagDefinition("T102", ModbusRegion.HoldingRegisters, 102, ModbusDataType.Int16);
         var t104 = new ModbusTagDefinition("T104", ModbusRegion.HoldingRegisters, 104, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [t100, t102, t104], MaxReadGap = 5,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([t100, t102, t104]), MaxReadGap = 5,
             AutoProhibitReprobeInterval = TimeSpan.FromHours(1),  // long interval — we drive it manually
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "drv-logged", _ => fake, logger: logger);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusMultiUnitTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusMultiUnitTests.cs
index ac01324f..18109a6f 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusMultiUnitTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusMultiUnitTests.cs
@@ -47,7 +47,7 @@ public sealed class ModbusMultiUnitTests
         var fake = new UnitCapturingTransport();
         var tagSlave1 = new ModbusTagDefinition("S1Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16, UnitId: 1);
         var tagSlave5 = new ModbusTagDefinition("S5Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16, UnitId: 5);
-        var opts = new ModbusDriverOptions { Host = "f", UnitId = 99, Tags = [tagSlave1, tagSlave5],
+        var opts = new ModbusDriverOptions { Host = "f", UnitId = 99, RawTags = ModbusRawTags.Entries([tagSlave1, tagSlave5]),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -66,7 +66,7 @@ public sealed class ModbusMultiUnitTests
     {
         var fake = new UnitCapturingTransport();
         var tag = new ModbusTagDefinition("T", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16); // no UnitId override
-        var opts = new ModbusDriverOptions { Host = "f", UnitId = 7, Tags = [tag],
+        var opts = new ModbusDriverOptions { Host = "f", UnitId = 7, RawTags = ModbusRawTags.Entries([tag]),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -83,7 +83,7 @@ public sealed class ModbusMultiUnitTests
         var fake = new UnitCapturingTransport();
         var t1 = new ModbusTagDefinition("S1Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16, UnitId: 1);
         var t5 = new ModbusTagDefinition("S5Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16, UnitId: 5);
-        var opts = new ModbusDriverOptions { Host = "10.1.2.3", Port = 502, Tags = [t1, t5],
+        var opts = new ModbusDriverOptions { Host = "10.1.2.3", Port = 502, RawTags = ModbusRawTags.Entries([t1, t5]),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -101,7 +101,7 @@ public sealed class ModbusMultiUnitTests
     public async Task IPerCallHostResolver_Unknown_Tag_Falls_Back_To_HostName()
     {
         var fake = new UnitCapturingTransport();
-        var opts = new ModbusDriverOptions { Host = "10.1.2.3", Port = 502, Tags = [],
+        var opts = new ModbusDriverOptions { Host = "10.1.2.3", Port = 502, RawTags = [],
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusProtocolOptionsTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusProtocolOptionsTests.cs
index 5bdf2cc9..0ed41278 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusProtocolOptionsTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusProtocolOptionsTests.cs
@@ -75,7 +75,7 @@ public sealed class ModbusProtocolOptionsTests
     {
         var fake = new CapturingTransport();
         var tag = new ModbusTagDefinition("Run", ModbusRegion.Coils, 0, ModbusDataType.Bool);
-        var drv = new ModbusDriver(new ModbusDriverOptions { Host = "f", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } }, "m1", _ => fake);
+        var drv = new ModbusDriver(new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } }, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
         await drv.WriteAsync([new WriteRequest("Run", true)], CancellationToken.None);
@@ -89,7 +89,7 @@ public sealed class ModbusProtocolOptionsTests
     {
         var fake = new CapturingTransport();
         var tag = new ModbusTagDefinition("Run", ModbusRegion.Coils, 0, ModbusDataType.Bool);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], UseFC15ForSingleCoilWrites = true, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), UseFC15ForSingleCoilWrites = true, Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -104,7 +104,7 @@ public sealed class ModbusProtocolOptionsTests
     {
         var fake = new CapturingTransport();
         var tag = new ModbusTagDefinition("Sp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var drv = new ModbusDriver(new ModbusDriverOptions { Host = "f", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } }, "m1", _ => fake);
+        var drv = new ModbusDriver(new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } }, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
         await drv.WriteAsync([new WriteRequest("Sp", (short)42)], CancellationToken.None);
@@ -118,7 +118,7 @@ public sealed class ModbusProtocolOptionsTests
     {
         var fake = new CapturingTransport();
         var tag = new ModbusTagDefinition("Sp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], UseFC16ForSingleRegisterWrites = true, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), UseFC16ForSingleRegisterWrites = true, Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -134,7 +134,7 @@ public sealed class ModbusProtocolOptionsTests
         var fake = new CapturingTransport();
         // 2500 coils with cap 2000 → 2 reads (2000 + 500).
         var tag = new ModbusTagDefinition("Big", ModbusRegion.Coils, 0, ModbusDataType.Bool, ArrayCount: 2500);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], MaxCoilsPerRead = 2000, Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), MaxCoilsPerRead = 2000, Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusRawTags.cs
new file mode 100644
index 00000000..9eda05bd
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusRawTags.cs
@@ -0,0 +1,28 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="ModbusTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob), and the
+///     driver rebuilds the typed definitions via <see cref="ModbusTagDefinitionFactory"/>. These tests keep
+///     expressing their intent as typed definitions; this helper serialises each back to its TagConfig blob
+///     (via <see cref="ModbusTagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> — so the round-trip through the real mapper reproduces the same
+///     definition the test authored, keyed by the same name the read/write/subscribe call sites use.
+/// </summary>
+internal static class ModbusRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(ModbusTagDefinition def)
+        => new(def.Name, ModbusTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(IEnumerable<ModbusTagDefinition> defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscribeOptionsTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscribeOptionsTests.cs
index ff26087c..bf2c44c4 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscribeOptionsTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscribeOptionsTests.cs
@@ -61,7 +61,7 @@ public sealed class ModbusSubscribeOptionsTests
     {
         var fake = new ProgrammableTransport();
         var tag = new ModbusTagDefinition("Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16, Deadband: 5.0);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -102,7 +102,7 @@ public sealed class ModbusSubscribeOptionsTests
     {
         var fake = new ProgrammableTransport();
         var tag = new ModbusTagDefinition("Temp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16); // no deadband
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], Probe = new ModbusProbeOptions { Enabled = false } };
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
@@ -127,7 +127,7 @@ public sealed class ModbusSubscribeOptionsTests
     {
         var fake = new ProgrammableTransport();
         var tag = new ModbusTagDefinition("Sp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], WriteOnChangeOnly = true,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), WriteOnChangeOnly = true,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -146,7 +146,7 @@ public sealed class ModbusSubscribeOptionsTests
     {
         var fake = new ProgrammableTransport();
         var tag = new ModbusTagDefinition("Sp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag],
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]),
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -164,7 +164,7 @@ public sealed class ModbusSubscribeOptionsTests
     {
         var fake = new ProgrammableTransport();
         var tag = new ModbusTagDefinition("Sp", ModbusRegion.HoldingRegisters, 0, ModbusDataType.Int16);
-        var opts = new ModbusDriverOptions { Host = "f", Tags = [tag], WriteOnChangeOnly = true,
+        var opts = new ModbusDriverOptions { Host = "f", RawTags = ModbusRawTags.Entries([tag]), WriteOnChangeOnly = true,
             Probe = new ModbusProbeOptions { Enabled = false } };
         var drv = new ModbusDriver(opts, "m1", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscriptionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscriptionTests.cs
index f44688a0..e98bff14 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscriptionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusSubscriptionTests.cs
@@ -48,7 +48,7 @@ public sealed class ModbusSubscriptionTests
     private static (ModbusDriver drv, FakeTransport fake) NewDriver(params ModbusTagDefinition[] tags)
     {
         var fake = new FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = tags };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = ModbusRawTags.Entries(tags)};
         return (new ModbusDriver(opts, "modbus-1", _ => fake), fake);
     }
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryStrictnessTests.cs
similarity index 62%
rename from tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagParserStrictnessTests.cs
rename to tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryStrictnessTests.cs
index bcd3f2ac..2adcb9d2 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagParserStrictnessTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryStrictnessTests.cs
@@ -5,47 +5,51 @@ using ZB.MOM.WW.OtOpcUa.Driver.Modbus;
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 
 /// <summary>
-///     R2-11 Phase C strictness surface for the Modbus equipment-tag parser: the runtime is now STRICT — a
-///     present-but-invalid (typo'd) enum on any of the three enum fields (<c>region</c> / <c>dataType</c> /
-///     <c>byteOrder</c>) rejects the whole tag (<c>TryParse</c> ⇒ <see langword="false"/> ⇒
+///     R2-11 Phase C strictness surface for the Modbus tag-definition factory: the mapper is STRICT — a
+///     present-but-invalid (typo'd) enum on any enum field (<c>region</c> / <c>dataType</c> /
+///     <c>byteOrder</c>) rejects the whole tag (<c>FromTagConfig</c> ⇒ <see langword="false"/> ⇒
 ///     <c>BadNodeIdUnknown</c>) instead of silently defaulting to a wrong-width <c>Good</c>. <c>Inspect</c>
 ///     still reports the same typo at deploy time, and the <c>writable</c> key is honoured (default true).
+///     Under v3 the mapped definition's <c>Name</c> is the RawPath the mapper was handed, not the blob.
 /// </summary>
-public sealed class ModbusEquipmentTagParserStrictnessTests
+public sealed class ModbusTagDefinitionFactoryStrictnessTests
 {
+    private const string RawPath = "cell/modbus/dev1/T1";
+
     // ---- Phase C: a typo'd enum now rejects the tag (BadNodeIdUnknown), not a silent default ----
 
     [Fact]
     public void Typo_dataType_rejects_the_tag()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Intt16\"}", out _)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Intt16\"}", RawPath, out _)
             .ShouldBeFalse();
     }
 
     [Fact]
     public void Typo_region_rejects_the_tag()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisterz\",\"address\":1,\"dataType\":\"Int16\"}", out _)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisterz\",\"address\":1,\"dataType\":\"Int16\"}", RawPath, out _)
             .ShouldBeFalse();
     }
 
     [Fact]
     public void Typo_byteOrder_rejects_the_tag()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"byteOrder\":\"BigEndan\"}", out _)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"byteOrder\":\"BigEndan\"}", RawPath, out _)
             .ShouldBeFalse();
     }
 
     [Fact]
     public void Valid_enums_still_parse()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"byteOrder\":\"BigEndian\"}", out var def)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"byteOrder\":\"BigEndian\"}", RawPath, out var def)
             .ShouldBeTrue();
         def.DataType.ShouldBe(ModbusDataType.Int16);
+        def.Name.ShouldBe(RawPath);
     }
 
     // ---- Inspect reports the typo ----
@@ -53,7 +57,7 @@ public sealed class ModbusEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_reports_typo_dataType_with_field_and_valid_values()
     {
-        var warnings = ModbusEquipmentTagParser.Inspect(
+        var warnings = ModbusTagDefinitionFactory.Inspect(
             "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Intt16\"}");
         warnings.ShouldHaveSingleItem();
         warnings[0].ShouldContain("Intt16");
@@ -64,7 +68,7 @@ public sealed class ModbusEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_clean_config_has_no_warnings()
     {
-        ModbusEquipmentTagParser.Inspect(
+        ModbusTagDefinitionFactory.Inspect(
             "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\"}")
             .ShouldBeEmpty();
     }
@@ -72,7 +76,7 @@ public sealed class ModbusEquipmentTagParserStrictnessTests
     [Fact]
     public void Inspect_malformed_json_warns_unresolvable()
     {
-        ModbusEquipmentTagParser.Inspect("{not json").ShouldHaveSingleItem();
+        ModbusTagDefinitionFactory.Inspect("{not json").ShouldHaveSingleItem();
     }
 
     // ---- writable now honoured ----
@@ -80,8 +84,8 @@ public sealed class ModbusEquipmentTagParserStrictnessTests
     [Fact]
     public void Writable_false_is_honoured()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"writable\":false}", out var def)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\",\"writable\":false}", RawPath, out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeFalse();
     }
@@ -89,8 +93,8 @@ public sealed class ModbusEquipmentTagParserStrictnessTests
     [Fact]
     public void Writable_absent_defaults_to_true()
     {
-        ModbusEquipmentTagParser.TryParse(
-            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\"}", out var def)
+        ModbusTagDefinitionFactory.FromTagConfig(
+            "{\"region\":\"HoldingRegisters\",\"address\":1,\"dataType\":\"Int16\"}", RawPath, out var def)
             .ShouldBeTrue();
         def.Writable.ShouldBeTrue();
     }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryTests.cs
similarity index 51%
rename from tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagTests.cs
rename to tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryTests.cs
index 7500bdbe..1ed2dafd 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusEquipmentTagTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusTagDefinitionFactoryTests.cs
@@ -1,18 +1,21 @@
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.Modbus;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 
 [Trait("Category", "Unit")]
-public class ModbusEquipmentTagTests
+public class ModbusTagDefinitionFactoryTests
 {
+    private const string RawPath = "cell/modbus/dev1/Reg";
+
     [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
+    public void Maps_tagconfig_into_a_definition_keyed_by_rawpath()
     {
         var json = """{"region":"HoldingRegisters","address":40001,"dataType":"UInt16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
+        ModbusTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(RawPath); // v3: identity is the RawPath, not the blob
         def.Region.ShouldBe(ModbusRegion.HoldingRegisters);
         def.Address.ShouldBe((ushort)40001);
         def.DataType.ShouldBe(ModbusDataType.UInt16);
@@ -20,39 +23,40 @@ public class ModbusEquipmentTagTests
 
     [Fact]
     public void Rejects_a_non_address_blob()
-        => ModbusEquipmentTagParser.TryParse("""{"FullName":"x"}""", out _).ShouldBeFalse();
+        => ModbusTagDefinitionFactory.FromTagConfig("""{"FullName":"x"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_garbage()
-        => ModbusEquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
+        => ModbusTagDefinitionFactory.FromTagConfig("not json", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_address_as_a_json_string()
-        => ModbusEquipmentTagParser.TryParse(
-            """{"region":"HoldingRegisters","address":"40001","dataType":"UInt16"}""", out _).ShouldBeFalse();
+        => ModbusTagDefinitionFactory.FromTagConfig(
+            """{"region":"HoldingRegisters","address":"40001","dataType":"UInt16"}""", RawPath, out _).ShouldBeFalse();
 
     [Fact]
     public void Rejects_address_out_of_ushort_range()
-        => ModbusEquipmentTagParser.TryParse(
-            """{"region":"HoldingRegisters","address":70000,"dataType":"UInt16"}""", out _).ShouldBeFalse();
+        => ModbusTagDefinitionFactory.FromTagConfig(
+            """{"region":"HoldingRegisters","address":70000,"dataType":"UInt16"}""", RawPath, out _).ShouldBeFalse();
 
     /// <summary>
-    ///     End-to-end driver-level proof: a Modbus driver with NO authored tags can still read an
-    ///     equipment-tag ref (the raw TagConfig JSON) — the resolver parses it into a transient
-    ///     definition and the read goes to the wire instead of returning BadNodeIdUnknown.
+    ///     End-to-end driver-level proof: a Modbus driver handed an authored raw tag (RawPath + TagConfig
+    ///     blob) maps it into its RawPath → definition table and reads by RawPath — the read goes to the
+    ///     wire instead of returning BadNodeIdUnknown.
     /// </summary>
     [Fact]
-    public async Task Driver_resolves_an_equipment_ref_and_reads_instead_of_BadNodeIdUnknown()
+    public async Task Driver_resolves_a_rawpath_and_reads_instead_of_BadNodeIdUnknown()
     {
         // Address 10 fits the fake transport's 256-register bank (40001 would overflow it).
+        const string rawPath = "cell/modbus/dev1/U16";
         var json = """{"region":"HoldingRegisters","address":10,"dataType":"UInt16","byteOrder":"BigEndian","bitIndex":0,"stringLength":0}""";
         var fake = new ModbusDriverTests.FakeTransport();
-        var opts = new ModbusDriverOptions { Host = "fake", Tags = [] };
+        var opts = new ModbusDriverOptions { Host = "fake", RawTags = [new RawTagEntry(rawPath, json, false)] };
         var drv = new ModbusDriver(opts, "modbus-eq", _ => fake);
         await drv.InitializeAsync("{}", CancellationToken.None);
         fake.HoldingRegisters[10] = 4242;
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([rawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(0u);
         r[0].StatusCode.ShouldNotBe(0x80340000u); // not BadNodeIdUnknown
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusUnitIdResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusUnitIdResolveHostTests.cs
index 933a201f..2c233995 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusUnitIdResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ModbusUnitIdResolveHostTests.cs
@@ -1,14 +1,15 @@
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests;
 
 /// <summary>
 ///     CONV-4 (Modbus leg) — Modbus keys per-host resilience per SLAVE UNIT
-///     (<c>host:port/unitN</c>). An equipment tag must carry its own <c>unitId</c> so multi-unit
-///     equipment tags key their own breaker; <see cref="ModbusDriver.ResolveHost"/> must resolve
-///     the equipment ref through the resolver rather than only matching authored names. Scope:
-///     <c>unitId</c> ONLY — the parser's other strictness gaps are R2-11's.
+///     (<c>host:port/unitN</c>). An authored raw tag carries its own <c>unitId</c> in its TagConfig so
+///     multi-unit tags key their own breaker; <see cref="ModbusDriver.ResolveHost"/> resolves a RawPath
+///     through the driver's authored RawPath → definition table. Under v3 the reference is always a
+///     RawPath — an unauthored RawPath falls back to the driver-level host.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class ModbusUnitIdResolveHostTests
@@ -21,43 +22,55 @@ public sealed class ModbusUnitIdResolveHostTests
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 
-    private static ModbusDriver NewDriver() => new(
-        new ModbusDriverOptions { Host = "10.0.0.1", Port = 502, UnitId = 1, Probe = new ModbusProbeOptions { Enabled = false } },
-        "modbus-1", _ => new NoopTransport());
+    private static async Task<ModbusDriver> NewDriverAsync(params RawTagEntry[] rawTags)
+    {
+        var drv = new ModbusDriver(
+            new ModbusDriverOptions
+            {
+                Host = "10.0.0.1", Port = 502, UnitId = 1, RawTags = rawTags,
+                Probe = new ModbusProbeOptions { Enabled = false },
+            },
+            "modbus-1", _ => new NoopTransport());
+        await drv.InitializeAsync("{}", CancellationToken.None);
+        return drv;
+    }
 
-    /// <summary>The parser reads an optional unitId into the transient definition.</summary>
+    /// <summary>The mapper reads an optional unitId into the definition.</summary>
     [Fact]
-    public void Parser_reads_optional_unitId()
+    public void FromTagConfig_reads_optional_unitId()
     {
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","unitId":7}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/dev1/U7", out var def).ShouldBeTrue();
+        def.Name.ShouldBe("cell/modbus/dev1/U7");
         def.UnitId.ShouldBe((byte)7);
     }
 
     /// <summary>An absent unitId leaves the definition on the driver-level default (null override).</summary>
     [Fact]
-    public void Parser_absent_unitId_is_null()
+    public void FromTagConfig_absent_unitId_is_null()
     {
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16"}""";
-        ModbusEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        ModbusTagDefinitionFactory.FromTagConfig(json, "cell/modbus/dev1/U0", out var def).ShouldBeTrue();
         def.UnitId.ShouldBeNull();
     }
 
-    /// <summary>An equipment ref carrying a unitId keys its own per-unit host name.</summary>
+    /// <summary>An authored RawPath carrying a unitId keys its own per-unit host name.</summary>
     [Fact]
-    public void EquipmentTag_WithUnitId_ResolvesPerUnitHostName()
+    public async Task RawPath_WithUnitId_ResolvesPerUnitHostName()
     {
-        var drv = NewDriver();
+        const string rawPath = "cell/modbus/dev1/U7";
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16","unitId":7}""";
-        drv.ResolveHost(json).ShouldBe("10.0.0.1:502/unit7");
+        var drv = await NewDriverAsync(new RawTagEntry(rawPath, json, false));
+        drv.ResolveHost(rawPath).ShouldBe("10.0.0.1:502/unit7");
     }
 
-    /// <summary>An equipment ref without a unitId keys the driver-level unit host name.</summary>
+    /// <summary>An authored RawPath without a unitId keys the driver-level unit host name.</summary>
     [Fact]
-    public void EquipmentTag_WithoutUnitId_KeysDriverDefaultUnit()
+    public async Task RawPath_WithoutUnitId_KeysDriverDefaultUnit()
     {
-        var drv = NewDriver();
+        const string rawPath = "cell/modbus/dev1/U0";
         var json = """{"region":"HoldingRegisters","address":0,"dataType":"Int16"}""";
-        drv.ResolveHost(json).ShouldBe("10.0.0.1:502/unit1");
+        var drv = await NewDriverAsync(new RawTagEntry(rawPath, json, false));
+        drv.ResolveHost(rawPath).ShouldBe("10.0.0.1:502/unit1");
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientDriverFactoryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientDriverFactoryTests.cs
index 27a4df15..1c6d2571 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientDriverFactoryTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientDriverFactoryTests.cs
@@ -33,4 +33,46 @@ public class OpcUaClientDriverFactoryTests
     public void CreateInstance_throws_on_null_json_deserialisation()
         => Should.Throw<System.InvalidOperationException>(
             () => OpcUaClientDriverFactoryExtensions.CreateInstance("drv-1", "null", NullLoggerFactory.Instance));
+
+    private const string RawTagsConfig =
+        """
+        {
+          "EndpointUrl": "opc.tcp://host:4840",
+          "RawTags": [
+            { "rawPath": "Plant/Line1/Temp", "tagConfig": "{\"nodeId\":\"ns=2;s=Temperature\"}", "writeIdempotent": false },
+            { "rawPath": "Plant/Line1/Speed", "tagConfig": "{\"nodeId\":\"ns=2;s=Speed\"}", "writeIdempotent": true }
+          ]
+        }
+        """;
+
+    /// <summary>
+    ///     Verifies the v3 authored <c>RawTags</c> (RawPath + TagConfig blob + WriteIdempotent) bind
+    ///     through the DriverConfig deserialiser directly onto <see cref="OpcUaClientDriverOptions"/> —
+    ///     the OpcUaClient driver has no separate DTO, so the factory's direct-into-options path must
+    ///     populate the RawPath resolution list.
+    /// </summary>
+    [Fact]
+    public void CreateInstance_binds_rawtags_from_driverconfig()
+    {
+        var driver = OpcUaClientDriverFactoryExtensions.CreateInstance("drv-raw", RawTagsConfig, NullLoggerFactory.Instance);
+        // The factory succeeds and identity is intact — the deserialiser tolerated + bound the RawTags array.
+        driver.DriverType.ShouldBe("OpcUaClient");
+        driver.DriverInstanceId.ShouldBe("drv-raw");
+
+        // Assert the actual binding: deserialise the same DriverConfig into public options with the
+        // factory's serialiser settings (case-insensitive + string enums) and confirm RawTags populated.
+        var opts = System.Text.Json.JsonSerializer.Deserialize<OpcUaClientDriverOptions>(
+            RawTagsConfig,
+            new System.Text.Json.JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+                Converters = { new System.Text.Json.Serialization.JsonStringEnumConverter() },
+            });
+        opts.ShouldNotBeNull();
+        opts!.RawTags.Count.ShouldBe(2);
+        opts.RawTags[0].RawPath.ShouldBe("Plant/Line1/Temp");
+        opts.RawTags[0].TagConfig.ShouldContain("ns=2;s=Temperature");
+        opts.RawTags[0].WriteIdempotent.ShouldBeFalse();
+        opts.RawTags[1].WriteIdempotent.ShouldBeTrue();
+    }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientNamespaceTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientNamespaceTests.cs
index 54163151..5ecabe44 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientNamespaceTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientNamespaceTests.cs
@@ -1,6 +1,7 @@
 using Opc.Ua;
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests;
 
@@ -130,6 +131,83 @@ public sealed class OpcUaClientNamespaceTests
         NamespaceMap.TryResolve(null!, "ns=1;s=X", out _).ShouldBeFalse();
     }
 
+    // ---- v3: RawPath → upstream node id resolution table ----
+
+    /// <summary>Verifies a RawPath resolves to the upstream node id authored in its TagConfig.nodeId.</summary>
+    [Fact]
+    public void RawPath_resolves_to_upstream_nodeId_from_tagconfig()
+    {
+        var map = RawMap(
+            new RawTagEntry("Plant/Line1/Temp", """{"nodeId":"nsu=urn:remote:server;s=Temperature"}""", WriteIdempotent: false),
+            new RawTagEntry("Plant/Line1/Speed", """{"nodeId":"ns=2;s=Speed"}""", WriteIdempotent: true));
+
+        map.RawTagCount.ShouldBe(2);
+        map.TryResolve("Plant/Line1/Temp", out var temp).ShouldBeTrue();
+        temp.ShouldBe("nsu=urn:remote:server;s=Temperature");
+        map.TryResolve("Plant/Line1/Speed", out var speed).ShouldBeTrue();
+        speed.ShouldBe("ns=2;s=Speed");
+    }
+
+    /// <summary>Verifies an unknown RawPath and a blank RawPath both fail resolution.</summary>
+    [Fact]
+    public void RawPath_unknown_or_blank_fails_resolution()
+    {
+        var map = RawMap(new RawTagEntry("Plant/Line1/Temp", """{"nodeId":"ns=2;s=Temperature"}""", WriteIdempotent: false));
+        map.TryResolve("Plant/Line1/Missing", out var missing).ShouldBeFalse();
+        missing.ShouldBe(string.Empty);
+        map.TryResolve("   ", out _).ShouldBeFalse();
+    }
+
+    /// <summary>Verifies WriteIdempotent is threaded onto the table from the RawTagEntry, not the blob.</summary>
+    [Fact]
+    public void RawPath_binding_threads_writeidempotent_flag()
+    {
+        var map = RawMap(
+            new RawTagEntry("Plant/A", """{"nodeId":"ns=2;s=A"}""", WriteIdempotent: true),
+            new RawTagEntry("Plant/B", """{"nodeId":"ns=2;s=B"}""", WriteIdempotent: false));
+
+        map.TryGetBinding("Plant/A", out var a).ShouldBeTrue();
+        a.NodeId.ShouldBe("ns=2;s=A");
+        a.WriteIdempotent.ShouldBeTrue();
+        map.TryGetBinding("Plant/B", out var b).ShouldBeTrue();
+        b.WriteIdempotent.ShouldBeFalse();
+    }
+
+    /// <summary>Verifies an entry whose TagConfig lacks a usable nodeId is skipped (not registered).</summary>
+    [Fact]
+    public void RawPath_entry_without_nodeId_is_skipped()
+    {
+        var map = RawMap(
+            new RawTagEntry("Plant/Good", """{"nodeId":"ns=2;s=Good"}""", WriteIdempotent: false),
+            new RawTagEntry("Plant/NoNode", """{"other":"value"}""", WriteIdempotent: false),
+            new RawTagEntry("Plant/Blank", """{"nodeId":"  "}""", WriteIdempotent: false),
+            new RawTagEntry("Plant/Garbage", "not json", WriteIdempotent: false));
+
+        map.RawTagCount.ShouldBe(1);
+        map.TryResolve("Plant/Good", out _).ShouldBeTrue();
+        map.TryResolve("Plant/NoNode", out _).ShouldBeFalse();
+        map.TryResolve("Plant/Blank", out _).ShouldBeFalse();
+        map.TryResolve("Plant/Garbage", out _).ShouldBeFalse();
+    }
+
+    /// <summary>Verifies a PascalCase "NodeId" key is accepted (legacy tolerance).</summary>
+    [Fact]
+    public void RawPath_accepts_legacy_pascalcase_nodeid_key()
+    {
+        var map = RawMap(new RawTagEntry("Plant/Legacy", """{"NodeId":"ns=2;s=Legacy"}""", WriteIdempotent: false));
+        map.TryResolve("Plant/Legacy", out var nid).ShouldBeTrue();
+        nid.ShouldBe("ns=2;s=Legacy");
+    }
+
+    /// <summary>Verifies a map built without raw tags has an empty resolution table.</summary>
+    [Fact]
+    public void Map_without_rawtags_has_empty_resolution_table()
+    {
+        var map = TestMap("http://opcfoundation.org/UA/", "urn:remote:server");
+        map.RawTagCount.ShouldBe(0);
+        map.TryResolve("anything", out _).ShouldBeFalse();
+    }
+
     /// <summary>
     ///     Build a <see cref="NamespaceMap"/> directly from a URI table, mirroring what
     ///     <see cref="NamespaceMap.FromSession"/> snapshots — lets the encoding be tested
@@ -147,4 +225,8 @@ public sealed class OpcUaClientNamespaceTests
         }
         return NamespaceMap.FromTable(table);
     }
+
+    /// <summary>Build a <see cref="NamespaceMap"/> carrying only the v3 RawPath table (core URI table).</summary>
+    private static NamespaceMap RawMap(params RawTagEntry[] rawTags) =>
+        NamespaceMap.FromTable(new NamespaceTable(), rawTags);
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientStaleSessionRaceTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientStaleSessionRaceTests.cs
index 89bbe95c..23dc9ac1 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientStaleSessionRaceTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/OpcUaClientStaleSessionRaceTests.cs
@@ -110,7 +110,15 @@ public sealed class OpcUaClientStaleSessionRaceTests
     public async Task ReadRawAsync_uses_session_swapped_in_across_the_gate_not_the_captured_one()
     {
         var ct = TestContext.Current.CancellationToken;
-        using var drv = new OpcUaClientDriver(new OpcUaClientDriverOptions(), "opcua-stale-raw");
+        // v3: a HistoryRead over a variable is keyed by the tag's RawPath, resolved through the
+        // authored RawTags table to its upstream node id. Author "ns=2;s=Counter" as both the
+        // RawPath and the TagConfig.nodeId so the two-stage resolve reaches the wire.
+        var options = new OpcUaClientDriverOptions
+        {
+            RawTags = [new RawTagEntry("ns=2;s=Counter", """{"nodeId":"ns=2;s=Counter"}""", WriteIdempotent: false)],
+        };
+        using var drv = new OpcUaClientDriver(options, "opcua-stale-raw");
+        drv.SetNamespaceMapForTest(NamespaceMap.FromTable(new NamespaceTable(), options.RawTags));
 
         var prologueReached = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var oldSession = NewSessionMock(prologueReached);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7RawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7RawTags.cs
new file mode 100644
index 00000000..aba103da
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7RawTags.cs
@@ -0,0 +1,29 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="S7TagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob), and the
+///     driver rebuilds the typed definitions via <see cref="S7TagDefinitionFactory"/>. These integration
+///     profiles keep expressing their intent as typed definitions; this helper serialises each back to its
+///     TagConfig blob (via <see cref="S7TagDefinitionFactory.ToTagConfig"/>) and packages it as a
+///     <see cref="RawTagEntry"/> whose RawPath is the def's <c>Name</c> — so the round-trip through the real
+///     mapper reproduces the same definition the profile authored, keyed by the same name the
+///     read/write/subscribe call sites use. Mirrors the unit-test project's helper of the same name.
+/// </summary>
+internal static class S7RawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(S7TagDefinition def)
+        => new(def.Name, S7TagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params S7TagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7_1500/S7_1500Profile.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7_1500/S7_1500Profile.cs
index c329e472..f840686e 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7_1500/S7_1500Profile.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/S7_1500/S7_1500Profile.cs
@@ -41,14 +41,12 @@ public static class S7_1500Profile
         // gate, injecting flakiness that has nothing to do with the code
         // under test.
         Probe = new S7ProbeOptions { Enabled = false },
-        Tags =
-        [
+        RawTags = S7RawTags.Entries(
             new S7TagDefinition(ProbeTag,     "DB1.DBW0",  S7DataType.UInt16),
             new S7TagDefinition(SmokeI16Tag,  "DB1.DBW10", S7DataType.Int16),
             new S7TagDefinition(SmokeI32Tag,  "DB1.DBD20", S7DataType.Int32),
             new S7TagDefinition(SmokeF32Tag,  "DB1.DBD30", S7DataType.Float32),
             new S7TagDefinition(SmokeBoolTag, "DB1.DBX50.3", S7DataType.Bool),
-            new S7TagDefinition(WriteScratchTag, "DB1.DBW100", S7DataType.UInt16),
-        ],
+            new S7TagDefinition(WriteScratchTag, "DB1.DBW100", S7DataType.UInt16)),
     };
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7ArrayReadTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7ArrayReadTests.cs
index 7e54b178..a98ebe44 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7ArrayReadTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7ArrayReadTests.cs
@@ -180,13 +180,15 @@ public sealed class S7ArrayReadTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags =
-            [
-                new("Scalar", "DB1.DBW0", S7DataType.Int16),
-                new("Arr", "DB1.DBW10", S7DataType.Int16, ArrayCount: 8),
-            ],
+            Probe = new S7ProbeOptions { Enabled = false },
+            // Array tags are read-only this phase (writable arrays are rejected by the init guard).
+            RawTags = S7RawTags.Entries(
+                new S7TagDefinition("Scalar", "DB1.DBW0", S7DataType.Int16),
+                new S7TagDefinition("Arr", "DB1.DBW10", S7DataType.Int16, Writable: false, ArrayCount: 8)),
         };
-        using var drv = new S7Driver(opts, "s7-arr-disco");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-arr-disco", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
@@ -209,9 +211,12 @@ public sealed class S7ArrayReadTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags = [new("One", "DB1.DBW0", S7DataType.Int16, ArrayCount: 1)],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(new S7TagDefinition("One", "DB1.DBW0", S7DataType.Int16, Writable: false, ArrayCount: 1)),
         };
-        using var drv = new S7Driver(opts, "s7-arr-one");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-arr-one", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
@@ -228,9 +233,12 @@ public sealed class S7ArrayReadTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags = [new("Scalar", "DB1.DBW0", S7DataType.Int16, ArrayCount: null)],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Scalar", "DB1.DBW0", S7DataType.Int16, ArrayCount: null)),
         };
-        using var drv = new S7Driver(opts, "s7-arr-null");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-arr-null", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
@@ -253,32 +261,33 @@ public sealed class S7ArrayReadTests
         arr[0].ShouldBe((short)100);
     }
 
-    // ── Equipment-tag resolver threads arrayLength → ArrayCount ───────────────────────────
+    // ── Tag-definition factory threads arrayLength → ArrayCount ───────────────────────────
 
-    /// <summary>Verifies the equipment-tag parser threads isArray/arrayLength into ArrayCount.</summary>
+    /// <summary>Verifies the tag-definition factory threads isArray/arrayLength into ArrayCount.</summary>
     [Fact]
-    public void EquipmentTagParser_threads_array_length_into_ArrayCount()
+    public void TagDefinitionFactory_threads_array_length_into_ArrayCount()
     {
         var json = """{"address":"DB1.DBW0","dataType":"Int16","isArray":true,"arrayLength":16}""";
-        S7EquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.ArrayCount.ShouldBe(16);
+        S7TagDefinitionFactory.FromTagConfig(json, "line/eq/arr", out var def).ShouldBeTrue();
+        def!.Name.ShouldBe("line/eq/arr", "the definition's identity is the RawPath");
+        def.ArrayCount.ShouldBe(16);
     }
 
     /// <summary>Verifies arrayLength is ignored when isArray is false (mirrors the sink foundation).</summary>
     [Fact]
-    public void EquipmentTagParser_ignores_arrayLength_when_isArray_false()
+    public void TagDefinitionFactory_ignores_arrayLength_when_isArray_false()
     {
         var json = """{"address":"DB1.DBW0","dataType":"Int16","isArray":false,"arrayLength":16}""";
-        S7EquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        S7TagDefinitionFactory.FromTagConfig(json, "line/eq/arr", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBeNull("arrayLength is honoured only when isArray is true");
     }
 
-    /// <summary>Verifies a scalar equipment tag (no array keys) has a null ArrayCount.</summary>
+    /// <summary>Verifies a scalar tag config (no array keys) has a null ArrayCount.</summary>
     [Fact]
-    public void EquipmentTagParser_scalar_has_null_ArrayCount()
+    public void TagDefinitionFactory_scalar_has_null_ArrayCount()
     {
         var json = """{"address":"DB1.DBW0","dataType":"Int16"}""";
-        S7EquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        S7TagDefinitionFactory.FromTagConfig(json, "line/eq/scalar", out var def).ShouldBeTrue();
         def!.ArrayCount.ShouldBeNull();
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DiscoveryAndSubscribeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DiscoveryAndSubscribeTests.cs
index c3195036..08edb602 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DiscoveryAndSubscribeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DiscoveryAndSubscribeTests.cs
@@ -22,14 +22,16 @@ public sealed class S7DiscoveryAndSubscribeTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags =
-            [
-                new("TempSetpoint", "DB1.DBW0", S7DataType.Int16, Writable: true),
-                new("FaultBit", "M0.0", S7DataType.Bool, Writable: false),
-                new("PIDOutput", "DB5.DBD12", S7DataType.Float32, Writable: true),
-            ],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(
+                new S7TagDefinition("TempSetpoint", "DB1.DBW0", S7DataType.Int16, Writable: true),
+                new S7TagDefinition("FaultBit", "M0.0", S7DataType.Bool, Writable: false),
+                new S7TagDefinition("PIDOutput", "DB5.DBD12", S7DataType.Float32, Writable: true)),
         };
-        using var drv = new S7Driver(opts, "s7-disco");
+        // v3: DiscoverAsync projects the RawPath → definition table, which is built at Initialize —
+        // so the driver must be initialized (with a connecting fake PLC) before Discover.
+        using var drv = new S7Driver(opts, "s7-disco", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
@@ -49,13 +51,14 @@ public sealed class S7DiscoveryAndSubscribeTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags =
-            [
-                new("SetPoint", "DB1.DBW0", S7DataType.Int16, WriteIdempotent: true),
-                new("StartBit", "M0.0", S7DataType.Bool),
-            ],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(
+                new S7TagDefinition("SetPoint", "DB1.DBW0", S7DataType.Int16, WriteIdempotent: true),
+                new S7TagDefinition("StartBit", "M0.0", S7DataType.Bool)),
         };
-        using var drv = new S7Driver(opts, "s7-idem");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-idem", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests.cs
index 085a1281..9c1c3a8a 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests.cs
@@ -34,7 +34,7 @@ public sealed class S7DriverCodeReviewFixTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Quirk", address, S7DataType.Int16)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Quirk", address, S7DataType.Int16)),
         };
         using var drv = new S7Driver(opts, "s7-tc");
 
@@ -58,11 +58,9 @@ public sealed class S7DriverCodeReviewFixTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags =
-            [
+            RawTags = S7RawTags.Entries(
                 new S7TagDefinition("Word", "DB1.DBW0", S7DataType.Int16),
-                new S7TagDefinition("Bit", "M0.0", S7DataType.Bool),
-            ],
+                new S7TagDefinition("Bit", "M0.0", S7DataType.Bool)),
         };
         using var drv = new S7Driver(opts, "s7-ok");
 
@@ -111,7 +109,7 @@ public sealed class S7DriverCodeReviewFixTests
 
         const string json = """
             { "Host": "192.0.2.1", "TimeoutMs": 250,
-              "Tags": [ { "Name": "TimerTag", "Address": "T5", "DataType": "Int16" } ] }
+              "RawTags": [ { "RawPath": "TimerTag", "TagConfig": "{\"address\":\"T5\",\"dataType\":\"Int16\"}", "WriteIdempotent": false } ] }
             """;
 
         var ex = await Should.ThrowAsync<NotSupportedException>(async () =>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests2.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests2.cs
index 647b13e1..75731de5 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests2.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverCodeReviewFixTests2.cs
@@ -165,7 +165,7 @@ public sealed class S7DriverCodeReviewFixTests2
             // DB1.DBD0 is a DWord (non-byte) address — guard-(b) must fault on the address shape
             // for a wide type. (At a byte address like DB1.DBB0 the 8-byte numerics round-trip;
             // see S7ScalarBlockTests.)
-            Tags = [new S7TagDefinition("X", "DB1.DBD0", dt)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("X", "DB1.DBD0", dt)),
         };
         using var drv = new S7Driver(opts, $"s7-wide-nonbyte-{dt}");
 
@@ -197,7 +197,7 @@ public sealed class S7DriverCodeReviewFixTests2
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("X", addr, dt)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("X", addr, dt)),
         };
         using var drv = new S7Driver(opts, $"s7-good-dt-{dt}");
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReadWriteTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReadWriteTests.cs
index 8a22b779..9f59d91c 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReadWriteTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReadWriteTests.cs
@@ -24,7 +24,7 @@ public sealed class S7DriverReadWriteTests
         {
             Host = "192.0.2.1", // reserved — will never complete TCP handshake
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("BadTag", "NOT-AN-S7-ADDRESS", S7DataType.Int16)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("BadTag", "NOT-AN-S7-ADDRESS", S7DataType.Int16)),
         };
         using var drv = new S7Driver(opts, "s7-bad-tag");
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReconnectTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReconnectTests.cs
index 989d5f22..6fdabdfa 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReconnectTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverReconnectTests.cs
@@ -22,7 +22,7 @@ public sealed class S7DriverReconnectTests
         // Probe off — these tests drive reconnect through the read path deterministically; a
         // background probe would race the created-connection assertions.
         Probe = new S7ProbeOptions { Enabled = false },
-        Tags = [new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)],
+        RawTags = S7RawTags.Entries(new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)),
     };
 
     /// <summary>
@@ -265,7 +265,7 @@ public sealed class S7DriverReconnectTests
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromSeconds(5), // long, so the CALLER token fires first, not the internal timeout
             Probe = new S7ProbeOptions { Enabled = false },
-            Tags = [new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)),
         };
         var factory = new FakeS7PlcFactory();
         using var drv = new S7Driver(opts, "s7-caller-cancel", factory);
@@ -367,7 +367,7 @@ public sealed class S7DriverReconnectTests
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
             Probe = new S7ProbeOptions { Enabled = false },
-            Tags = [new S7TagDefinition("WW0", "DB1.DBW0", S7DataType.UInt16, Writable: true)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("WW0", "DB1.DBW0", S7DataType.UInt16, Writable: true)),
         };
         var factory = new FakeS7PlcFactory();
         using var drv = new S7Driver(opts, "s7-cancel-write", factory);
@@ -448,7 +448,7 @@ public sealed class S7DriverReconnectTests
             Interval = TimeSpan.FromMilliseconds(50),
             Timeout = TimeSpan.FromMilliseconds(250),
         },
-        Tags = [new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)],
+        RawTags = S7RawTags.Entries(new S7TagDefinition("W0", "DB1.DBW0", S7DataType.UInt16, Writable: false)),
     };
 
     /// <summary>Polls <paramref name="condition"/> until it holds or <paramref name="timeout"/> elapses (returns either way).</summary>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverScaffoldTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverScaffoldTests.cs
index 92a0f4ae..02a42a86 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverScaffoldTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7DriverScaffoldTests.cs
@@ -85,7 +85,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("LReal", "DB1.DBB0", S7DataType.Float64)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("LReal", "DB1.DBB0", S7DataType.Float64)),
         };
         using var drv = new S7Driver(opts, "s7-wide-ok");
 
@@ -105,7 +105,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Batch64", "DB1.DBB0", S7DataType.Int64, ArrayCount: 4)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Batch64", "DB1.DBB0", S7DataType.Int64, ArrayCount: 4)),
         };
         using var drv = new S7Driver(opts, "s7-wide-array");
 
@@ -125,7 +125,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("WideWord", "DB1.DBW0", S7DataType.Float64)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("WideWord", "DB1.DBW0", S7DataType.Float64)),
         };
         using var drv = new S7Driver(opts, "s7-wide-nonbyte");
 
@@ -145,7 +145,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Timer5", "T5", S7DataType.Int32)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Timer5", "T5", S7DataType.Int32)),
         };
         using var drv = new S7Driver(opts, "s7-timer-bad");
 
@@ -165,7 +165,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Counter3", "C3", S7DataType.Float32)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Counter3", "C3", S7DataType.Float32)),
         };
         using var drv = new S7Driver(opts, "s7-counter-bad");
 
@@ -192,7 +192,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Timer5", "T5", S7DataType.Float64, Writable: true)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Timer5", "T5", S7DataType.Float64, Writable: true)),
         };
         using var drv = new S7Driver(opts, "s7-timer-writable");
 
@@ -213,7 +213,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("Counter3", "C3", S7DataType.Int32, Writable: true)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Counter3", "C3", S7DataType.Int32, Writable: true)),
         };
         using var drv = new S7Driver(opts, "s7-counter-writable");
 
@@ -250,7 +250,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("ArrTag", addr, dt, Writable: true, ArrayCount: count)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("ArrTag", addr, dt, Writable: true, ArrayCount: count)),
         };
         using var drv = new S7Driver(opts, $"s7-writable-arr-{dt}");
 
@@ -272,7 +272,7 @@ public sealed class S7DriverScaffoldTests
         {
             Host = "192.0.2.1",
             Timeout = TimeSpan.FromMilliseconds(250),
-            Tags = [new S7TagDefinition("ReadArr", "DB1.DBW0", S7DataType.Int16, Writable: false, ArrayCount: 4)],
+            RawTags = S7RawTags.Entries(new S7TagDefinition("ReadArr", "DB1.DBW0", S7DataType.Int16, Writable: false, ArrayCount: 4)),
         };
         using var drv = new S7Driver(opts, "s7-readonly-arr");
 
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagParserStrictnessTests.cs
deleted file mode 100644
index 83f1d7ff..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagParserStrictnessTests.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.S7;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
-
-/// <summary>R2-11 Phase C strictness surface for the S7 equipment-tag parser: the runtime is now STRICT — a
-/// typo'd <c>dataType</c> rejects the tag (<c>TryParse</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
-/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true).</summary>
-public sealed class S7EquipmentTagParserStrictnessTests
-{
-    [Fact]
-    public void Typo_dataType_rejects_the_tag()
-    {
-        S7EquipmentTagParser.TryParse("{\"address\":\"DB1.DBW0\",\"dataType\":\"Intt16\"}", out _)
-            .ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Valid_dataType_still_parses()
-    {
-        S7EquipmentTagParser.TryParse("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}", out var def)
-            .ShouldBeTrue();
-        def.DataType.ShouldBe(S7DataType.Int16);
-    }
-
-    [Fact]
-    public void Inspect_reports_typo_dataType()
-    {
-        var warnings = S7EquipmentTagParser.Inspect("{\"address\":\"DB1.DBW0\",\"dataType\":\"Intt16\"}");
-        warnings.ShouldHaveSingleItem();
-        warnings[0].ShouldContain("Intt16");
-        warnings[0].ShouldContain("dataType");
-    }
-
-    [Fact]
-    public void Inspect_clean_config_has_no_warnings()
-    {
-        S7EquipmentTagParser.Inspect("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}").ShouldBeEmpty();
-    }
-
-    [Fact]
-    public void Writable_false_is_honoured()
-    {
-        S7EquipmentTagParser.TryParse("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\",\"writable\":false}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Writable_absent_defaults_to_true()
-    {
-        S7EquipmentTagParser.TryParse("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeTrue();
-    }
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagTests.cs
deleted file mode 100644
index 06074506..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7EquipmentTagTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Shouldly;
-using Xunit;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
-
-[Trait("Category", "Unit")]
-public class S7EquipmentTagTests
-{
-    [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
-    {
-        var json = """{"address":"DB1.DBW0","dataType":"UInt16","stringLength":0}""";
-        S7EquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
-        def.Address.ShouldBe("DB1.DBW0");
-        def.DataType.ShouldBe(S7DataType.UInt16);
-    }
-
-    [Fact]
-    public void Rejects_a_non_address_blob()
-        => S7EquipmentTagParser.TryParse("""{"FullName":"x"}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_garbage()
-        => S7EquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_address_as_a_json_number()
-        => S7EquipmentTagParser.TryParse(
-            """{"address":40001,"dataType":"UInt16"}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_string_length_out_of_range()
-        => S7EquipmentTagParser.TryParse(
-            """{"address":"DB1.DBW0","dataType":"String","stringLength":300}""", out _).ShouldBeFalse();
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7PollEngineMigrationTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7PollEngineMigrationTests.cs
index f3e6d8fc..9da4db9d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7PollEngineMigrationTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7PollEngineMigrationTests.cs
@@ -58,7 +58,7 @@ public sealed class S7PollEngineMigrationTests
         Host = "192.0.2.1",
         Timeout = TimeSpan.FromMilliseconds(250),
         Probe = new S7ProbeOptions { Enabled = false },
-        Tags = [new S7TagDefinition("Arr", "DB1.DBW0", S7DataType.UInt16, Writable: false, ArrayCount: 3)],
+        RawTags = S7RawTags.Entries(new S7TagDefinition("Arr", "DB1.DBW0", S7DataType.UInt16, Writable: false, ArrayCount: 3)),
     };
 
     /// <summary>
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7RawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7RawTags.cs
new file mode 100644
index 00000000..54d9daa1
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7RawTags.cs
@@ -0,0 +1,28 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="S7TagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob), and the
+///     driver rebuilds the typed definitions via <see cref="S7TagDefinitionFactory"/>. These tests keep
+///     expressing their intent as typed definitions; this helper serialises each back to its TagConfig blob
+///     (via <see cref="S7TagDefinitionFactory.ToTagConfig"/>) and packages it as a <see cref="RawTagEntry"/>
+///     whose RawPath is the def's <c>Name</c> — so the round-trip through the real mapper reproduces the same
+///     definition the test authored, keyed by the same name the read/write/subscribe call sites use.
+/// </summary>
+internal static class S7RawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/> (RawPath = def.Name).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(S7TagDefinition def)
+        => new(def.Name, S7TagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params S7TagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryStrictnessTests.cs
new file mode 100644
index 00000000..787e4b62
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryStrictnessTests.cs
@@ -0,0 +1,58 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Driver.S7;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
+
+/// <summary>R2-11 Phase C strictness surface for the S7 tag-definition factory: the runtime is STRICT — a
+/// typo'd <c>dataType</c> rejects the tag (<c>FromTagConfig</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
+/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true).</summary>
+public sealed class S7TagDefinitionFactoryStrictnessTests
+{
+    [Fact]
+    public void Typo_dataType_rejects_the_tag()
+    {
+        S7TagDefinitionFactory.FromTagConfig("{\"address\":\"DB1.DBW0\",\"dataType\":\"Intt16\"}", "p", out _)
+            .ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Valid_dataType_still_parses()
+    {
+        S7TagDefinitionFactory.FromTagConfig("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}", "line/eq/t", out var def)
+            .ShouldBeTrue();
+        def!.Name.ShouldBe("line/eq/t");
+        def.DataType.ShouldBe(S7DataType.Int16);
+    }
+
+    [Fact]
+    public void Inspect_reports_typo_dataType()
+    {
+        var warnings = S7TagDefinitionFactory.Inspect("{\"address\":\"DB1.DBW0\",\"dataType\":\"Intt16\"}");
+        warnings.ShouldHaveSingleItem();
+        warnings[0].ShouldContain("Intt16");
+        warnings[0].ShouldContain("dataType");
+    }
+
+    [Fact]
+    public void Inspect_clean_config_has_no_warnings()
+    {
+        S7TagDefinitionFactory.Inspect("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}").ShouldBeEmpty();
+    }
+
+    [Fact]
+    public void Writable_false_is_honoured()
+    {
+        S7TagDefinitionFactory.FromTagConfig("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\",\"writable\":false}", "p", out var def)
+            .ShouldBeTrue();
+        def!.Writable.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Writable_absent_defaults_to_true()
+    {
+        S7TagDefinitionFactory.FromTagConfig("{\"address\":\"DB1.DBW0\",\"dataType\":\"Int16\"}", "p", out var def)
+            .ShouldBeTrue();
+        def!.Writable.ShouldBeTrue();
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryTests.cs
new file mode 100644
index 00000000..6569c4a1
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TagDefinitionFactoryTests.cs
@@ -0,0 +1,68 @@
+using Shouldly;
+using Xunit;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
+
+[Trait("Category", "Unit")]
+public class S7TagDefinitionFactoryTests
+{
+    [Fact]
+    public void Maps_tagconfig_into_a_definition_keyed_by_rawpath()
+    {
+        var json = """{"address":"DB1.DBW0","dataType":"UInt16","stringLength":0}""";
+        S7TagDefinitionFactory.FromTagConfig(json, "line/eq/tag", out var def).ShouldBeTrue();
+        def!.Name.ShouldBe("line/eq/tag", "the definition's identity is the RawPath, not the blob");
+        def.Address.ShouldBe("DB1.DBW0");
+        def.DataType.ShouldBe(S7DataType.UInt16);
+    }
+
+    [Fact]
+    public void Rejects_a_non_address_blob()
+        => S7TagDefinitionFactory.FromTagConfig("""{"FullName":"x"}""", "p", out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_garbage()
+        => S7TagDefinitionFactory.FromTagConfig("not json", "p", out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_empty_tagconfig()
+        => S7TagDefinitionFactory.FromTagConfig("", "p", out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_address_as_a_json_number()
+        => S7TagDefinitionFactory.FromTagConfig(
+            """{"address":40001,"dataType":"UInt16"}""", "p", out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_string_length_out_of_range()
+        => S7TagDefinitionFactory.FromTagConfig(
+            """{"address":"DB1.DBW0","dataType":"String","stringLength":300}""", "p", out _).ShouldBeFalse();
+
+    [Fact]
+    public void ToTagConfig_round_trips_through_FromTagConfig()
+    {
+        var original = new S7TagDefinition("line/eq/rt", "DB1.DBB0", S7DataType.String,
+            Writable: false, StringLength: 32, ArrayCount: null);
+        var blob = S7TagDefinitionFactory.ToTagConfig(original);
+
+        S7TagDefinitionFactory.FromTagConfig(blob, original.Name, out var round).ShouldBeTrue();
+        round!.Name.ShouldBe(original.Name);
+        round.Address.ShouldBe(original.Address);
+        round.DataType.ShouldBe(original.DataType);
+        round.Writable.ShouldBe(original.Writable);
+        round.StringLength.ShouldBe(original.StringLength);
+        round.ArrayCount.ShouldBe(original.ArrayCount);
+    }
+
+    [Fact]
+    public void ToTagConfig_round_trips_an_array_definition()
+    {
+        var original = new S7TagDefinition("line/eq/arr", "DB1.DBW0", S7DataType.Int16,
+            Writable: false, ArrayCount: 8);
+        var blob = S7TagDefinitionFactory.ToTagConfig(original);
+
+        S7TagDefinitionFactory.FromTagConfig(blob, original.Name, out var round).ShouldBeTrue();
+        round!.ArrayCount.ShouldBe(8);
+        round.DataType.ShouldBe(S7DataType.Int16);
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TestBuilders.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TestBuilders.cs
index 7fda1f8e..cb857905 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TestBuilders.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TestBuilders.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+using S7NetDataType = global::S7.Net.DataType;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Tests;
 
@@ -63,3 +64,42 @@ internal sealed class RecordingAddressSpaceBuilder : IAddressSpaceBuilder
             => throw new NotImplementedException("S7 driver never calls this — no alarm surfacing");
     }
 }
+
+/// <summary>
+///     Minimal <see cref="IS7PlcFactory"/> whose connection opens cleanly and answers the CPU-status
+///     probe, but serves no data. Used by the tests that need the driver <c>Initialize</c>d — which in
+///     v3 is what builds the RawPath → definition table <see cref="S7Driver.DiscoverAsync"/> projects —
+///     without a live PLC or wire I/O.
+/// </summary>
+internal sealed class ConnectingFakeS7PlcFactory : IS7PlcFactory
+{
+    /// <summary>Creates a fresh connecting fake connection.</summary>
+    public IS7Plc Create(S7CpuType cpuType, string host, int port, short rack, short slot, TimeSpan timeout)
+        => new ConnectingFakeS7Plc();
+
+    private sealed class ConnectingFakeS7Plc : IS7Plc
+    {
+        /// <summary>Gets a value indicating whether the fake connection is open.</summary>
+        public bool IsConnected { get; private set; }
+        /// <summary>Opens the fake connection.</summary>
+        public Task OpenAsync(CancellationToken ct) { IsConnected = true; return Task.CompletedTask; }
+        /// <summary>Closes the fake connection.</summary>
+        public void Close() => IsConnected = false;
+        /// <summary>Not exercised by these tests.</summary>
+        public Task<object?> ReadAsync(string address, CancellationToken ct)
+            => throw new NotSupportedException("ConnectingFakeS7Plc serves no data");
+        /// <summary>Not exercised by these tests.</summary>
+        public Task<byte[]> ReadBytesAsync(S7NetDataType area, int db, int startByteAdr, int count, CancellationToken ct)
+            => throw new NotSupportedException("ConnectingFakeS7Plc serves no data");
+        /// <summary>Not exercised by these tests.</summary>
+        public Task WriteAsync(string address, object value, CancellationToken ct)
+            => throw new NotSupportedException("ConnectingFakeS7Plc serves no data");
+        /// <summary>Not exercised by these tests.</summary>
+        public Task WriteBytesAsync(S7NetDataType area, int db, int startByteAdr, byte[] value, CancellationToken ct)
+            => throw new NotSupportedException("ConnectingFakeS7Plc serves no data");
+        /// <summary>Answers the CPU-status probe.</summary>
+        public Task ReadStatusAsync(CancellationToken ct) => Task.CompletedTask;
+        /// <summary>Disposes the fake connection.</summary>
+        public void Dispose() => IsConnected = false;
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TypeMappingTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TypeMappingTests.cs
index 85db687e..2bd0e103 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TypeMappingTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/S7TypeMappingTests.cs
@@ -206,9 +206,12 @@ public sealed class S7TypeMappingTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags = [new S7TagDefinition("Counter64", "DB1.DBB0", S7DataType.Int64)],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Counter64", "DB1.DBB0", S7DataType.Int64)),
         };
-        using var drv = new S7Driver(opts, "s7-i64-map");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-i64-map", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
@@ -224,9 +227,12 @@ public sealed class S7TypeMappingTests
         var opts = new S7DriverOptions
         {
             Host = "192.0.2.1",
-            Tags = [new S7TagDefinition("Total64", "DB1.DBB0", S7DataType.UInt64)],
+            Probe = new S7ProbeOptions { Enabled = false },
+            RawTags = S7RawTags.Entries(new S7TagDefinition("Total64", "DB1.DBB0", S7DataType.UInt64)),
         };
-        using var drv = new S7Driver(opts, "s7-u64-map");
+        // v3: DiscoverAsync projects the table built at Initialize — initialize with a fake PLC first.
+        using var drv = new S7Driver(opts, "s7-u64-map", new ConnectingFakeS7PlcFactory());
+        await drv.InitializeAsync("{}", TestContext.Current.CancellationToken);
 
         var builder = new RecordingAddressSpaceBuilder();
         await drv.DiscoverAsync(builder, TestContext.Current.CancellationToken);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs
index a5f46f30..f6510e01 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs
@@ -246,14 +246,12 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions($"ads://{sim.TargetNetId}:{sim.AmsPort}", "XAR-VM")],
-            Tags =
-            [
+            RawTags = TwinCATRawTags.Entries(
                 new TwinCATTagDefinition(
                     Name: "Primitive",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                     SymbolPath: symbolPath,
-                    DataType: type),
-            ],
+                    DataType: type)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new TwinCATProbeOptions { Enabled = false },
         };
@@ -307,8 +305,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions($"ads://{sim.TargetNetId}:{sim.AmsPort}", "XAR-VM")],
-            Tags =
-            [
+            RawTags = TwinCATRawTags.Entries(
                 new TwinCATTagDefinition(
                     Name: "WordBit3",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
@@ -318,8 +315,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                     Name: "WordBit4",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                     SymbolPath: "GVL_Primitives.vWord.4",
-                    DataType: TwinCATDataType.Bool),
-            ],
+                    DataType: TwinCATDataType.Bool)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new TwinCATProbeOptions { Enabled = false },
         };
@@ -345,8 +341,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions($"ads://{sim.TargetNetId}:{sim.AmsPort}", "XAR-VM")],
-            Tags =
-            [
+            RawTags = TwinCATRawTags.Entries(
                 new TwinCATTagDefinition(
                     Name: "MotorTemp",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
@@ -356,8 +351,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                     Name: "MotorRunning",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                     SymbolPath: "GVL_Plant.Line1.Stations[1].Axes[1].Motor.Running",
-                    DataType: TwinCATDataType.Bool),
-            ],
+                    DataType: TwinCATDataType.Bool)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new TwinCATProbeOptions { Enabled = false },
         };
@@ -386,8 +380,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions($"ads://{sim.TargetNetId}:{sim.AmsPort}", "XAR-VM")],
-            Tags =
-            [
+            RawTags = TwinCATRawTags.Entries(
                 new TwinCATTagDefinition(
                     Name: "NonexistentSymbol",
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
@@ -398,8 +391,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                     DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                     SymbolPath: "GVL_Fixture.nCounter",
                     DataType: TwinCATDataType.DInt,
-                    Writable: false),
-            ],
+                    Writable: false)),
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new TwinCATProbeOptions { Enabled = false },
         };
@@ -442,8 +434,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                 new TwinCATDeviceOptions(realHost,  "Real-VM"),
                 new TwinCATDeviceOptions(ghostHost, "Ghost-VM"),
             ],
-            Tags =
-            [
+            RawTags = TwinCATRawTags.Entries(
                 new TwinCATTagDefinition(
                     Name: "RealCounter",
                     DeviceHostAddress: realHost,
@@ -453,8 +444,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                     Name: "GhostCounter",
                     DeviceHostAddress: ghostHost,
                     SymbolPath: "GVL_Fixture.nCounter",
-                    DataType: TwinCATDataType.DInt),
-            ],
+                    DataType: TwinCATDataType.DInt)),
             // Shorter timeout so the bogus device fails fast rather than dragging the whole
             // test; the healthy read shouldn't be slowed down by a peer timeout.
             Timeout = TimeSpan.FromSeconds(2),
@@ -488,7 +478,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions($"ads://{sim.TargetNetId}:{sim.AmsPort}", "XAR-VM")],
-            Tags = [],
+            RawTags = [],
             Timeout = TimeSpan.FromSeconds(5),
             Probe = new TwinCATProbeOptions
             {
@@ -532,7 +522,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
         var options = new TwinCATDriverOptions
         {
             Devices = baseOptions.Devices,
-            Tags = baseOptions.Tags,
+            RawTags = baseOptions.RawTags,
             UseNativeNotifications = baseOptions.UseNativeNotifications,
             Timeout = baseOptions.Timeout,
             Probe = baseOptions.Probe,
@@ -565,7 +555,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                 HostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                 DeviceName: "XAR-VM"),
         ],
-        Tags = [
+        RawTags = TwinCATRawTags.Entries(
             new TwinCATTagDefinition(
                 Name: "Counter",
                 DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
@@ -582,8 +572,7 @@ public sealed class TwinCAT3SmokeTests(TwinCATXarFixture sim)
                 DeviceHostAddress: $"ads://{sim.TargetNetId}:{sim.AmsPort}",
                 SymbolPath: "GVL_Arrays.aReal1D[5]",
                 DataType: TwinCATDataType.Real,
-                Writable: true),
-        ],
+                Writable: true)),
         UseNativeNotifications = true,
         Timeout = TimeSpan.FromSeconds(5),
         // Disable the probe loop — the smoke tests run their own reads; a background
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATRawTags.cs
new file mode 100644
index 00000000..0e01eaa8
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATRawTags.cs
@@ -0,0 +1,32 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="TwinCATTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + owning
+///     DeviceName), and the driver rebuilds the typed definitions via <see cref="TwinCATTagDefinitionFactory"/>.
+///     These integration smoke tests keep expressing their intent as typed definitions; this helper serialises
+///     each back to its TagConfig blob (via <see cref="TwinCATTagDefinitionFactory.ToTagConfig"/>) and packages
+///     it as a <see cref="RawTagEntry"/> whose RawPath is the def's <c>Name</c> and whose
+///     <see cref="RawTagEntry.DeviceName"/> is the def's <c>DeviceHostAddress</c> — so the round-trip through
+///     the real mapper + the driver's device resolution (which matches DeviceName against the configured
+///     devices by host) reproduces the same definition + device routing the test authored, keyed by the same
+///     name the read/write/subscribe call sites use. Mirrors the unit-test project's helper of the same name.
+/// </summary>
+internal static class TwinCATRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/>
+    /// (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(TwinCATTagDefinition def)
+        => new(def.Name, TwinCATTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, def.DeviceHostAddress);
+
+    /// <summary>Serialises typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert (array, params, or a collection expression).</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(params TwinCATTagDefinition[] defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATArraySupportTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATArraySupportTests.cs
index bb63b7ef..342ca92b 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATArraySupportTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATArraySupportTests.cs
@@ -27,11 +27,11 @@ public sealed class TwinCATArraySupportTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags =
+            RawTags = TwinCATRawTags.Entries(
             [
                 new TwinCATTagDefinition("Speeds", Host, "MAIN.Speeds", TwinCATDataType.DInt,
                     Writable: true, WriteIdempotent: false, ArrayLength: 8),
-            ],
+            ]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             EnableControllerBrowse = false,
         }, "drv-1", new FakeTwinCATClientFactory());
@@ -52,7 +52,7 @@ public sealed class TwinCATArraySupportTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", new FakeTwinCATClientFactory());
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -104,12 +104,14 @@ public sealed class TwinCATArraySupportTests
 
     // ---- (2) read path: array read returns a typed CLR array ----
 
-    /// <summary>An equipment array tag reads a typed CLR array (boxed as object) through the driver.</summary>
+    private const string ArrayRawPath = "equip/Speeds";
+    private const string ScalarRawPath = "equip/Speed";
+
+    /// <summary>An array raw tag reads a typed CLR array (boxed as object) through the driver.</summary>
     [Fact]
-    public async Task Driver_reads_an_array_equipment_tag_as_typed_clr_array()
+    public async Task Driver_reads_an_array_raw_tag_as_typed_clr_array()
     {
-        var json =
-            $$"""{"deviceHostAddress":"{{Host}}","symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":4}""";
+        var blob = """{"symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":4}""";
         var expected = new[] { 10, 20, 30, 40 };
         var factory = new FakeTwinCATClientFactory
         {
@@ -118,12 +120,12 @@ public sealed class TwinCATArraySupportTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [],
+            RawTags = [new RawTagEntry(ArrayRawPath, blob, WriteIdempotent: false, DeviceName: Host)],
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "twincat-arr", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([ArrayRawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(TwinCATStatusMapper.Good);
         r[0].Value.ShouldBeOfType<int[]>().ShouldBe(expected);
@@ -131,11 +133,11 @@ public sealed class TwinCATArraySupportTests
         factory.Clients[0].LastReadArrayCount.ShouldBe(4);
     }
 
-    /// <summary>A scalar equipment tag reads with a null array count (scalar path unchanged).</summary>
+    /// <summary>A scalar raw tag reads with a null array count (scalar path unchanged).</summary>
     [Fact]
-    public async Task Driver_reads_a_scalar_equipment_tag_with_null_array_count()
+    public async Task Driver_reads_a_scalar_raw_tag_with_null_array_count()
     {
-        var json = $$"""{"deviceHostAddress":"{{Host}}","symbolPath":"MAIN.Speed","dataType":"DInt"}""";
+        var blob = """{"symbolPath":"MAIN.Speed","dataType":"DInt"}""";
         var factory = new FakeTwinCATClientFactory
         {
             Customise = () => new FakeTwinCATClient { Values = { ["MAIN.Speed"] = 7 } },
@@ -143,100 +145,83 @@ public sealed class TwinCATArraySupportTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [],
+            RawTags = [new RawTagEntry(ScalarRawPath, blob, WriteIdempotent: false, DeviceName: Host)],
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "twincat-scalar", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
 
-        var r = await drv.ReadAsync([json], CancellationToken.None);
+        var r = await drv.ReadAsync([ScalarRawPath], CancellationToken.None);
 
         r[0].StatusCode.ShouldBe(TwinCATStatusMapper.Good);
         r[0].Value.ShouldBe(7);
         factory.Clients[0].LastReadArrayCount.ShouldBeNull();
     }
 
-    // ---- (3) resolver: equipment-tag parser threads arrayLength ----
+    // ---- (3) mapper: FromTagConfig threads arrayLength ----
 
-    /// <summary>The equipment-tag parser threads <c>arrayLength</c> into the transient definition.</summary>
+    /// <summary>The tag-definition factory threads <c>arrayLength</c> into the definition.</summary>
     [Fact]
-    public void Parser_threads_arrayLength_into_the_definition()
+    public void FromTagConfig_threads_arrayLength_into_the_definition()
     {
-        var json =
-            """{"deviceHostAddress":"ads://5.23.91.23.1.1:851","symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":12}""";
-        TwinCATEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
+        var blob = """{"symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":12}""";
+        TwinCATTagDefinitionFactory.FromTagConfig(blob, ArrayRawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBe(12);
     }
 
     /// <summary>A blob without isArray (or with isArray=false) leaves ArrayLength null.</summary>
     [Fact]
-    public void Parser_leaves_ArrayLength_null_for_a_scalar_blob()
+    public void FromTagConfig_leaves_ArrayLength_null_for_a_scalar_blob()
     {
-        TwinCATEquipmentTagParser.TryParse(
-            """{"symbolPath":"MAIN.X","dataType":"DInt"}""", out var def).ShouldBeTrue();
+        TwinCATTagDefinitionFactory.FromTagConfig(
+            """{"symbolPath":"MAIN.X","dataType":"DInt"}""", ScalarRawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
     /// <summary>arrayLength is ignored when isArray is absent/false (no orphan length).</summary>
     [Fact]
-    public void Parser_ignores_arrayLength_when_isArray_is_false()
+    public void FromTagConfig_ignores_arrayLength_when_isArray_is_false()
     {
-        TwinCATEquipmentTagParser.TryParse(
+        TwinCATTagDefinitionFactory.FromTagConfig(
             """{"symbolPath":"MAIN.X","dataType":"DInt","isArray":false,"arrayLength":9}""",
-            out var def).ShouldBeTrue();
+            ScalarRawPath, out var def).ShouldBeTrue();
         def!.ArrayLength.ShouldBeNull();
     }
 
-    // ---- (4) Driver.TwinCAT-017 — pre-declared array tag parseable via driver config JSON ----
+    // ---- (4) Driver.TwinCAT-017 — array raw tag delivered via driver config JSON rawTags ----
 
     /// <summary>
-    ///     A pre-declared tag in the driver config JSON with <c>arrayLength</c> must produce a
+    ///     An array raw tag in the driver config JSON <c>rawTags</c> array must bind + map to a
     ///     <see cref="TwinCATTagDefinition"/> with the correct <see cref="TwinCATTagDefinition.ArrayLength"/>,
     ///     which in turn drives <c>IsArray</c>/<c>ArrayDim</c> at discovery and a native array read
     ///     at runtime (Driver.TwinCAT-017).
     /// </summary>
     [Fact]
-    public void Predeclared_array_tag_arrayLength_parses_from_driver_config_json()
+    public void Array_raw_tag_arrayLength_binds_from_driver_config_json()
     {
+        var blob = """{"symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":8}""";
         var json = System.Text.Json.JsonSerializer.Serialize(new
         {
             devices = new[] { new { hostAddress = Host } },
-            tags = new[]
-            {
-                new
-                {
-                    name = "Speeds",
-                    deviceHostAddress = Host,
-                    symbolPath = "MAIN.Speeds",
-                    dataType = "DInt",
-                    arrayLength = 8,
-                },
-            },
+            rawTags = new[] { new { rawPath = "Speeds", tagConfig = blob, writeIdempotent = false, deviceName = Host } },
         });
         var parsed = TwinCATDriverFactoryExtensions.ParseOptionsForTests(json, "drv-1");
-        parsed.Tags.Single().ArrayLength.ShouldBe(8);
+        var entry = parsed.RawTags.Single();
+        TwinCATTagDefinitionFactory.FromTagConfig(entry.TagConfig, entry.RawPath, out var def).ShouldBeTrue();
+        def!.ArrayLength.ShouldBe(8);
     }
 
     /// <summary>
-    ///     A pre-declared array tag parsed from JSON must surface as <c>IsArray=true</c> /
+    ///     An array raw tag delivered via the driver config JSON must surface as <c>IsArray=true</c> /
     ///     <c>ArrayDim=8</c> in the discovery address space.
     /// </summary>
     [Fact]
-    public async Task Predeclared_array_tag_from_json_reports_IsArray_in_discovery()
+    public async Task Array_raw_tag_from_json_reports_IsArray_in_discovery()
     {
+        var blob = """{"symbolPath":"MAIN.Speeds","dataType":"DInt","isArray":true,"arrayLength":8}""";
         var configJson = System.Text.Json.JsonSerializer.Serialize(new
         {
             devices = new[] { new { hostAddress = Host } },
-            tags = new[]
-            {
-                new
-                {
-                    name = "Speeds",
-                    deviceHostAddress = Host,
-                    symbolPath = "MAIN.Speeds",
-                    dataType = "DInt",
-                    arrayLength = 8,
-                },
-            },
+            rawTags = new[] { new { rawPath = "Speeds", tagConfig = blob, writeIdempotent = false, deviceName = Host } },
         });
         var builder = new RecordingBuilder();
         var drv = new TwinCATDriver(new TwinCATDriverOptions(), "drv-1", new FakeTwinCATClientFactory());
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATCapabilityTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATCapabilityTests.cs
index e6238956..a3fa2752 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATCapabilityTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATCapabilityTests.cs
@@ -19,11 +19,11 @@ public sealed class TwinCATCapabilityTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851", DeviceName: "Mach1")],
-            Tags =
+            RawTags = TwinCATRawTags.Entries(
             [
                 new TwinCATTagDefinition("Speed", "ads://5.23.91.23.1.1:851", "MAIN.Speed", TwinCATDataType.DInt),
                 new TwinCATTagDefinition("Status", "ads://5.23.91.23.1.1:851", "GVL.Status", TwinCATDataType.Bool, Writable: false),
-            ],
+            ]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -49,7 +49,7 @@ public sealed class TwinCATCapabilityTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = false, // poll-mode test
         }, "drv-1", factory);
@@ -76,7 +76,7 @@ public sealed class TwinCATCapabilityTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = false, // poll-mode test
         }, "drv-1", factory);
@@ -198,11 +198,11 @@ public sealed class TwinCATCapabilityTests
                 new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851"),
                 new TwinCATDeviceOptions("ads://5.23.91.24.1.1:851"),
             ],
-            Tags =
+            RawTags = TwinCATRawTags.Entries(
             [
                 new TwinCATTagDefinition("A", "ads://5.23.91.23.1.1:851", "MAIN.A", TwinCATDataType.DInt),
                 new TwinCATTagDefinition("B", "ads://5.23.91.24.1.1:851", "MAIN.B", TwinCATDataType.DInt),
-            ],
+            ]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1");
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATConnectBackoffTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATConnectBackoffTests.cs
index f840e810..8a77adf5 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATConnectBackoffTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATConnectBackoffTests.cs
@@ -20,7 +20,7 @@ public sealed class TwinCATConnectBackoffTests
     private static TwinCATDriverOptions Options(bool probeEnabled) => new()
     {
         Devices = [new TwinCATDeviceOptions(Host)],
-        Tags = [new TwinCATTagDefinition("T", Host, "MAIN.T", TwinCATDataType.DInt)],
+        RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("T", Host, "MAIN.T", TwinCATDataType.DInt)]),
         Probe = new TwinCATProbeOptions
         {
             Enabled = probeEnabled,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagParserStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagParserStrictnessTests.cs
deleted file mode 100644
index 4ce8dd8c..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagParserStrictnessTests.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
-
-/// <summary>R2-11 Phase C strictness surface for the TwinCAT equipment-tag parser: the runtime is now STRICT —
-/// a typo'd <c>dataType</c> rejects the tag (<c>TryParse</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
-/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true).</summary>
-public sealed class TwinCATEquipmentTagParserStrictnessTests
-{
-    [Fact]
-    public void Typo_dataType_rejects_the_tag()
-    {
-        TwinCATEquipmentTagParser.TryParse("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DIntt\"}", out _)
-            .ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Valid_dataType_still_parses()
-    {
-        TwinCATEquipmentTagParser.TryParse("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}", out var def)
-            .ShouldBeTrue();
-        def.DataType.ShouldBe(TwinCATDataType.DInt);
-    }
-
-    [Fact]
-    public void Inspect_reports_typo_dataType()
-    {
-        var warnings = TwinCATEquipmentTagParser.Inspect("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DIntt\"}");
-        warnings.ShouldHaveSingleItem();
-        warnings[0].ShouldContain("DIntt");
-        warnings[0].ShouldContain("dataType");
-    }
-
-    [Fact]
-    public void Inspect_clean_config_has_no_warnings()
-    {
-        TwinCATEquipmentTagParser.Inspect("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}").ShouldBeEmpty();
-    }
-
-    [Fact]
-    public void Writable_false_is_honoured()
-    {
-        TwinCATEquipmentTagParser.TryParse("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\",\"writable\":false}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void Writable_absent_defaults_to_true()
-    {
-        TwinCATEquipmentTagParser.TryParse("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}", out var def)
-            .ShouldBeTrue();
-        def.Writable.ShouldBeTrue();
-    }
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagTests.cs
deleted file mode 100644
index 2b2090b5..00000000
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATEquipmentTagTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Shouldly;
-using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
-
-namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
-
-[Trait("Category", "Unit")]
-public class TwinCATEquipmentTagTests
-{
-    [Fact]
-    public void Parses_equipment_tagconfig_into_a_transient_definition()
-    {
-        var json = """{"deviceHostAddress":"ads://5.23.91.23.1.1:851","symbolPath":"MAIN.Speed","dataType":"DInt"}""";
-        TwinCATEquipmentTagParser.TryParse(json, out var def).ShouldBeTrue();
-        def!.Name.ShouldBe(json);
-        def.SymbolPath.ShouldBe("MAIN.Speed");
-        def.DeviceHostAddress.ShouldBe("ads://5.23.91.23.1.1:851");
-        def.DataType.ShouldBe(TwinCATDataType.DInt);
-        def.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void Defaults_optional_fields_when_only_symbol_path_is_present()
-    {
-        TwinCATEquipmentTagParser.TryParse("""{"symbolPath":"GVL.X"}""", out var def).ShouldBeTrue();
-        def!.SymbolPath.ShouldBe("GVL.X");
-        def.DeviceHostAddress.ShouldBe("");        // absent host → empty
-        def.DataType.ShouldBe(TwinCATDataType.DInt); // enum default
-    }
-
-    [Fact]
-    public void Rejects_a_non_address_blob()
-        => TwinCATEquipmentTagParser.TryParse("""{"FullName":"x"}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_garbage()
-        => TwinCATEquipmentTagParser.TryParse("not json", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_blank_reference()
-        => TwinCATEquipmentTagParser.TryParse("   ", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Rejects_symbol_path_as_a_non_string()
-        => TwinCATEquipmentTagParser.TryParse("""{"symbolPath":42}""", out _).ShouldBeFalse();
-
-    [Fact]
-    public void Ignores_a_non_string_data_type_and_falls_back_to_default()
-    {
-        // dataType as a number is not a String enum — the guard ignores it and keeps the default.
-        TwinCATEquipmentTagParser.TryParse("""{"symbolPath":"MAIN.X","dataType":3}""", out var def).ShouldBeTrue();
-        def!.DataType.ShouldBe(TwinCATDataType.DInt);
-    }
-
-    /// <summary>
-    ///     End-to-end driver-level proof: a TwinCAT driver with NO authored tags can still read an
-    ///     equipment-tag ref (the raw TagConfig JSON) — the resolver parses it into a transient
-    ///     definition (with a deviceHostAddress matching a configured device) and the read reaches
-    ///     the fake client instead of returning BadNodeIdUnknown.
-    /// </summary>
-    [Fact]
-    public async Task Driver_resolves_an_equipment_ref_and_reads_instead_of_BadNodeIdUnknown()
-    {
-        var host = "ads://5.23.91.23.1.1:851";
-        var json = $$"""{"deviceHostAddress":"{{host}}","symbolPath":"MAIN.Speed","dataType":"DInt"}""";
-        var factory = new FakeTwinCATClientFactory { Customise = () => new FakeTwinCATClient { Values = { ["MAIN.Speed"] = 4242 } } };
-        var drv = new TwinCATDriver(new TwinCATDriverOptions
-        {
-            Devices = [new TwinCATDeviceOptions(host)],
-            Tags = [], // no authored tags — resolution must come from the equipment-ref parser
-            Probe = new TwinCATProbeOptions { Enabled = false },
-        }, "twincat-eq", factory);
-        await drv.InitializeAsync("{}", CancellationToken.None);
-
-        var r = await drv.ReadAsync([json], CancellationToken.None);
-
-        r[0].StatusCode.ShouldBe(TwinCATStatusMapper.Good);
-        r[0].StatusCode.ShouldNotBe(TwinCATStatusMapper.BadNodeIdUnknown);
-        r[0].Value.ShouldBe(4242);
-    }
-}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATHighFindingsRegressionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATHighFindingsRegressionTests.cs
index b20b013f..3d86fc10 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATHighFindingsRegressionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATHighFindingsRegressionTests.cs
@@ -90,7 +90,7 @@ public sealed class TwinCATHighFindingsRegressionTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(DeviceA)],
-            Tags = [new TwinCATTagDefinition("Big", DeviceA, "GVL.Big", TwinCATDataType.LInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Big", DeviceA, "GVL.Big", TwinCATDataType.LInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -114,7 +114,7 @@ public sealed class TwinCATHighFindingsRegressionTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(DeviceA)],
-            Tags = [new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -137,7 +137,7 @@ public sealed class TwinCATHighFindingsRegressionTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(DeviceA)],
-            Tags = [new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
@@ -173,7 +173,7 @@ public sealed class TwinCATHighFindingsRegressionTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(DeviceA)],
-            Tags = [new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATLowFindingsRegressionTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATLowFindingsRegressionTests.cs
index 019794b3..aa356530 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATLowFindingsRegressionTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATLowFindingsRegressionTests.cs
@@ -182,30 +182,15 @@ public sealed class TwinCATLowFindingsRegressionTests
 
     // ---- Driver.TwinCAT-016 — gap-fill tests for previously closed findings ----
 
-    /// <summary>Verifies that structure-typed pre-declared tags are rejected at configuration parse time.</summary>
+    /// <summary>Verifies that a Structure-typed raw tag is rejected by the tag-definition factory.</summary>
     [Fact]
-    public void Structure_typed_pre_declared_tag_is_rejected_at_config_parse()
+    public void Structure_typed_raw_tag_is_rejected_by_the_factory()
     {
-        // Driver.TwinCAT-003 — config-time rejection. A Structure tag must fail loudly with a
-        // clear error rather than reading as a garbage int blob or failing late on a write.
-        var json = JsonSerializer.Serialize(new
-        {
-            devices = new[] { new { hostAddress = DeviceA } },
-            tags = new[]
-            {
-                new
-                {
-                    name = "Udt1",
-                    deviceHostAddress = DeviceA,
-                    symbolPath = "MAIN.fbInstance",
-                    dataType = "Structure",
-                },
-            },
-        });
-        var ex = Should.Throw<InvalidOperationException>(() =>
-            TwinCATDriverFactoryExtensions.ParseOptionsForTests(json, "drv-1"));
-        ex.Message.ShouldContain("Structure");
-        ex.Message.ShouldContain("Udt1");
+        // Driver.TwinCAT-003 — v3 the mapper is the sole tag path. A Structure tag must NOT map to a
+        // definition (returns false ⇒ the driver skips it ⇒ BadNodeIdUnknown) rather than reading as a
+        // garbage int blob or failing late on a write.
+        var blob = """{"symbolPath":"MAIN.fbInstance","dataType":"Structure"}""";
+        TwinCATTagDefinitionFactory.FromTagConfig(blob, "equip/Udt1", out _).ShouldBeFalse();
     }
 
     /// <summary>Verifies that the probe loop and read operations share one client per device.</summary>
@@ -223,7 +208,7 @@ public sealed class TwinCATLowFindingsRegressionTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(DeviceA)],
-            Tags = [new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", DeviceA, "GVL.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions
             {
                 Enabled = true,
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATNativeNotificationTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATNativeNotificationTests.cs
index 47df6aa9..1889144d 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATNativeNotificationTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATNativeNotificationTests.cs
@@ -15,7 +15,7 @@ public sealed class TwinCATNativeNotificationTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = tags,
+            RawTags = TwinCATRawTags.Entries(tags),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = true,
         }, "drv-1", factory);
@@ -110,11 +110,11 @@ public sealed class TwinCATNativeNotificationTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags =
+            RawTags = TwinCATRawTags.Entries(
             [
                 new TwinCATTagDefinition("A", "ads://5.23.91.23.1.1:851", "MAIN.A", TwinCATDataType.DInt),
                 new TwinCATTagDefinition("B", "ads://5.23.91.23.1.1:851", "MAIN.B", TwinCATDataType.DInt),
-            ],
+            ]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = true,
         }, "drv-1", factory);
@@ -182,7 +182,7 @@ public sealed class TwinCATNativeNotificationTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = false,
         }, "drv-1", factory);
@@ -216,7 +216,7 @@ public sealed class TwinCATNativeNotificationTests
         var drvPoll = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", "ads://5.23.91.23.1.1:851", "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = false,
         }, "drv-1", factoryPoll);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATRawTags.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATRawTags.cs
new file mode 100644
index 00000000..aaaccf01
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATRawTags.cs
@@ -0,0 +1,32 @@
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
+
+/// <summary>
+///     Test helper bridging the v2 authoring shape (a typed <see cref="TwinCATTagDefinition"/>) to the v3
+///     delivery shape (<see cref="RawTagEntry"/>). Under v3 the driver no longer takes pre-declared
+///     definitions — the deploy artifact hands it authored raw tags (RawPath + TagConfig blob + owning
+///     DeviceName), and the driver rebuilds the typed definitions via <see cref="TwinCATTagDefinitionFactory"/>.
+///     These tests keep expressing their intent as typed definitions; this helper serialises each back to its
+///     TagConfig blob (via <see cref="TwinCATTagDefinitionFactory.ToTagConfig"/>) and packages it as a
+///     <see cref="RawTagEntry"/> whose RawPath is the def's <c>Name</c> and whose
+///     <see cref="RawTagEntry.DeviceName"/> is the def's <c>DeviceHostAddress</c> — so the round-trip through
+///     the real mapper + the driver's device resolution (which matches DeviceName against the configured
+///     devices by host) reproduces the same definition + device routing the test authored, keyed by the same
+///     name the read/write/subscribe call sites use.
+/// </summary>
+internal static class TwinCATRawTags
+{
+    /// <summary>Serialises one typed definition into its <see cref="RawTagEntry"/>
+    /// (RawPath = def.Name, DeviceName = def.DeviceHostAddress).</summary>
+    /// <param name="def">The typed definition to convert.</param>
+    /// <returns>The equivalent <see cref="RawTagEntry"/>.</returns>
+    public static RawTagEntry Entry(TwinCATTagDefinition def)
+        => new(def.Name, TwinCATTagDefinitionFactory.ToTagConfig(def), def.WriteIdempotent, def.DeviceHostAddress);
+
+    /// <summary>Serialises a sequence of typed definitions into <see cref="RawTagEntry"/> records.</summary>
+    /// <param name="defs">The typed definitions to convert.</param>
+    /// <returns>The equivalent raw-tag entries.</returns>
+    public static IReadOnlyList<RawTagEntry> Entries(IEnumerable<TwinCATTagDefinition> defs)
+        => [.. defs.Select(Entry)];
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReadWriteTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReadWriteTests.cs
index 6c08a226..6d80d837 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReadWriteTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReadWriteTests.cs
@@ -14,7 +14,7 @@ public sealed class TwinCATReadWriteTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = tags,
+            RawTags = TwinCATRawTags.Entries(tags),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         return (drv, factory);
@@ -213,11 +213,11 @@ public sealed class TwinCATReadWriteTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags =
+            RawTags = TwinCATRawTags.Entries(
             [
                 new TwinCATTagDefinition("A", "ads://5.23.91.23.1.1:851", "MAIN.A", TwinCATDataType.DInt),
                 new TwinCATTagDefinition("B", "ads://5.23.91.23.1.1:851", "MAIN.B", TwinCATDataType.DInt, Writable: false),
-            ],
+            ]),
             Probe = new TwinCATProbeOptions { Enabled = false },
         }, "drv-1", factory);
         await drv.InitializeAsync("{}", CancellationToken.None);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReconnectReplayTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReconnectReplayTests.cs
index c22c60de..337aad4b 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReconnectReplayTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATReconnectReplayTests.cs
@@ -24,7 +24,7 @@ public sealed class TwinCATReconnectReplayTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = tags,
+            RawTags = TwinCATRawTags.Entries(tags),
             Probe = new TwinCATProbeOptions
             {
                 Enabled = probe,
@@ -151,7 +151,7 @@ public sealed class TwinCATReconnectReplayTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [new TwinCATTagDefinition("X", Host, "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", Host, "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions
             {
                 Enabled = true,
@@ -194,7 +194,7 @@ public sealed class TwinCATReconnectReplayTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = true,
         }, "drv-1", factory);
@@ -240,7 +240,7 @@ public sealed class TwinCATReconnectReplayTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Speed", Host, "MAIN.Speed", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions
             {
                 Enabled = true,
@@ -302,7 +302,7 @@ public sealed class TwinCATReconnectReplayTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions(Host)],
-            Tags = [new TwinCATTagDefinition("X", Host, "MAIN.X", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("X", Host, "MAIN.X", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             UseNativeNotifications = true,
         }, "drv-1", factory);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATResolveHostTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATResolveHostTests.cs
index c7a52c07..b305a070 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATResolveHostTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATResolveHostTests.cs
@@ -1,13 +1,16 @@
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
 
 /// <summary>
-///     CONV-4 — <see cref="TwinCATDriver.ResolveHost"/> must resolve an equipment-tag reference
-///     (raw TagConfig JSON) to its OWN device host so per-host breaker keys are correct for
-///     equipment tags, not the first-device fallback.
+///     CONV-4 — <see cref="TwinCATDriver.ResolveHost"/> must resolve an authored raw tag to its OWN
+///     device host so per-host breaker keys are correct for equipment tags, not the first-device
+///     fallback. Under v3 the tag is delivered as a <see cref="RawTagEntry"/> whose
+///     <see cref="RawTagEntry.DeviceName"/> names the owning device; the driver threads that onto the
+///     def's host at Initialize, and ResolveHost reads it back by RawPath.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class TwinCATResolveHostTests
@@ -15,29 +18,35 @@ public sealed class TwinCATResolveHostTests
     private const string DeviceA = "ads://5.23.91.23.1.1:851";
     private const string DeviceB = "ads://5.23.91.23.1.2:851";
 
-    private static TwinCATDriver NewDriver() => new(
-        new TwinCATDriverOptions
-        {
-            Devices = [new TwinCATDeviceOptions(DeviceA), new TwinCATDeviceOptions(DeviceB)],
-            Probe = new TwinCATProbeOptions { Enabled = false },
-            EnableControllerBrowse = false,
-        },
-        "twincat-1", new FakeTwinCATClientFactory());
-
-    /// <summary>An equipment-tag ref naming device B resolves to device B's host, not the first device.</summary>
-    [Fact]
-    public void ResolveHost_EquipmentTagRef_ReturnsItsOwnDeviceHost()
+    private static async Task<TwinCATDriver> NewDriverAsync(params RawTagEntry[] rawTags)
     {
-        var drv = NewDriver();
-        var json = $$"""{"deviceHostAddress":"{{DeviceB}}","symbolPath":"MAIN.Speed","dataType":"DInt"}""";
-        drv.ResolveHost(json).ShouldBe(DeviceB);
+        var drv = new TwinCATDriver(
+            new TwinCATDriverOptions
+            {
+                Devices = [new TwinCATDeviceOptions(DeviceA), new TwinCATDeviceOptions(DeviceB)],
+                RawTags = rawTags,
+                Probe = new TwinCATProbeOptions { Enabled = false },
+                EnableControllerBrowse = false,
+            },
+            "twincat-1", new FakeTwinCATClientFactory());
+        await drv.InitializeAsync("{}", CancellationToken.None);
+        return drv;
+    }
+
+    /// <summary>A raw tag naming device B resolves to device B's host, not the first device.</summary>
+    [Fact]
+    public async Task ResolveHost_RawTagOnDeviceB_ReturnsItsOwnDeviceHost()
+    {
+        var blob = """{"symbolPath":"MAIN.Speed","dataType":"DInt"}""";
+        var drv = await NewDriverAsync(new RawTagEntry("equip/Speed", blob, WriteIdempotent: false, DeviceName: DeviceB));
+        drv.ResolveHost("equip/Speed").ShouldBe(DeviceB);
     }
 
     /// <summary>An unresolvable ref keeps the current first-device fallback.</summary>
     [Fact]
-    public void ResolveHost_UnknownRef_KeepsCurrentFallback()
+    public async Task ResolveHost_UnknownRef_KeepsCurrentFallback()
     {
-        var drv = NewDriver();
+        var drv = await NewDriverAsync();
         drv.ResolveHost("totally-unknown").ShouldBe(DeviceA);
     }
 }
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATSymbolBrowserTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATSymbolBrowserTests.cs
index 73c04696..d2c3dd29 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATSymbolBrowserTests.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATSymbolBrowserTests.cs
@@ -25,7 +25,7 @@ public sealed class TwinCATSymbolBrowserTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("Declared", "ads://5.23.91.23.1.1:851", "MAIN.Declared", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Declared", "ads://5.23.91.23.1.1:851", "MAIN.Declared", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             EnableControllerBrowse = false,
         }, "drv-1", factory);
@@ -165,7 +165,7 @@ public sealed class TwinCATSymbolBrowserTests
         var drv = new TwinCATDriver(new TwinCATDriverOptions
         {
             Devices = [new TwinCATDeviceOptions("ads://5.23.91.23.1.1:851")],
-            Tags = [new TwinCATTagDefinition("Declared", "ads://5.23.91.23.1.1:851", "MAIN.Declared", TwinCATDataType.DInt)],
+            RawTags = TwinCATRawTags.Entries([new TwinCATTagDefinition("Declared", "ads://5.23.91.23.1.1:851", "MAIN.Declared", TwinCATDataType.DInt)]),
             Probe = new TwinCATProbeOptions { Enabled = false },
             EnableControllerBrowse = true,
         }, "drv-1", factory);
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryStrictnessTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryStrictnessTests.cs
new file mode 100644
index 00000000..554c351f
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryStrictnessTests.cs
@@ -0,0 +1,60 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
+
+/// <summary>R2-11 Phase C strictness surface for the TwinCAT tag-definition factory: the runtime is now STRICT —
+/// a typo'd <c>dataType</c> rejects the tag (<c>FromTagConfig</c> ⇒ <see langword="false"/> ⇒ <c>BadNodeIdUnknown</c>),
+/// <c>Inspect</c> reports the typo, and the <c>writable</c> key is honoured (default true).</summary>
+[Trait("Category", "Unit")]
+public sealed class TwinCATTagDefinitionFactoryStrictnessTests
+{
+    private const string RawPath = "area/line/equip/Tag";
+
+    [Fact]
+    public void Typo_dataType_rejects_the_tag()
+    {
+        TwinCATTagDefinitionFactory.FromTagConfig("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DIntt\"}", RawPath, out _)
+            .ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Valid_dataType_still_parses()
+    {
+        TwinCATTagDefinitionFactory.FromTagConfig("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}", RawPath, out var def)
+            .ShouldBeTrue();
+        def.DataType.ShouldBe(TwinCATDataType.DInt);
+    }
+
+    [Fact]
+    public void Inspect_reports_typo_dataType()
+    {
+        var warnings = TwinCATTagDefinitionFactory.Inspect("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DIntt\"}");
+        warnings.ShouldHaveSingleItem();
+        warnings[0].ShouldContain("DIntt");
+        warnings[0].ShouldContain("dataType");
+    }
+
+    [Fact]
+    public void Inspect_clean_config_has_no_warnings()
+    {
+        TwinCATTagDefinitionFactory.Inspect("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}").ShouldBeEmpty();
+    }
+
+    [Fact]
+    public void Writable_false_is_honoured()
+    {
+        TwinCATTagDefinitionFactory.FromTagConfig("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\",\"writable\":false}", RawPath, out var def)
+            .ShouldBeTrue();
+        def.Writable.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Writable_absent_defaults_to_true()
+    {
+        TwinCATTagDefinitionFactory.FromTagConfig("{\"symbolPath\":\"MAIN.x\",\"dataType\":\"DInt\"}", RawPath, out var def)
+            .ShouldBeTrue();
+        def.Writable.ShouldBeTrue();
+    }
+}
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryTests.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryTests.cs
new file mode 100644
index 00000000..0c55a3f8
--- /dev/null
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/TwinCATTagDefinitionFactoryTests.cs
@@ -0,0 +1,102 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+using ZB.MOM.WW.OtOpcUa.Driver.TwinCAT;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests;
+
+[Trait("Category", "Unit")]
+public class TwinCATTagDefinitionFactoryTests
+{
+    private const string RawPath = "area/line/equip/Speed";
+
+    [Fact]
+    public void Maps_tagconfig_into_a_definition_keyed_by_rawpath()
+    {
+        // v3: deviceHostAddress is NOT read from the blob (dropped); routing comes from the RawTagEntry.
+        var json = """{"symbolPath":"MAIN.Speed","dataType":"DInt"}""";
+        TwinCATTagDefinitionFactory.FromTagConfig(json, RawPath, out var def).ShouldBeTrue();
+        def!.Name.ShouldBe(RawPath);                 // identity is the RawPath, not the blob
+        def.SymbolPath.ShouldBe("MAIN.Speed");
+        def.DeviceHostAddress.ShouldBe("");          // mapper never reads a device from the blob
+        def.DataType.ShouldBe(TwinCATDataType.DInt);
+        def.Writable.ShouldBeTrue();
+    }
+
+    [Fact]
+    public void Defaults_optional_fields_when_only_symbol_path_is_present()
+    {
+        TwinCATTagDefinitionFactory.FromTagConfig("""{"symbolPath":"GVL.X"}""", RawPath, out var def).ShouldBeTrue();
+        def!.SymbolPath.ShouldBe("GVL.X");
+        def.DeviceHostAddress.ShouldBe("");
+        def.DataType.ShouldBe(TwinCATDataType.DInt); // enum default
+    }
+
+    [Fact]
+    public void Rejects_a_non_address_blob()
+        => TwinCATTagDefinitionFactory.FromTagConfig("""{"FullName":"x"}""", RawPath, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_garbage()
+        => TwinCATTagDefinitionFactory.FromTagConfig("not json", RawPath, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_blank_tagconfig()
+        => TwinCATTagDefinitionFactory.FromTagConfig("   ", RawPath, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Rejects_symbol_path_as_a_non_string()
+        => TwinCATTagDefinitionFactory.FromTagConfig("""{"symbolPath":42}""", RawPath, out _).ShouldBeFalse();
+
+    [Fact]
+    public void Ignores_a_non_string_data_type_and_falls_back_to_default()
+    {
+        // dataType as a number is not a String enum — the guard ignores it and keeps the default.
+        TwinCATTagDefinitionFactory.FromTagConfig("""{"symbolPath":"MAIN.X","dataType":3}""", RawPath, out var def).ShouldBeTrue();
+        def!.DataType.ShouldBe(TwinCATDataType.DInt);
+    }
+
+    [Fact]
+    public void ToTagConfig_round_trips_through_FromTagConfig()
+    {
+        var original = new TwinCATTagDefinition(
+            Name: RawPath, DeviceHostAddress: "ads://5.23.91.23.1.1:851", SymbolPath: "MAIN.Speeds",
+            DataType: TwinCATDataType.Real, Writable: false, ArrayLength: 4);
+        var blob = TwinCATTagDefinitionFactory.ToTagConfig(original);
+
+        TwinCATTagDefinitionFactory.FromTagConfig(blob, RawPath, out var def).ShouldBeTrue();
+        def!.SymbolPath.ShouldBe("MAIN.Speeds");
+        def.DataType.ShouldBe(TwinCATDataType.Real);
+        def.Writable.ShouldBeFalse();
+        def.ArrayLength.ShouldBe(4);
+        // Device + WriteIdempotent travel on the RawTagEntry, not the blob → mapper leaves them defaulted.
+        def.DeviceHostAddress.ShouldBe("");
+        def.WriteIdempotent.ShouldBeFalse();
+    }
+
+    /// <summary>
+    ///     End-to-end driver-level proof (v3 delivery): a TwinCAT driver served an authored raw tag
+    ///     (RawPath + TagConfig blob + owning DeviceName) resolves it by RawPath and routes it to the
+    ///     matching device — the read reaches the fake client instead of returning BadNodeIdUnknown.
+    /// </summary>
+    [Fact]
+    public async Task Driver_resolves_a_raw_tag_and_reads_instead_of_BadNodeIdUnknown()
+    {
+        var host = "ads://5.23.91.23.1.1:851";
+        var blob = """{"symbolPath":"MAIN.Speed","dataType":"DInt"}""";
+        var factory = new FakeTwinCATClientFactory { Customise = () => new FakeTwinCATClient { Values = { ["MAIN.Speed"] = 4242 } } };
+        var drv = new TwinCATDriver(new TwinCATDriverOptions
+        {
+            Devices = [new TwinCATDeviceOptions(host)],
+            RawTags = [new RawTagEntry(RawPath, blob, WriteIdempotent: false, DeviceName: host)],
+            Probe = new TwinCATProbeOptions { Enabled = false },
+        }, "twincat-eq", factory);
+        await drv.InitializeAsync("{}", CancellationToken.None);
+
+        var r = await drv.ReadAsync([RawPath], CancellationToken.None);
+
+        r[0].StatusCode.ShouldBe(TwinCATStatusMapper.Good);
+        r[0].StatusCode.ShouldNotBe(TwinCATStatusMapper.BadNodeIdUnknown);
+        r[0].Value.ShouldBe(4242);
+    }
+}
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbCipDriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbCipDriverPageFormSerializationTests.cs
index 060ca94a..5ae96fe8 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbCipDriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbCipDriverPageFormSerializationTests.cs
@@ -43,10 +43,6 @@ public sealed class AbCipDriverPageFormSerializationTests
             [
                 new AbCipDeviceOptions("ab://10.0.0.1/1,0", AbCipPlcFamily.ControlLogix, "PLC-1"),
             ],
-            Tags =
-            [
-                new AbCipTagDefinition("Speed", "ab://10.0.0.1/1,0", "Motor1.Speed", AbCipDataType.Real, Writable: true),
-            ],
         };
 
         var json = JsonSerializer.Serialize(original, _opts);
@@ -66,9 +62,6 @@ public sealed class AbCipDriverPageFormSerializationTests
         back.Devices.Count.ShouldBe(1);
         back.Devices[0].HostAddress.ShouldBe("ab://10.0.0.1/1,0");
         back.Devices[0].PlcFamily.ShouldBe(AbCipPlcFamily.ControlLogix);
-        back.Tags.Count.ShouldBe(1);
-        back.Tags[0].Name.ShouldBe("Speed");
-        back.Tags[0].DataType.ShouldBe(AbCipDataType.Real);
     }
 
     [Fact]
@@ -116,43 +109,11 @@ public sealed class AbCipDriverPageFormSerializationTests
         back.ConnectionSize.ShouldBe(4002);
     }
 
-    [Fact]
-    public void TagRow_round_trips_through_definition()
-    {
-        var row = new AbCipDriverPage.AbCipTagRow
-        {
-            Name = "Speed", DeviceHostAddress = "ab://10.0.0.1/1,0", TagPath = "Motor1.Speed",
-            DataType = AbCipDataType.Real, Writable = true,
-        };
-        var def = row.ToDefinition();
-        var back = AbCipDriverPage.AbCipTagRow.FromDefinition(def);
-
-        back.Name.ShouldBe("Speed");
-        back.DeviceHostAddress.ShouldBe("ab://10.0.0.1/1,0");
-        back.TagPath.ShouldBe("Motor1.Speed");
-        back.DataType.ShouldBe(AbCipDataType.Real);
-        back.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void TagRow_preserves_unedited_fields()
-    {
-        var original = new AbCipTagDefinition(
-            "Speed", "ab://10.0.0.1/1,0", "Motor1.Speed", AbCipDataType.Structure,
-            Writable: true, WriteIdempotent: true,
-            Members: [new AbCipStructureMember("Sub", AbCipDataType.DInt)],
-            SafetyTag: true);
-        var row = AbCipDriverPage.AbCipTagRow.FromDefinition(original);
-        row.Name = "Renamed";
-
-        var back = row.ToDefinition();
-        back.Name.ShouldBe("Renamed");
-        back.WriteIdempotent.ShouldBeTrue();
-        back.SafetyTag.ShouldBeTrue();
-        back.Members.ShouldNotBeNull();
-        back.Members!.Count.ShouldBe(1);
-        back.Members[0].Name.ShouldBe("Sub");
-    }
+    // v3 Batch-1 migration: the pre-declared Tags editor (AbCipDriverPage.AbCipTagRow +
+    // AbCipDriverOptions.Tags) was retired — tags moved to the Raw tree (/raw, Batch 2). The former
+    // TagRow_* / ValidateTagRow_* tests and the tag leg of the list-serialization test were removed.
+    // The multi-device Devices editor is RETAINED, so its coverage (DeviceRow_* + ValidateDeviceRow_*
+    // + the device-list serialization below, all carrying the AbCipPlcFamily enum) stays.
 
     [Fact]
     public void ValidateDeviceRow_rejects_duplicate_host()
@@ -163,32 +124,19 @@ public sealed class AbCipDriverPageFormSerializationTests
     }
 
     [Fact]
-    public void ValidateTagRow_rejects_duplicate_name()
-    {
-        var rows = new List<AbCipDriverPage.AbCipTagRow> { new() { Name = "Speed" } };
-        AbCipDriverPage.AbCipTagRow.ValidateRow(new() { Name = "Speed" }, rows, null)
-            .ShouldNotBeNull();
-    }
-
-    [Fact]
-    public void Device_and_tag_lists_survive_options_serialize_round_trip()
+    public void Device_list_survives_options_serialize_round_trip()
     {
         var devices = new List<AbCipDeviceOptions>
         {
             new("ab://10.0.0.1/1,0", AbCipPlcFamily.ControlLogix, "PLC-1"),
             new("ab://10.0.0.2/1,0", AbCipPlcFamily.CompactLogix, "PLC-2"),
         };
-        var tags = new List<AbCipTagDefinition>
-        {
-            new("Speed", "ab://10.0.0.1/1,0", "Motor1.Speed", AbCipDataType.Real),
-            new("Run", "ab://10.0.0.2/1,0", "Motor2.Run", AbCipDataType.Bool),
-        };
-        var opts = new AbCipDriverPage.FormModel().ToOptions(devices, tags);
+        var opts = new AbCipDriverPage.FormModel().ToOptions(devices);
         var json = JsonSerializer.Serialize(opts, TestJsonOpts);
         var back = JsonSerializer.Deserialize<AbCipDriverOptions>(json, TestJsonOpts)!;
         back.Devices.Count.ShouldBe(2);
         back.Devices[0].HostAddress.ShouldBe("ab://10.0.0.1/1,0");
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("Speed");
+        back.Devices[0].PlcFamily.ShouldBe(AbCipPlcFamily.ControlLogix);
+        back.Devices[1].PlcFamily.ShouldBe(AbCipPlcFamily.CompactLogix);
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbLegacyDriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbLegacyDriverPageFormSerializationTests.cs
index 1df73121..973db1d1 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbLegacyDriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/AbLegacyDriverPageFormSerializationTests.cs
@@ -41,11 +41,6 @@ public sealed class AbLegacyDriverPageFormSerializationTests
                 new AbLegacyDeviceOptions("10.0.0.10", AbLegacyPlcFamily.Slc500, "PLC-A"),
                 new AbLegacyDeviceOptions("10.0.0.11", AbLegacyPlcFamily.MicroLogix),
             ],
-            Tags =
-            [
-                new AbLegacyTagDefinition("Level", "10.0.0.10", "N7:5", AbLegacyDataType.Int, Writable: false),
-                new AbLegacyTagDefinition("Pump", "10.0.0.10", "B3:0/0", AbLegacyDataType.Bit, Writable: true),
-            ],
         };
 
         var json = JsonSerializer.Serialize(original, _opts);
@@ -63,12 +58,6 @@ public sealed class AbLegacyDriverPageFormSerializationTests
         back.Devices[0].PlcFamily.ShouldBe(AbLegacyPlcFamily.Slc500);
         back.Devices[0].DeviceName.ShouldBe("PLC-A");
         back.Devices[1].PlcFamily.ShouldBe(AbLegacyPlcFamily.MicroLogix);
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("Level");
-        back.Tags[0].Address.ShouldBe("N7:5");
-        back.Tags[0].DataType.ShouldBe(AbLegacyDataType.Int);
-        back.Tags[0].Writable.ShouldBeFalse();
-        back.Tags[1].DataType.ShouldBe(AbLegacyDataType.Bit);
     }
 
     [Fact]
@@ -114,37 +103,11 @@ public sealed class AbLegacyDriverPageFormSerializationTests
         back.DeviceName.ShouldBe("PLC-A");
     }
 
-    [Fact]
-    public void TagRow_round_trips_through_definition()
-    {
-        var row = new AbLegacyDriverPage.AbLegacyTagRow
-        {
-            Name = "Level", DeviceHostAddress = "10.0.0.10", Address = "N7:5",
-            DataType = AbLegacyDataType.Int, Writable = true,
-        };
-        var def = row.ToDefinition();
-        var back = AbLegacyDriverPage.AbLegacyTagRow.FromDefinition(def);
-
-        back.Name.ShouldBe("Level");
-        back.DeviceHostAddress.ShouldBe("10.0.0.10");
-        back.Address.ShouldBe("N7:5");
-        back.DataType.ShouldBe(AbLegacyDataType.Int);
-        back.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void TagRow_preserves_unedited_fields()
-    {
-        var original = new AbLegacyTagDefinition(
-            "Level", "10.0.0.10", "N7:5", AbLegacyDataType.Int,
-            Writable: true, WriteIdempotent: true);
-        var row = AbLegacyDriverPage.AbLegacyTagRow.FromDefinition(original);
-        row.Name = "Renamed";
-
-        var back = row.ToDefinition();
-        back.Name.ShouldBe("Renamed");
-        back.WriteIdempotent.ShouldBeTrue();
-    }
+    // v3 Batch-1 migration: the pre-declared Tags editor (AbLegacyDriverPage.AbLegacyTagRow +
+    // AbLegacyDriverOptions.Tags) was retired — tags moved to the Raw tree (/raw, Batch 2). The former
+    // TagRow_* / ValidateTagRow_* tests and the tag leg of the list-serialization test were removed.
+    // The multi-device Devices editor is RETAINED, so its coverage (DeviceRow_* + ValidateDeviceRow_*
+    // + the device-list serialization below, all carrying the AbLegacyPlcFamily enum) stays.
 
     [Fact]
     public void ValidateDeviceRow_rejects_duplicate_host()
@@ -155,32 +118,19 @@ public sealed class AbLegacyDriverPageFormSerializationTests
     }
 
     [Fact]
-    public void ValidateTagRow_rejects_duplicate_name()
-    {
-        var rows = new List<AbLegacyDriverPage.AbLegacyTagRow> { new() { Name = "Level" } };
-        AbLegacyDriverPage.AbLegacyTagRow.ValidateRow(new() { Name = "Level" }, rows, null)
-            .ShouldNotBeNull();
-    }
-
-    [Fact]
-    public void Device_and_tag_lists_survive_options_serialize_round_trip()
+    public void Device_list_survives_options_serialize_round_trip()
     {
         var devices = new List<AbLegacyDeviceOptions>
         {
             new("10.0.0.10", AbLegacyPlcFamily.Slc500, "PLC-1"),
             new("10.0.0.11", AbLegacyPlcFamily.MicroLogix, "PLC-2"),
         };
-        var tags = new List<AbLegacyTagDefinition>
-        {
-            new("Level", "10.0.0.10", "N7:5", AbLegacyDataType.Int),
-            new("Pump", "10.0.0.11", "B3:0/0", AbLegacyDataType.Bit),
-        };
-        var opts = new AbLegacyDriverPage.FormModel().ToOptions(devices, tags);
+        var opts = new AbLegacyDriverPage.FormModel().ToOptions(devices);
         var json = JsonSerializer.Serialize(opts, TestJsonOpts);
         var back = JsonSerializer.Deserialize<AbLegacyDriverOptions>(json, TestJsonOpts)!;
         back.Devices.Count.ShouldBe(2);
         back.Devices[0].HostAddress.ShouldBe("10.0.0.10");
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("Level");
+        back.Devices[0].PlcFamily.ShouldBe(AbLegacyPlcFamily.Slc500);
+        back.Devices[1].PlcFamily.ShouldBe(AbLegacyPlcFamily.MicroLogix);
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/FocasDriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/FocasDriverPageFormSerializationTests.cs
index 2f057cc6..607e83a7 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/FocasDriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/FocasDriverPageFormSerializationTests.cs
@@ -52,7 +52,6 @@ public sealed class FocasDriverPageFormSerializationTests
                 TimerPollInterval = TimeSpan.FromSeconds(60),
             },
             Devices = [],
-            Tags = [],
         };
 
         var json = JsonSerializer.Serialize(original, _opts);
@@ -73,7 +72,6 @@ public sealed class FocasDriverPageFormSerializationTests
         back.FixedTree.ProgramPollInterval.ShouldBe(TimeSpan.FromSeconds(2));
         back.FixedTree.TimerPollInterval.ShouldBe(TimeSpan.FromSeconds(60));
         back.Devices.ShouldBeEmpty();
-        back.Tags.ShouldBeEmpty();
     }
 
     [Fact]
@@ -123,7 +121,7 @@ public sealed class FocasDriverPageFormSerializationTests
 
         var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
             .FocasDriverPage.FormModel.FromOptions(opts);
-        var roundTripped = form.ToOptions([], []);
+        var roundTripped = form.ToOptions([]);
 
         roundTripped.Timeout.ShouldBe(TimeSpan.FromSeconds(4));
         roundTripped.Probe.Enabled.ShouldBeTrue();
@@ -168,37 +166,11 @@ public sealed class FocasDriverPageFormSerializationTests
         back.Series.ShouldBe(FocasCncSeries.Thirty_i);
     }
 
-    [Fact]
-    public void TagRow_round_trips_through_definition()
-    {
-        var row = new FocasDriverPage.FocasTagRow
-        {
-            Name = "MacroVar", DeviceHostAddress = "192.168.0.10:8193", Address = "MACRO:500",
-            DataType = FocasDataType.Float64, Writable = true,
-        };
-        var def = row.ToDefinition();
-        var back = FocasDriverPage.FocasTagRow.FromDefinition(def);
-
-        back.Name.ShouldBe("MacroVar");
-        back.DeviceHostAddress.ShouldBe("192.168.0.10:8193");
-        back.Address.ShouldBe("MACRO:500");
-        back.DataType.ShouldBe(FocasDataType.Float64);
-        back.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void TagRow_preserves_unedited_fields()
-    {
-        var original = new FocasTagDefinition(
-            "MacroVar", "192.168.0.10:8193", "MACRO:500", FocasDataType.Float64,
-            Writable: true, WriteIdempotent: true);
-        var row = FocasDriverPage.FocasTagRow.FromDefinition(original);
-        row.Name = "Renamed";
-
-        var back = row.ToDefinition();
-        back.Name.ShouldBe("Renamed");
-        back.WriteIdempotent.ShouldBeTrue();
-    }
+    // v3 Batch-1 migration: the pre-declared Tags editor (FocasDriverPage.FocasTagRow +
+    // FocasDriverOptions.Tags) was retired — tags moved to the Raw tree (/raw, Batch 2). The former
+    // TagRow_* / ValidateTagRow_* tests and the tag leg of the list-serialization test were removed.
+    // The multi-device Devices editor is RETAINED, so its coverage (DeviceRow_* + ValidateDeviceRow_*
+    // + the device-list serialization below, all carrying the FocasCncSeries enum) stays.
 
     [Fact]
     public void ValidateDeviceRow_rejects_duplicate_host()
@@ -209,34 +181,19 @@ public sealed class FocasDriverPageFormSerializationTests
     }
 
     [Fact]
-    public void ValidateTagRow_rejects_duplicate_name()
-    {
-        var rows = new List<FocasDriverPage.FocasTagRow> { new() { Name = "MacroVar" } };
-        FocasDriverPage.FocasTagRow.ValidateRow(new() { Name = "MacroVar" }, rows, null)
-            .ShouldNotBeNull();
-    }
-
-    [Fact]
-    public void Device_and_tag_lists_survive_options_serialize_round_trip()
+    public void Device_list_survives_options_serialize_round_trip()
     {
         var devices = new List<FocasDeviceOptions>
         {
             new("192.168.0.10:8193", "CNC1", FocasCncSeries.Thirty_i),
             new("192.168.0.20:8193", "CNC2", FocasCncSeries.Zero_i_F),
         };
-        var tags = new List<FocasTagDefinition>
-        {
-            new("MacroVar", "192.168.0.10:8193", "MACRO:500", FocasDataType.Float64),
-            new("Flag", "192.168.0.20:8193", "X0.0", FocasDataType.Bit),
-        };
-        var opts = new FocasDriverPage.FormModel().ToOptions(devices, tags);
+        var opts = new FocasDriverPage.FormModel().ToOptions(devices);
         var json = JsonSerializer.Serialize(opts, TestJsonOpts);
         var back = JsonSerializer.Deserialize<FocasDriverOptions>(json, TestJsonOpts)!;
         back.Devices.Count.ShouldBe(2);
         back.Devices[0].HostAddress.ShouldBe("192.168.0.10:8193");
         back.Devices[0].Series.ShouldBe(FocasCncSeries.Thirty_i);
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("MacroVar");
-        back.Tags[0].Address.ShouldBe("MACRO:500");
+        back.Devices[1].Series.ShouldBe(FocasCncSeries.Zero_i_F);
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ModbusDriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ModbusDriverPageFormSerializationTests.cs
index b0777da0..1b31a7a7 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ModbusDriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ModbusDriverPageFormSerializationTests.cs
@@ -15,12 +15,6 @@ public sealed class ModbusDriverPageFormSerializationTests
         WriteIndented = false,
     };
 
-    private static readonly JsonSerializerOptions TestJsonOpts = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
-    };
-
     [Fact]
     public void RoundTrip_PreservesKnownFields()
     {
@@ -112,62 +106,9 @@ public sealed class ModbusDriverPageFormSerializationTests
         back.ProbeTimeoutSeconds.ShouldBe(10);
     }
 
-    [Fact]
-    public void TagRow_round_trips_through_definition()
-    {
-        var row = new ModbusDriverPage.ModbusTagRow
-        {
-            Name = "Pump1_Speed", Region = ModbusRegion.HoldingRegisters, Address = 40001,
-            DataType = ModbusDataType.Int16, Writable = true,
-        };
-        var def = row.ToDefinition();
-        var back = ModbusDriverPage.ModbusTagRow.FromDefinition(def);
-
-        back.Name.ShouldBe("Pump1_Speed");
-        back.Address.ShouldBe(40001);
-        back.DataType.ShouldBe(ModbusDataType.Int16);
-        back.Writable.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void Tag_list_survives_options_serialize_round_trip()
-    {
-        var tags = new List<ModbusTagDefinition>
-        {
-            new("A", ModbusRegion.HoldingRegisters, 1, ModbusDataType.Int16),
-            new("B", ModbusRegion.Coils, 2, ModbusDataType.Bool),
-        };
-        var opts = new ModbusDriverPage.FormModel().ToOptions(tags);
-        var json = JsonSerializer.Serialize(opts, TestJsonOpts);
-        var back = JsonSerializer.Deserialize<ModbusDriverOptions>(json, TestJsonOpts)!;
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("A");
-    }
-
-    [Fact]
-    public void ValidateRow_rejects_duplicate_name()
-    {
-        var rows = new List<ModbusDriverPage.ModbusTagRow> { new() { Name = "A" } };
-        ModbusDriverPage.ModbusTagRow.ValidateRow(new() { Name = "A" }, rows, null)
-            .ShouldNotBeNull();
-    }
-
-    [Fact]
-    public void ToDefinition_preserves_unedited_fields()
-    {
-        var original = new ModbusTagDefinition(
-            "T", ModbusRegion.HoldingRegisters, 5, ModbusDataType.Int16,
-            StringByteOrder: ModbusStringByteOrder.LowByteFirst,
-            ArrayCount: 10, Deadband: 0.5, UnitId: 3, CoalesceProhibited: true);
-        var row = ModbusDriverPage.ModbusTagRow.FromDefinition(original);
-        row.Name = "Renamed";
-
-        var back = row.ToDefinition();
-        back.Name.ShouldBe("Renamed");
-        back.UnitId.ShouldBe((byte)3);
-        back.ArrayCount.ShouldBe(10);
-        back.Deadband.ShouldBe(0.5);
-        back.StringByteOrder.ShouldBe(ModbusStringByteOrder.LowByteFirst);
-        back.CoalesceProhibited.ShouldBeTrue();
-    }
+    // v3 Batch-1 migration: the pre-declared Tags editor (ModbusDriverPage.ModbusTagRow +
+    // ModbusDriverOptions.Tags) was retired — tags moved to the Raw tree (/raw, Batch 2). The former
+    // TagRow_* / Tag_list_survives_* / ValidateRow_* / ToDefinition_preserves_* tests were removed.
+    // The connection/protocol-field + enum-serialization coverage (ModbusFamily, MelsecFamily) is
+    // retained by RoundTrip_PreservesKnownFields above unchanged.
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/S7DriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/S7DriverPageFormSerializationTests.cs
index 2e50a9d9..69f11487 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/S7DriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/S7DriverPageFormSerializationTests.cs
@@ -7,6 +7,12 @@ using ZB.MOM.WW.OtOpcUa.Driver.S7;
 
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
 
+// v3 Batch-1 migration: the S7 driver page dropped its pre-declared Tags editor — tags now live in
+// the Raw tree (/raw, Batch 2), and S7DriverOptions.Tags (the typed S7TagDefinition list) +
+// S7DriverPage.S7TagRow were retired (the driver now consumes RawTags). The former tag-editor and
+// tag-serialization tests (S7TagRow_*, TagList_SerializeRoundTrip_PreservesTags, and the tag legs of
+// the round-trip tests) were removed. The connection/protocol-field + enum-serialization round-trip
+// coverage (CpuType, S7DataType) is retained below unchanged.
 public sealed class S7DriverPageFormSerializationTests
 {
     private static readonly JsonSerializerOptions _opts = new()
@@ -33,7 +39,6 @@ public sealed class S7DriverPageFormSerializationTests
                 Timeout = TimeSpan.FromSeconds(3),
             },
             ProbeTimeoutSeconds = 30,
-            Tags = [],
         };
 
         var json = JsonSerializer.Serialize(original, _opts);
@@ -51,7 +56,6 @@ public sealed class S7DriverPageFormSerializationTests
         back.Probe.Interval.ShouldBe(TimeSpan.FromSeconds(15));
         back.Probe.Timeout.ShouldBe(TimeSpan.FromSeconds(3));
         back.ProbeTimeoutSeconds.ShouldBe(30);
-        back.Tags.ShouldBeEmpty();
     }
 
     [Fact]
@@ -70,12 +74,6 @@ public sealed class S7DriverPageFormSerializationTests
     [Fact]
     public void FormModel_RoundTrip_PreservesEditableFields()
     {
-        var tags = new[]
-        {
-            new S7TagDefinition("Speed",  "DB1.DBD0",  S7DataType.Float32, Writable: true),
-            new S7TagDefinition("Status", "DB1.DBW4",  S7DataType.Int16,   Writable: false),
-        };
-
         var opts = new S7DriverOptions
         {
             Host = "192.168.1.50",
@@ -91,15 +89,10 @@ public sealed class S7DriverPageFormSerializationTests
                 Timeout = TimeSpan.FromSeconds(4),
             },
             ProbeTimeoutSeconds = 20,
-            Tags = tags,
         };
 
-        var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .S7DriverPage.FormModel.FromOptions(opts);
-        var tagRows = opts.Tags
-            .Select(ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers.S7DriverPage.S7TagRow.FromDefinition)
-            .ToList();
-        var roundTripped = form.ToOptions(tagRows.Select(r => r.ToDefinition()).ToList());
+        var form = S7DriverPage.FormModel.FromOptions(opts);
+        var roundTripped = form.ToOptions();
 
         roundTripped.Host.ShouldBe("192.168.1.50");
         roundTripped.Port.ShouldBe(102);
@@ -111,104 +104,5 @@ public sealed class S7DriverPageFormSerializationTests
         roundTripped.Probe.Interval.ShouldBe(TimeSpan.FromSeconds(8));
         roundTripped.Probe.Timeout.ShouldBe(TimeSpan.FromSeconds(4));
         roundTripped.ProbeTimeoutSeconds.ShouldBe(20);
-
-        // Tags must survive the FormModel round-trip unchanged (regression guard for the
-        // Tags = [] data-loss bug fixed in this PR).
-        roundTripped.Tags.Count.ShouldBe(2);
-        roundTripped.Tags[0].Name.ShouldBe("Speed");
-        roundTripped.Tags[0].Address.ShouldBe("DB1.DBD0");
-        roundTripped.Tags[0].DataType.ShouldBe(S7DataType.Float32);
-        roundTripped.Tags[1].Name.ShouldBe("Status");
-        roundTripped.Tags[1].Writable.ShouldBeFalse();
-    }
-
-    [Fact]
-    public void S7TagRow_RoundTrip_PreservesEditableFields()
-    {
-        var def = new S7TagDefinition("Speed", "DB1.DBD0", S7DataType.Float32, Writable: true, StringLength: 80);
-
-        var row = S7DriverPage.S7TagRow.FromDefinition(def);
-        var back = row.ToDefinition();
-
-        back.Name.ShouldBe("Speed");
-        back.Address.ShouldBe("DB1.DBD0");
-        back.DataType.ShouldBe(S7DataType.Float32);
-        back.Writable.ShouldBeTrue();
-        back.StringLength.ShouldBe(80);
-    }
-
-    [Fact]
-    public void S7TagRow_CarriesThroughUneditedFields()
-    {
-        // WriteIdempotent is not exposed by the editor; it must survive FromDefinition→edit→ToDefinition.
-        var def = new S7TagDefinition("Setpoint", "DB10.DBD0", S7DataType.Float32, Writable: true, WriteIdempotent: true);
-
-        var row = S7DriverPage.S7TagRow.FromDefinition(def);
-        row.Name = "SetpointRenamed";
-        row.Writable = false;
-        var back = row.ToDefinition();
-
-        back.Name.ShouldBe("SetpointRenamed");
-        back.Writable.ShouldBeFalse();
-        // Un-edited field carried through via _source.
-        back.WriteIdempotent.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void S7TagRow_ValidateRow_RejectsDuplicateNames()
-    {
-        var all = new List<S7DriverPage.S7TagRow>
-        {
-            S7DriverPage.S7TagRow.FromDefinition(new S7TagDefinition("Speed", "DB1.DBD0", S7DataType.Float32)),
-            S7DriverPage.S7TagRow.FromDefinition(new S7TagDefinition("Status", "DB1.DBW4", S7DataType.Int16)),
-        };
-
-        // Editing index 1 to a name that case-insensitively collides with index 0.
-        var edited = all[1].Clone();
-        edited.Name = "speed";
-        S7DriverPage.S7TagRow.ValidateRow(edited, all, editIndex: 1)
-            .ShouldBe("Duplicate tag name 'speed'.");
-
-        // Required-name guard.
-        var blank = new S7DriverPage.S7TagRow();
-        S7DriverPage.S7TagRow.ValidateRow(blank, all, editIndex: null)
-            .ShouldBe("Name is required.");
-
-        // Unique name passes.
-        var ok = all[1].Clone();
-        ok.Name = "Torque";
-        S7DriverPage.S7TagRow.ValidateRow(ok, all, editIndex: 1).ShouldBeNull();
-    }
-
-    [Fact]
-    public void TagList_SerializeRoundTrip_PreservesTags()
-    {
-        var opts = new S7DriverOptions
-        {
-            Host = "10.1.1.1",
-            Tags =
-            [
-                new S7TagDefinition("Speed",  "DB1.DBD0", S7DataType.Float32, Writable: true),
-                new S7TagDefinition("Name",   "DB2.DBB0", S7DataType.String,  Writable: false, StringLength: 32),
-            ],
-        };
-
-        var optsSkip = new JsonSerializerOptions(_opts)
-        {
-            UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
-        };
-        var json = JsonSerializer.Serialize(opts, optsSkip);
-        var back = JsonSerializer.Deserialize<S7DriverOptions>(json, optsSkip);
-
-        back.ShouldNotBeNull();
-        back.Tags.Count.ShouldBe(2);
-        back.Tags[0].Name.ShouldBe("Speed");
-        back.Tags[0].Address.ShouldBe("DB1.DBD0");
-        back.Tags[0].DataType.ShouldBe(S7DataType.Float32);
-        back.Tags[0].Writable.ShouldBeTrue();
-        back.Tags[1].Name.ShouldBe("Name");
-        back.Tags[1].DataType.ShouldBe(S7DataType.String);
-        back.Tags[1].StringLength.ShouldBe(32);
-        back.Tags[1].Writable.ShouldBeFalse();
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ScriptAnalysis/ScriptTagCatalogTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ScriptAnalysis/ScriptTagCatalogTests.cs
index 10259d21..3d2db5fe 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ScriptAnalysis/ScriptTagCatalogTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ScriptAnalysis/ScriptTagCatalogTests.cs
@@ -15,9 +15,11 @@ namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests.ScriptAnalysis;
 /// <remarks>
 /// Fidelity finding (see <see cref="ScriptTagCatalog"/> doc comment): the runtime Akka path resolves
 /// a <c>ctx.GetTag</c> literal against the driver <b>FullName</b> (the wire reference in
-/// <c>Tag.TagConfig.FullName</c>), NOT the UNS browse path — the UNS-path engine is dormant. The
-/// catalog therefore emits the FullName for equipment tags, the MXAccess dot-ref for FolderPath-scoped
-/// tags (EquipmentId null), and the leaf Name for virtual tags, and deliberately omits UNS browse paths. These
+/// <c>Tag.TagConfig.FullName</c>), NOT the UNS browse path — the UNS-path engine is dormant. v3: Tag is
+/// Raw-only (no <c>EquipmentId</c>/<c>FolderPath</c>/<c>DriverInstanceId</c>), so the catalog projects
+/// the surviving <c>Name</c>/<c>DataType</c>/<c>TagConfig</c> columns: the resolvable path derives from
+/// the <c>TagConfig.FullName</c> field when present, else the tag <c>Name</c>; the projected
+/// <c>DriverInstanceId</c> is always <see langword="null"/>. Virtual tags emit their leaf Name. These
 /// assertions check the resolvable key is present AND that the UNS browse paths are absent.
 /// </remarks>
 [Trait("Category", "Unit")]
@@ -59,26 +61,23 @@ public sealed class ScriptTagCatalogTests
             MachineCode = "machine_001",
         });
 
-        // Equipment driver tag — the GetTag key is the driver FullName from TagConfig.
+        // Raw tag — the GetTag key is the driver FullName from TagConfig.
         db.Tags.Add(new Tag
         {
             TagId = "TAG-EQ",
-            DriverInstanceId = "DRV-1",
-            EquipmentId = "EQ-1",
+            DeviceId = "DEV-1",
             Name = "Speed",
             DataType = "Float",
             AccessLevel = TagAccessLevel.Read,
             TagConfig = "{\"FullName\":\"Motor.Speed\"}",
         });
 
-        // FolderPath-scoped tag — EquipmentId null, FolderPath set; subscribes by "FolderPath.Name".
+        // Raw tag whose FullName is an MXAccess dot-ref; resolves by that FullName.
         db.Tags.Add(new Tag
         {
             TagId = "TAG-SP",
-            DriverInstanceId = "DRV-GALAXY",
-            EquipmentId = null,
+            DeviceId = "DEV-1",
             Name = "DownloadPath",
-            FolderPath = "DelmiaReceiver_001",
             DataType = "String",
             AccessLevel = TagAccessLevel.Read,
             TagConfig = "{\"FullName\":\"DelmiaReceiver_001.DownloadPath\"}",
@@ -174,8 +173,7 @@ public sealed class ScriptTagCatalogTests
             db.Tags.Add(new Tag
             {
                 TagId = "TAG-BAD",
-                DriverInstanceId = "DRV-1",
-                EquipmentId = "EQ-1",
+                DeviceId = "DEV-1",
                 Name = "Broken",
                 DataType = "Float",
                 AccessLevel = TagAccessLevel.Read,
@@ -205,10 +203,8 @@ public sealed class ScriptTagCatalogTests
             db.Tags.Add(new Tag
             {
                 TagId = "TAG-SP-ROOT",
-                DriverInstanceId = "DRV-GALAXY",
-                EquipmentId = null,
+                DeviceId = "DEV-1",
                 Name = "RootScalar",
-                FolderPath = null,
                 DataType = "String",
                 AccessLevel = TagAccessLevel.Read,
                 TagConfig = "{\"FullName\":\"RootScalar\"}",
@@ -233,8 +229,8 @@ public sealed class ScriptTagCatalogTests
         paths.ShouldBeEmpty();
     }
 
-    /// <summary>A FolderPath-scoped tag resolves by its "FolderPath.Name" dot-ref to a Tag-kind info
-    /// with the configured DataType + DriverInstanceId.</summary>
+    /// <summary>A raw tag whose FullName is a dot-ref resolves by that FullName to a Tag-kind info with
+    /// the configured DataType. v3: Tag no longer binds a driver, so the projected DriverInstanceId is null.</summary>
     [Fact]
     public async Task GetTagInfo_unbound_tag_returns_tag_info()
     {
@@ -247,7 +243,7 @@ public sealed class ScriptTagCatalogTests
         info!.Path.ShouldBe("DelmiaReceiver_001.DownloadPath");
         info.Kind.ShouldBe("Tag");
         info.DataType.ShouldBe("String");
-        info.DriverInstanceId.ShouldBe("DRV-GALAXY");
+        info.DriverInstanceId.ShouldBeNull();
     }
 
     /// <summary>A virtual tag resolves by its leaf Name to a "Virtual tag"-kind info with no driver.</summary>
@@ -353,8 +349,7 @@ public sealed class ScriptTagCatalogTests
             db.Tags.Add(new Tag
             {
                 TagId = "TAG-EQ2",
-                DriverInstanceId = "DRV-1",
-                EquipmentId = "EQ-1",
+                DeviceId = "DEV-1",
                 Name = "Speed2",
                 DataType = "Float",
                 AccessLevel = TagAccessLevel.Read,
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/TwinCATDriverPageFormSerializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/TwinCATDriverPageFormSerializationTests.cs
index 67f41ca3..2a3ad37d 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/TwinCATDriverPageFormSerializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/TwinCATDriverPageFormSerializationTests.cs
@@ -31,7 +31,6 @@ public sealed class TwinCATDriverPageFormSerializationTests
             },
             ProbeTimeoutSeconds = 20,
             Devices = [],
-            Tags = [],
         };
 
         var json = JsonSerializer.Serialize(original, _opts);
@@ -48,7 +47,6 @@ public sealed class TwinCATDriverPageFormSerializationTests
         back.Probe.Timeout.ShouldBe(TimeSpan.FromSeconds(3));
         back.ProbeTimeoutSeconds.ShouldBe(20);
         back.Devices.ShouldBeEmpty();
-        back.Tags.ShouldBeEmpty();
     }
 
     [Fact]
@@ -84,7 +82,7 @@ public sealed class TwinCATDriverPageFormSerializationTests
 
         var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
             .TwinCATDriverPage.FormModel.FromOptions(opts);
-        var roundTripped = form.ToOptions([], []);
+        var roundTripped = form.ToOptions([]);
 
         roundTripped.Timeout.ShouldBe(TimeSpan.FromSeconds(3));
         roundTripped.UseNativeNotifications.ShouldBeTrue();
@@ -140,69 +138,20 @@ public sealed class TwinCATDriverPageFormSerializationTests
         error.ShouldContain("Duplicate");
     }
 
-    [Fact]
-    public void TagRow_RoundTrip_PreservesEditableFields()
-    {
-        var def = new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real, Writable: false);
-
-        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(def);
-        var back = row.ToDefinition();
-
-        back.Name.ShouldBe("Speed");
-        back.DeviceHostAddress.ShouldBe("192.168.0.1.1.1:851");
-        back.SymbolPath.ShouldBe("MAIN.rSpeed");
-        back.DataType.ShouldBe(TwinCATDataType.Real);
-        back.Writable.ShouldBeFalse();
-    }
+    // v3 Batch-1 migration: the pre-declared Tags editor (TwinCATDriverPage.TwinCATTagRow +
+    // TwinCATDriverOptions.Tags) was retired — tags moved to the Raw tree (/raw, Batch 2). The former
+    // TagRow_* tests and the tag leg of FormModel_ToOptions_* were removed. The multi-device Devices
+    // editor is RETAINED, so its coverage (DeviceRow_* + the device-list serialization below) stays.
 
     [Fact]
-    public void TagRow_CarriesThroughUneditedWriteIdempotent()
-    {
-        // WriteIdempotent is not exposed by the editor; it must survive a load→edit→save via _source.
-        var def = new TwinCATTagDefinition("Cmd", "192.168.0.1.1.1:851", "GVL.Start", TwinCATDataType.Bool,
-            Writable: true, WriteIdempotent: true);
-
-        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(def);
-        row.Name = "CmdRenamed"; // touch an edited field
-        var back = row.ToDefinition();
-
-        back.Name.ShouldBe("CmdRenamed");
-        back.WriteIdempotent.ShouldBeTrue();
-    }
-
-    [Fact]
-    public void TagRow_ValidateRow_RejectsDuplicateName()
-    {
-        var existing = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(
-                new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real));
-        var dup = new ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .TwinCATDriverPage.TwinCATTagRow { Name = "SPEED" }; // case-insensitive collision
-
-        var all = new[] { existing, dup };
-        var error = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
-            .TwinCATDriverPage.TwinCATTagRow.ValidateRow(dup, all, editIndex: 1);
-
-        error.ShouldNotBeNull();
-        error.ShouldContain("Duplicate");
-    }
-
-    [Fact]
-    public void FormModel_ToOptions_SerializesDeviceAndTagLists()
+    public void FormModel_ToOptions_SerializesDeviceList()
     {
         var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
             .TwinCATDriverPage.FormModel.FromOptions(new TwinCATDriverOptions());
 
         var devices = new[] { new TwinCATDeviceOptions("192.168.0.1.1.1:851", "PLC1") };
-        var tags = new[]
-        {
-            new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real,
-                Writable: true, WriteIdempotent: true),
-        };
 
-        var opts = form.ToOptions(devices, tags);
+        var opts = form.ToOptions(devices);
         var json = JsonSerializer.Serialize(opts, _opts);
         var back = JsonSerializer.Deserialize<TwinCATDriverOptions>(json, _opts);
 
@@ -210,12 +159,5 @@ public sealed class TwinCATDriverPageFormSerializationTests
         back.Devices.Count.ShouldBe(1);
         back.Devices[0].HostAddress.ShouldBe("192.168.0.1.1.1:851");
         back.Devices[0].DeviceName.ShouldBe("PLC1");
-        back.Tags.Count.ShouldBe(1);
-        back.Tags[0].Name.ShouldBe("Speed");
-        back.Tags[0].DeviceHostAddress.ShouldBe("192.168.0.1.1.1:851");
-        back.Tags[0].SymbolPath.ShouldBe("MAIN.rSpeed");
-        back.Tags[0].DataType.ShouldBe(TwinCATDataType.Real);
-        back.Tags[0].Writable.ShouldBeTrue();
-        back.Tags[0].WriteIdempotent.ShouldBeTrue();
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/OpcUaClientTagConfigModelTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/OpcUaClientTagConfigModelTests.cs
index 05ffcf02..376344cf 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/OpcUaClientTagConfigModelTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/OpcUaClientTagConfigModelTests.cs
@@ -4,6 +4,11 @@ using ZB.MOM.WW.OtOpcUa.AdminUI.Uns.TagEditors;
 
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Uns;
 
+// v3 Batch-1 migration: OpcUaClientTagConfigModel's address key was renamed FullName → NodeId and
+// its serialized JSON key moved from PascalCase "FullName" to camelCase "nodeId" (TagConfig no longer
+// carries identity; the upstream node reference is an ordinary driver-address field). The tests below
+// track that rename; the preserve-unknown-keys round-trip coverage (unrecognised keys + the TagModal
+// isHistorized/historianTagname merge keys) is retained unchanged.
 public sealed class OpcUaClientTagConfigModelTests
 {
     [Theory]
@@ -15,52 +20,52 @@ public sealed class OpcUaClientTagConfigModelTests
     {
         var m = OpcUaClientTagConfigModel.FromJson(json);
 
-        m.FullName.ShouldBe("");
+        m.NodeId.ShouldBe("");
     }
 
     [Fact]
-    public void FromJson_reads_FullName()
+    public void FromJson_reads_NodeId()
     {
         var m = OpcUaClientTagConfigModel.FromJson(
-            """{"FullName":"nsu=urn:srv;s=Line3.Temp"}""");
+            """{"nodeId":"nsu=urn:srv;s=Line3.Temp"}""");
 
-        m.FullName.ShouldBe("nsu=urn:srv;s=Line3.Temp");
+        m.NodeId.ShouldBe("nsu=urn:srv;s=Line3.Temp");
     }
 
     [Fact]
-    public void Round_trip_preserves_FullName()
+    public void Round_trip_preserves_NodeId()
     {
-        var m = new OpcUaClientTagConfigModel { FullName = "ns=2;s=Line3.Temp" };
+        var m = new OpcUaClientTagConfigModel { NodeId = "ns=2;s=Line3.Temp" };
 
         var json = m.ToJson();
         var m2 = OpcUaClientTagConfigModel.FromJson(json);
 
-        m2.FullName.ShouldBe("ns=2;s=Line3.Temp");
+        m2.NodeId.ShouldBe("ns=2;s=Line3.Temp");
     }
 
     [Fact]
-    public void ToJson_emits_PascalCase_FullName()
+    public void ToJson_emits_camelCase_NodeId()
     {
-        var m = new OpcUaClientTagConfigModel { FullName = "ns=2;s=Line3.Temp" };
+        var m = new OpcUaClientTagConfigModel { NodeId = "ns=2;s=Line3.Temp" };
 
         var json = m.ToJson();
 
-        // FullName is the composer/walker contract key — PascalCase, case-sensitive.
-        json.ShouldContain("\"FullName\":\"ns=2;s=Line3.Temp\"");
-        json.ShouldNotContain("\"fullName\"", Case.Sensitive);
+        // nodeId is the v3 address key — camelCase, replacing the legacy PascalCase FullName identity key.
+        json.ShouldContain("\"nodeId\":\"ns=2;s=Line3.Temp\"");
+        json.ShouldNotContain("\"FullName\"", Case.Sensitive);
     }
 
     [Fact]
     public void FromJson_then_ToJson_preserves_unknown_keys()
     {
         var json = OpcUaClientTagConfigModel
-            .FromJson("""{"FullName":"ns=2;s=X","samplingIntervalMs":250}""")
+            .FromJson("""{"nodeId":"ns=2;s=X","samplingIntervalMs":250}""")
             .ToJson();
 
         json.ShouldContain("samplingIntervalMs");
         json.ShouldContain("250");
         // and the exposed field still round-trips
-        json.ShouldContain("\"FullName\":\"ns=2;s=X\"");
+        json.ShouldContain("\"nodeId\":\"ns=2;s=X\"");
     }
 
     [Fact]
@@ -69,32 +74,32 @@ public sealed class OpcUaClientTagConfigModelTests
         // The TagModal-merge seam writes isHistorized/historianTagname at the TagConfig root; this model
         // does NOT model them, so they must survive a load→save untouched as preserved unknown keys.
         var json = OpcUaClientTagConfigModel
-            .FromJson("""{"FullName":"ns=2;s=X","isHistorized":true,"historianTagname":"Line3_Temp"}""")
+            .FromJson("""{"nodeId":"ns=2;s=X","isHistorized":true,"historianTagname":"Line3_Temp"}""")
             .ToJson();
 
         json.ShouldContain("\"isHistorized\":true");
         json.ShouldContain("\"historianTagname\":\"Line3_Temp\"");
-        json.ShouldContain("\"FullName\":\"ns=2;s=X\"");
+        json.ShouldContain("\"nodeId\":\"ns=2;s=X\"");
     }
 
     [Fact]
-    public void ToJson_trims_FullName()
+    public void ToJson_trims_NodeId()
     {
-        var json = new OpcUaClientTagConfigModel { FullName = "  ns=2;s=X  " }.ToJson();
+        var json = new OpcUaClientTagConfigModel { NodeId = "  ns=2;s=X  " }.ToJson();
 
-        json.ShouldContain("\"FullName\":\"ns=2;s=X\"");
+        json.ShouldContain("\"nodeId\":\"ns=2;s=X\"");
     }
 
     [Fact]
-    public void Validate_returns_error_when_FullName_blank()
+    public void Validate_returns_error_when_NodeId_blank()
     {
         new OpcUaClientTagConfigModel().Validate().ShouldNotBeNullOrEmpty();
-        new OpcUaClientTagConfigModel { FullName = "   " }.Validate().ShouldNotBeNullOrEmpty();
+        new OpcUaClientTagConfigModel { NodeId = "   " }.Validate().ShouldNotBeNullOrEmpty();
     }
 
     [Fact]
-    public void Validate_returns_null_when_FullName_present()
+    public void Validate_returns_null_when_NodeId_present()
     {
-        new OpcUaClientTagConfigModel { FullName = "ns=2;s=X" }.Validate().ShouldBeNull();
+        new OpcUaClientTagConfigModel { NodeId = "ns=2;s=X" }.Validate().ShouldBeNull();
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagArrayConfigTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagArrayConfigTests.cs
index a10ef54c..c27614a3 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagArrayConfigTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagArrayConfigTests.cs
@@ -147,19 +147,19 @@ public sealed class TagArrayConfigTests
     /// Full seam: the array helper and a driver-typed editor compose over the same canonical TagConfig
     /// blob without clobbering each other. Setting the array keys, round-tripping through the OpcUaClient
     /// typed editor (FromJson → ToJson), then reading the array keys back recovers them intact — and the
-    /// editor's own FullName field survives the array merge.
+    /// editor's own NodeId field survives the array merge.
     /// </summary>
     [Fact]
     public void Array_keys_survive_a_typed_editor_round_trip()
     {
-        var withArray = TagArrayConfig.Set("""{"FullName":"ns=2;s=X"}""", isArray: true, arrayLength: 12);
+        var withArray = TagArrayConfig.Set("""{"nodeId":"ns=2;s=X"}""", isArray: true, arrayLength: 12);
 
         var afterEditor = OpcUaClientTagConfigModel.FromJson(withArray).ToJson();
 
         var a = TagArrayConfig.Read(afterEditor);
         a.IsArray.ShouldBeTrue();
         a.ArrayLength.ShouldBe(12u);
-        OpcUaClientTagConfigModel.FromJson(afterEditor).FullName.ShouldBe("ns=2;s=X");
+        OpcUaClientTagConfigModel.FromJson(afterEditor).NodeId.ShouldBe("ns=2;s=X");
     }
 
     /// <summary>The array helper and the historize helper compose over the same blob (both preserve
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagConfigValidatorTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagConfigValidatorTests.cs
index b5f21a45..385b9538 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagConfigValidatorTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagConfigValidatorTests.cs
@@ -37,9 +37,10 @@ public sealed class TagConfigValidatorTests
         TagConfigValidator.Validate(driverType, null).ShouldNotBeNullOrEmpty();
     }
 
+    // v3 Batch-1: the OpcUaClient editor's address key was renamed FullName → nodeId (camelCase).
     [Fact]
-    public void OpcUaClient_with_full_name_is_valid()
-        => TagConfigValidator.Validate("OpcUaClient", """{"FullName":"ns=2;s=Line3.Temp"}""").ShouldBeNull();
+    public void OpcUaClient_with_node_id_is_valid()
+        => TagConfigValidator.Validate("OpcUaClient", """{"nodeId":"ns=2;s=Line3.Temp"}""").ShouldBeNull();
 
     [Fact]
     public void S7_with_address_is_valid()
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagHistorizeConfigTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagHistorizeConfigTests.cs
index 98e8f964..159691d9 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagHistorizeConfigTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/TagHistorizeConfigTests.cs
@@ -128,19 +128,19 @@ public sealed class TagHistorizeConfigTests
     /// Full seam: the history helper and a driver-typed editor compose over the same canonical TagConfig
     /// blob without clobbering each other. Setting the history keys, round-tripping through the
     /// OpcUaClient typed editor (FromJson → ToJson), then reading the history keys back recovers them
-    /// intact — and the editor's own FullName field survives the history merge.
+    /// intact — and the editor's own NodeId field survives the history merge.
     /// </summary>
     [Fact]
     public void History_keys_survive_a_typed_editor_round_trip()
     {
         var withHistory = TagHistorizeConfig.Set(
-            """{"FullName":"ns=2;s=X"}""", isHistorized: true, historianTagname: "TN");
+            """{"nodeId":"ns=2;s=X"}""", isHistorized: true, historianTagname: "TN");
 
         var afterEditor = OpcUaClientTagConfigModel.FromJson(withHistory).ToJson();
 
         var h = TagHistorizeConfig.Read(afterEditor);
         h.IsHistorized.ShouldBeTrue();
         h.HistorianTagname.ShouldBe("TN");
-        OpcUaClientTagConfigModel.FromJson(afterEditor).FullName.ShouldBe("ns=2;s=X");
+        OpcUaClientTagConfigModel.FromJson(afterEditor).NodeId.ShouldBe("ns=2;s=X");
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceAreaLineTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceAreaLineTests.cs
index efefed76..7abd4cd9 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceAreaLineTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceAreaLineTests.cs
@@ -87,10 +87,15 @@ public sealed class UnsTreeServiceAreaLineTests
         area.ClusterId.ShouldBe("MAIN");
     }
 
-    /// <summary>The #122 guard blocks moving an area to a new cluster when driver-bound
-    /// equipment would be orphaned from its driver's cluster.</summary>
+    /// <summary>
+    /// v3 Batch-1: the decision-#122 driver-orphan guard was RETIRED — equipment no longer binds a
+    /// driver (<c>Equipment.DriverInstanceId</c> is gone), so a cluster move can never orphan
+    /// driver-bound equipment. The former blocked/allowed guard tests are replaced by this one, which
+    /// proves a cross-cluster area reassignment now succeeds unconditionally (equipment under the area
+    /// rides along). The equipment↔driver cluster invariant is re-covered by the Batch-2 Raw-tree tests.
+    /// </summary>
     [Fact]
-    public async Task UpdateArea_reassign_cluster_blocked_when_driver_bound_equipment_would_orphan()
+    public async Task UpdateArea_reassign_cluster_now_allowed_guard_retired()
     {
         var (service, dbName) = Fresh();
 
@@ -106,16 +111,6 @@ public sealed class UnsTreeServiceAreaLineTests
                 UnsLineId = "LINE-X",
                 Name = "m",
                 MachineCode = "machine_x",
-                DriverInstanceId = "DRV-MAIN",
-            });
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-MAIN",
-                ClusterId = "MAIN",
-                NamespaceId = "NS-1",
-                Name = "drv",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
             });
             db.SaveChanges();
             rv = db.UnsAreas.Single(a => a.UnsAreaId == "AREA-X").RowVersion;
@@ -123,97 +118,12 @@ public sealed class UnsTreeServiceAreaLineTests
 
         var result = await service.UpdateAreaAsync("AREA-X", "a", null, "SITE-A", rv);
 
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("decision #122");
-        result.Error.ShouldContain("EQ-BOUND");
-        result.Error.ShouldContain("SITE-A");
-        result.Error.ShouldContain("MAIN");
-
-        // The area must not have been moved.
-        using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.UnsAreas.Single(a => a.UnsAreaId == "AREA-X").ClusterId.ShouldBe("MAIN");
-    }
-
-    /// <summary>The #122 guard allows the move when the area's driver-bound equipment's driver
-    /// is already in the target cluster (driverCluster == newClusterId → no orphan).</summary>
-    [Fact]
-    public async Task UpdateArea_reassign_cluster_allowed_when_driver_is_in_target_cluster()
-    {
-        // Seed: AREA-Z in cluster MAIN, a line, equipment bound to DRV-SITE-A whose cluster is
-        // SITE-A.  Reassigning the area to SITE-A must be allowed because the driver is already
-        // there — the #122 guard's `driverCluster != newClusterId` condition is false.
-        var (service, dbName) = Fresh();
-
-        byte[] rv;
-        using (var db = UnsTreeTestDb.CreateNamed(dbName))
-        {
-            db.UnsAreas.Add(new UnsArea { UnsAreaId = "AREA-Z", ClusterId = "MAIN", Name = "a" });
-            db.UnsLines.Add(new UnsLine { UnsLineId = "LINE-Z", UnsAreaId = "AREA-Z", Name = "l" });
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-SITE-A",
-                ClusterId = "SITE-A",
-                NamespaceId = "NS-1",
-                Name = "drv",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
-            });
-            db.Equipment.Add(new Equipment
-            {
-                EquipmentId = "EQ-BOUND-Z",
-                EquipmentUuid = Guid.NewGuid(),
-                UnsLineId = "LINE-Z",
-                Name = "m",
-                MachineCode = "machine_z",
-                DriverInstanceId = "DRV-SITE-A",
-            });
-            db.SaveChanges();
-            rv = db.UnsAreas.Single(a => a.UnsAreaId == "AREA-Z").RowVersion;
-        }
-
-        var result = await service.UpdateAreaAsync("AREA-Z", "a", null, "SITE-A", rv);
-
         result.Ok.ShouldBeTrue();
         result.Error.ShouldBeNull();
 
-        // Verify the area actually moved to SITE-A via a fresh context.
+        // The area moved to SITE-A.
         using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.UnsAreas.Single(a => a.UnsAreaId == "AREA-Z").ClusterId.ShouldBe("SITE-A");
-    }
-
-    /// <summary>The #122 guard allows the move when the equipment under the area is driver-less
-    /// (DriverInstanceId == null).</summary>
-    [Fact]
-    public async Task UpdateArea_reassign_cluster_allowed_when_equipment_driverless()
-    {
-        var (service, dbName) = Fresh();
-
-        byte[] rv;
-        using (var db = UnsTreeTestDb.CreateNamed(dbName))
-        {
-            db.UnsAreas.Add(new UnsArea { UnsAreaId = "AREA-Y", ClusterId = "MAIN", Name = "a" });
-            db.UnsLines.Add(new UnsLine { UnsLineId = "LINE-Y", UnsAreaId = "AREA-Y", Name = "l" });
-            db.Equipment.Add(new Equipment
-            {
-                EquipmentId = "EQ-FREE",
-                EquipmentUuid = Guid.NewGuid(),
-                UnsLineId = "LINE-Y",
-                Name = "m",
-                MachineCode = "machine_y",
-                DriverInstanceId = null,
-            });
-            db.SaveChanges();
-            rv = db.UnsAreas.Single(a => a.UnsAreaId == "AREA-Y").RowVersion;
-        }
-
-        var result = await service.UpdateAreaAsync("AREA-Y", "a", null, "SITE-A", rv);
-
-        result.Ok.ShouldBeTrue();
-        result.Error.ShouldBeNull();
-
-        using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.UnsAreas.Single(a => a.UnsAreaId == "AREA-Y").ClusterId.ShouldBe("SITE-A");
+        verify.UnsAreas.Single(a => a.UnsAreaId == "AREA-X").ClusterId.ShouldBe("SITE-A");
     }
 
     /// <summary>Updating an area that no longer exists returns the row-gone error.</summary>
@@ -337,30 +247,22 @@ public sealed class UnsTreeServiceAreaLineTests
         result.Error.ShouldBe("Row no longer exists.");
     }
 
-    /// <summary>The #122 guard blocks reparenting a line to an area in a different cluster when
-    /// the line's equipment is driver-bound (the driver lives in the original cluster).</summary>
+    /// <summary>
+    /// v3 Batch-1: the decision-#122 driver-orphan guard was RETIRED (equipment no longer binds a
+    /// driver). The former blocked/allowed line-reparent guard tests are replaced by this one, which
+    /// proves reparenting a line to an area in a different cluster now succeeds unconditionally.
+    /// </summary>
     [Fact]
-    public async Task UpdateLine_reparent_to_other_cluster_blocked_when_driver_bound()
+    public async Task UpdateLine_reparent_to_other_cluster_now_allowed_guard_retired()
     {
         var (service, dbName) = Fresh();
 
         byte[] rv;
         using (var db = UnsTreeTestDb.CreateNamed(dbName))
         {
-            // Source area A1 in cluster MAIN.
             db.UnsAreas.Add(new UnsArea { UnsAreaId = "A1-MAIN", ClusterId = "MAIN", Name = "area-main" });
-            // Target area A2 in cluster SITE-A.
             db.UnsAreas.Add(new UnsArea { UnsAreaId = "A2-SITE-A", ClusterId = "SITE-A", Name = "area-site-a" });
             db.UnsLines.Add(new UnsLine { UnsLineId = "LINE-BOUND", UnsAreaId = "A1-MAIN", Name = "line" });
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-MAIN-122",
-                ClusterId = "MAIN",
-                NamespaceId = "NS-1",
-                Name = "drv",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
-            });
             db.Equipment.Add(new Equipment
             {
                 EquipmentId = "EQ-LINE-BOUND",
@@ -368,7 +270,6 @@ public sealed class UnsTreeServiceAreaLineTests
                 UnsLineId = "LINE-BOUND",
                 Name = "eq",
                 MachineCode = "mc_line_bound",
-                DriverInstanceId = "DRV-MAIN-122",
             });
             db.SaveChanges();
             rv = db.UnsLines.Single(l => l.UnsLineId == "LINE-BOUND").RowVersion;
@@ -376,52 +277,12 @@ public sealed class UnsTreeServiceAreaLineTests
 
         var result = await service.UpdateLineAsync("LINE-BOUND", "line", null, "A2-SITE-A", rv);
 
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("decision #122");
-        result.Error.ShouldContain("EQ-LINE-BOUND");
-        result.Error.ShouldContain("A2-SITE-A");
-        result.Error.ShouldContain("MAIN");
-
-        // The line must not have moved.
-        using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.UnsLines.Single(l => l.UnsLineId == "LINE-BOUND").UnsAreaId.ShouldBe("A1-MAIN");
-    }
-
-    /// <summary>The #122 guard allows reparenting a line to an area in a different cluster when
-    /// the line's equipment is driver-less (DriverInstanceId == null).</summary>
-    [Fact]
-    public async Task UpdateLine_reparent_to_other_cluster_allowed_when_equipment_driverless()
-    {
-        var (service, dbName) = Fresh();
-
-        byte[] rv;
-        using (var db = UnsTreeTestDb.CreateNamed(dbName))
-        {
-            db.UnsAreas.Add(new UnsArea { UnsAreaId = "A1-FREE", ClusterId = "MAIN", Name = "area-main" });
-            db.UnsAreas.Add(new UnsArea { UnsAreaId = "A2-FREE", ClusterId = "SITE-A", Name = "area-site-a" });
-            db.UnsLines.Add(new UnsLine { UnsLineId = "LINE-FREE", UnsAreaId = "A1-FREE", Name = "line" });
-            db.Equipment.Add(new Equipment
-            {
-                EquipmentId = "EQ-LINE-FREE",
-                EquipmentUuid = Guid.NewGuid(),
-                UnsLineId = "LINE-FREE",
-                Name = "eq",
-                MachineCode = "mc_line_free",
-                DriverInstanceId = null,
-            });
-            db.SaveChanges();
-            rv = db.UnsLines.Single(l => l.UnsLineId == "LINE-FREE").RowVersion;
-        }
-
-        var result = await service.UpdateLineAsync("LINE-FREE", "line", null, "A2-FREE", rv);
-
         result.Ok.ShouldBeTrue();
         result.Error.ShouldBeNull();
 
-        // The line's UnsAreaId must have changed to A2-FREE.
+        // The line moved to the target area.
         using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.UnsLines.Single(l => l.UnsLineId == "LINE-FREE").UnsAreaId.ShouldBe("A2-FREE");
+        verify.UnsLines.Single(l => l.UnsLineId == "LINE-BOUND").UnsAreaId.ShouldBe("A2-SITE-A");
     }
 
     // ----- DeleteLine -----
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceDeleteClusterTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceDeleteClusterTests.cs
index 4ad0aa42..d11c303e 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceDeleteClusterTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceDeleteClusterTests.cs
@@ -105,7 +105,6 @@ public sealed class UnsTreeServiceDeleteClusterTests
             {
                 DriverInstanceId = "DRV-CL",
                 ClusterId = "CL-DRV",
-                NamespaceId = "NS-1",
                 Name = "drv",
                 DriverType = "Modbus",
                 DriverConfig = "{}",
@@ -151,33 +150,10 @@ public sealed class UnsTreeServiceDeleteClusterTests
         verify.ServerClusters.Any(c => c.ClusterId == "CL-NODE").ShouldBeTrue();
     }
 
-    /// <summary>A cluster with a namespace refuses deletion with a friendly message and stays put.</summary>
-    [Fact]
-    public async Task DeleteCluster_with_namespace_refuses_and_keeps_row()
-    {
-        var (service, dbName) = Fresh();
-        using (var db = UnsTreeTestDb.CreateNamed(dbName))
-        {
-            db.ServerClusters.Add(NewCluster("CL-NS", "zb"));
-            db.Namespaces.Add(new Namespace
-            {
-                NamespaceId = "NS-CL",
-                ClusterId = "CL-NS",
-                Kind = NamespaceKind.Equipment,
-                NamespaceUri = "urn:zb:cl-ns:equipment",
-            });
-            db.SaveChanges();
-        }
-
-        var result = await service.DeleteClusterAsync("CL-NS");
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("CL-NS");
-
-        using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.ServerClusters.Any(c => c.ClusterId == "CL-NS").ShouldBeTrue();
-    }
+    // v3 Batch-1: the Namespace entity was deleted (Raw/UNS split), so DescribeClusterChildrenAsync
+    // no longer carries a namespace child-check. The former DeleteCluster_with_namespace_refuses test
+    // was removed. The cluster-nodes / UNS-areas / driver-instances refuse-if-children checks (above)
+    // remain the enforced set.
 
     // ----- DeleteEnterprise -----
 
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentChildRowsTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentChildRowsTests.cs
index 8a4b4016..8d5f53a6 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentChildRowsTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentChildRowsTests.cs
@@ -14,16 +14,15 @@ public sealed class UnsTreeServiceEquipmentChildRowsTests
         return new UnsTreeService(UnsTreeTestDb.Factory(dbName));
     }
 
+    // v3 Batch-1: the equipment↔Tag binding was retired (Tag is Raw-only; authoring moved to the Raw
+    // tree in Batch 2). LoadTagsForEquipmentAsync is a stub that always returns empty — no equipment
+    // has bound driver tags to list. The former in-name-order / EquipmentId-scoping assertions moved
+    // with the authoring surface to the Batch-2 Raw-tree tests.
     [Fact]
-    public async Task LoadTagsForEquipment_returns_tags_in_name_order_scoped()
+    public async Task LoadTagsForEquipment_returns_empty_stub()
     {
         var rows = await SeededService().LoadTagsForEquipmentAsync(UnsTreeTestDb.SeededEquipmentId);
-        rows.Count.ShouldBe(2);                 // the EquipmentId=null orphan tag is excluded
-        rows[0].TagId.ShouldBe("TAG-2");        // "running" < "speed"
-        rows[0].Name.ShouldBe("running");
-        rows[0].DataType.ShouldBe("Boolean");
-        rows[1].TagId.ShouldBe("TAG-1");
-        rows[1].DataType.ShouldBe("Float");
+        rows.ShouldBeEmpty();
     }
 
     [Fact]
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
index 2a3c54e4..35059ec0 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
@@ -41,7 +41,6 @@ public sealed class UnsTreeServiceEquipmentTests
             {
                 DriverInstanceId = "DRV-1",
                 ClusterId = driverCluster,
-                NamespaceId = "NS-1",
                 Name = "drv",
                 DriverType = "Modbus",
                 DriverConfig = "{}",
@@ -125,7 +124,11 @@ public sealed class UnsTreeServiceEquipmentTests
         db.Equipment.Any(e => e.MachineCode == "machine_001").ShouldBeFalse();
     }
 
-    /// <summary>Binding equipment to a driver in the same cluster as the line is allowed.</summary>
+    /// <summary>
+    /// Passing a driver in the same cluster as the line passes the #122 guard and the equipment
+    /// persists. v3: the equipment↔driver binding column was retired, so the driver is validated by
+    /// the guard but not stored — the assertion drops to equipment existence.
+    /// </summary>
     [Fact]
     public async Task CreateEquipment_driver_in_same_cluster_allowed()
     {
@@ -138,7 +141,7 @@ public sealed class UnsTreeServiceEquipmentTests
         result.Error.ShouldBeNull();
 
         using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Equipment.Single(e => e.MachineCode == "machine_001").DriverInstanceId.ShouldBe("DRV-1");
+        db.Equipment.Single(e => e.MachineCode == "machine_001").UnsLineId.ShouldBe("LINE-1");
     }
 
     /// <summary>Driver-less equipment is allowed regardless of cluster (no #122 guard applies).</summary>
@@ -154,7 +157,7 @@ public sealed class UnsTreeServiceEquipmentTests
         result.Error.ShouldBeNull();
 
         using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Equipment.Single(e => e.MachineCode == "machine_001").DriverInstanceId.ShouldBeNull();
+        db.Equipment.Single(e => e.MachineCode == "machine_001").UnsLineId.ShouldBe("LINE-1");
     }
 
     /// <summary>
@@ -172,7 +175,6 @@ public sealed class UnsTreeServiceEquipmentTests
             {
                 DriverInstanceId = "DRV-1",
                 ClusterId = "MAIN",
-                NamespaceId = "NS-1",
                 Name = "drv",
                 DriverType = "Modbus",
                 DriverConfig = "{}",
@@ -286,8 +288,9 @@ public sealed class UnsTreeServiceEquipmentTests
         result.Error.ShouldNotBeNull();
         result.Error.ShouldContain("decision #122");
 
+        // The equipment row is unchanged (v3 has no persisted driver-binding column to check).
         using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.Equipment.Single(e => e.EquipmentId == equipmentId).DriverInstanceId.ShouldBeNull();
+        verify.Equipment.Single(e => e.EquipmentId == equipmentId).MachineCode.ShouldBe("machine_001");
     }
 
     /// <summary>Updating equipment with a MachineCode that already belongs to another row is blocked.</summary>
@@ -344,8 +347,9 @@ public sealed class UnsTreeServiceEquipmentTests
         result.Ok.ShouldBeTrue();
         result.Error.ShouldBeNull();
 
+        // v3: the driver passes the #122 guard but is not persisted (binding column retired).
         using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        verify.Equipment.Single(e => e.EquipmentId == equipmentId).DriverInstanceId.ShouldBe("DRV-1");
+        verify.Equipment.Single(e => e.EquipmentId == equipmentId).UnsLineId.ShouldBe("LINE-1");
     }
 
     /// <summary>CreateEquipmentAsync returns the generated EQ- id in <c>CreatedId</c> so callers can navigate to the new page.</summary>
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceImportTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceImportTests.cs
index 9ae706ed..6544cbb6 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceImportTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceImportTests.cs
@@ -36,7 +36,6 @@ public sealed class UnsTreeServiceImportTests
             {
                 DriverInstanceId = "DRV-1",
                 ClusterId = driverCluster,
-                NamespaceId = "NS-1",
                 Name = "drv",
                 DriverType = "Modbus",
                 DriverConfig = "{}",
@@ -194,7 +193,8 @@ public sealed class UnsTreeServiceImportTests
         result.Skipped.ShouldBe(0);
         result.Errors.ShouldBeEmpty();
 
+        // v3: the driver passes the #122 guard but is not persisted (binding column retired).
         using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Equipment.Single(e => e.MachineCode == "mc_1").DriverInstanceId.ShouldBe("DRV-1");
+        db.Equipment.Single(e => e.MachineCode == "mc_1").UnsLineId.ShouldBe("LINE-1");
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceLoadEditTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceLoadEditTests.cs
index 6fb14c66..d546617f 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceLoadEditTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceLoadEditTests.cs
@@ -108,7 +108,6 @@ public sealed class UnsTreeServiceLoadEditTests
             {
                 DriverInstanceId = "DRV-B",
                 ClusterId = UnsTreeTestDb.PopulatedClusterId,
-                NamespaceId = "NS-1",
                 Name = "modbus-b",
                 DriverType = "Modbus",
                 DriverConfig = "{}",
@@ -117,7 +116,6 @@ public sealed class UnsTreeServiceLoadEditTests
             {
                 DriverInstanceId = "DRV-A",
                 ClusterId = UnsTreeTestDb.PopulatedClusterId,
-                NamespaceId = "NS-1",
                 Name = "galaxy-a",
                 DriverType = "Galaxy",
                 DriverConfig = "{}",
@@ -127,7 +125,6 @@ public sealed class UnsTreeServiceLoadEditTests
             {
                 DriverInstanceId = "DRV-OTHER",
                 ClusterId = UnsTreeTestDb.EmptyClusterId,
-                NamespaceId = "NS-2",
                 Name = "other",
                 DriverType = "S7",
                 DriverConfig = "{}",
@@ -144,7 +141,11 @@ public sealed class UnsTreeServiceLoadEditTests
         drivers[1].Display.ShouldBe("DRV-B — modbus-b (Modbus)");
     }
 
-    /// <summary>Loading a seeded tag maps its fields, owning equipment, and a non-empty RowVersion.</summary>
+    /// <summary>
+    /// Loading a seeded Raw tag maps its surviving fields (Name/DataType/AccessLevel/TagConfig) and a
+    /// non-empty RowVersion. v3: Tag is Raw-only — the equipment + driver bindings were retired, so the
+    /// DTO's <c>EquipmentId</c> / <c>DriverInstanceId</c> project as empty strings.
+    /// </summary>
     [Fact]
     public async Task LoadTag_returns_dto()
     {
@@ -154,9 +155,9 @@ public sealed class UnsTreeServiceLoadEditTests
 
         dto.ShouldNotBeNull();
         dto.TagId.ShouldBe("TAG-1");
-        dto.EquipmentId.ShouldBe(UnsTreeTestDb.SeededEquipmentId);
+        dto.EquipmentId.ShouldBe(string.Empty);
         dto.Name.ShouldBe("speed");
-        dto.DriverInstanceId.ShouldBe("DRV-1");
+        dto.DriverInstanceId.ShouldBe(string.Empty);
         dto.DataType.ShouldBe("Float");
         dto.AccessLevel.ShouldBe(TagAccessLevel.Read);
         dto.TagConfig.ShouldBe("{}");
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceStructureTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceStructureTests.cs
index 195b213f..6b941b24 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceStructureTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceStructureTests.cs
@@ -70,8 +70,9 @@ public sealed class UnsTreeServiceStructureTests
             .Children.Single()
             .Children.Single();
 
-        // Seed: 2 driver tags + 1 virtual tag (the orphan tag has no equipment and is excluded).
-        equipment.ChildCount.ShouldBe(3);
+        // v3: Tag is Raw-only — driver tags no longer bind to equipment, so only the 1 virtual tag
+        // contributes to the per-equipment badge count (the 2 seeded raw tags are not counted).
+        equipment.ChildCount.ShouldBe(1);
         equipment.HasLazyChildren.ShouldBeFalse();
     }
 
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagDriversTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagDriversTests.cs
index fae92934..1faf05e9 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagDriversTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagDriversTests.cs
@@ -7,20 +7,20 @@ using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Uns;
 
 /// <summary>
-/// Verifies that <see cref="UnsTreeService.LoadTagDriversForEquipmentAsync"/> surfaces each
-/// candidate driver's <c>DriverType</c> and <c>DriverConfig</c> alongside its id and display string,
-/// so the UNS TagModal can dispatch to a per-driver-type typed tag-config editor (F-uns-1) and feed
-/// the selected gateway's config to the Galaxy live-browse address picker.
+/// v3 Batch-1 migration: the per-equipment candidate-driver loader
+/// (<see cref="UnsTreeService.LoadTagDriversForEquipmentAsync"/>) is RETIRED. The equipment↔driver
+/// binding and the <c>Namespace</c>/<c>NamespaceKind</c> entities were deleted — equipment no longer
+/// scopes a candidate-driver list, and per-driver-typed tag authoring moved to the Raw tree (/raw) in
+/// Batch 2. The loader now always returns empty; the former "surfaces DriverType/DriverConfig" test
+/// (which fed the TagModal editor dispatch + Galaxy live-browse picker) is replaced by the stub
+/// assertion below. That editor-dispatch coverage is re-established under the Batch-2 Raw-tree tests.
 /// </summary>
 [Trait("Category", "Unit")]
 public sealed class UnsTreeServiceTagDriversTests
 {
-    /// <summary>
-    /// A driver loaded for an equipment carries its <c>DriverType</c> and <c>DriverConfig</c> in the
-    /// returned tuple.
-    /// </summary>
+    /// <summary>The retired loader returns empty even when a matching cluster driver exists.</summary>
     [Fact]
-    public async Task LoadTagDriversForEquipment_surfaces_driver_type_and_config()
+    public async Task LoadTagDriversForEquipment_returns_empty_stub()
     {
         var dbName = $"uns-tagdrivers-{Guid.NewGuid():N}";
 
@@ -45,18 +45,10 @@ public sealed class UnsTreeServiceTagDriversTests
                 Name = "machine-1",
                 MachineCode = "machine_001",
             });
-            db.Namespaces.Add(new Namespace
-            {
-                NamespaceId = "NS-EQ",
-                ClusterId = "MAIN",
-                Kind = NamespaceKind.Equipment,
-                NamespaceUri = "urn:zb:eq",
-            });
             db.DriverInstances.Add(new DriverInstance
             {
                 DriverInstanceId = "DRV-EQ",
                 ClusterId = "MAIN",
-                NamespaceId = "NS-EQ",
                 Name = "equipment driver",
                 DriverType = "Modbus",
                 DriverConfig = """{"endpoint":"10.0.0.1:502"}""",
@@ -68,10 +60,6 @@ public sealed class UnsTreeServiceTagDriversTests
 
         var drivers = await service.LoadTagDriversForEquipmentAsync("EQ-1");
 
-        drivers.Count.ShouldBe(1);
-        drivers[0].DriverInstanceId.ShouldBe("DRV-EQ");
-        drivers[0].DriverType.ShouldBe("Modbus");
-        // The picker (Galaxy live-browse) opens its session against the selected driver's config.
-        drivers[0].DriverConfig.ShouldBe("""{"endpoint":"10.0.0.1:502"}""");
+        drivers.ShouldBeEmpty();
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagTests.cs
index 4f6ae96e..e2caffe7 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceTagTests.cs
@@ -1,4 +1,3 @@
-using Microsoft.EntityFrameworkCore;
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.AdminUI.Uns;
@@ -8,39 +7,46 @@ using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Uns;
 
 /// <summary>
-/// Verifies the equipment-bound Tag CRUD mutations on <see cref="UnsTreeService"/>, including
-/// TagConfig JSON validity, the namespace-kind guard (tree tags must bind to an Equipment-kind
-/// namespace), the decision-#122 driver-cluster guard, duplicate-id / duplicate-name guards, and
-/// the driver-candidate loader scoped to the equipment's cluster.
+/// v3 Batch-1 migration of the former equipment-bound Tag CRUD tests. Per-equipment tag authoring
+/// was RETIRED: <see cref="Tag"/> is now Raw-only (no <c>EquipmentId</c>/<c>DriverInstanceId</c>/
+/// <c>FolderPath</c>), the <c>Namespace</c>/<c>NamespaceKind</c> entities were deleted, and tag
+/// authoring moved to the Raw tree (<c>/raw</c>) in Batch 2. So <see cref="UnsTreeService"/>'s
+/// <c>CreateTagAsync</c> / <c>UpdateTagAsync</c> now return a uniform Batch-1 refusal, and
+/// <c>LoadTagsForEquipmentAsync</c> / <c>LoadTagDriversForEquipmentAsync</c> return empty. The tests
+/// below assert that stub contract (preserving the intent of the old CRUD-guard / driver-loader
+/// tests) plus the still-live <c>DeleteTagAsync</c> path (which continues to remove a raw Tag row).
 /// </summary>
 /// <remarks>
-/// The EF InMemory provider does not enforce <c>RowVersion</c> concurrency, so the
-/// <c>DbUpdateConcurrencyException</c> branches are not exercised here by design.
+/// The former TagConfig-JSON-validity, decision-#122 driver-cluster guard, Equipment-kind-namespace
+/// guard, and duplicate-id/name guards moved with the authoring surface to the Raw tree — re-covered
+/// under the Batch-2 Raw-tree service tests.
 /// </remarks>
 [Trait("Category", "Unit")]
 public sealed class UnsTreeServiceTagTests
 {
+    /// <summary>The Batch-1 refusal message the retired per-equipment tag authoring now returns.</summary>
+    private const string TagAuthoringMovedError = "Tag authoring moved to the Raw tree (/raw) in v3 Batch 2.";
+
     private static (UnsTreeService Service, string DbName) Fresh()
     {
         var dbName = $"uns-tag-{Guid.NewGuid():N}";
         return (new UnsTreeService(UnsTreeTestDb.Factory(dbName)), dbName);
     }
 
-    /// <summary>
-    /// Seeds an area→line→equipment path in <paramref name="equipmentCluster"/>. The equipment id is
-    /// always <c>EQ-1</c>. Optionally seeds an Equipment-kind driver (<c>DRV-EQ</c>) in the equipment's
-    /// cluster, a non-Equipment-kind (Simulated) driver (<c>DRV-SP</c>) in the equipment's cluster, and
-    /// an Equipment-kind driver (<c>DRV-OTHER</c>) in <paramref name="otherCluster"/>.
-    /// </summary>
-    private static void SeedHierarchyAndDrivers(
-        string dbName,
-        string equipmentCluster,
-        bool seedEquipmentDriver = false,
-        bool seedNonEquipmentDriver = false,
-        string? otherCluster = null)
+    /// <summary>Seeds an area→line→equipment path in <paramref name="cluster"/> under equipment <c>EQ-1</c>.</summary>
+    private static void SeedHierarchy(string dbName, string cluster = "MAIN")
     {
         using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.UnsAreas.Add(new UnsArea { UnsAreaId = "AREA-1", ClusterId = equipmentCluster, Name = "a" });
+        db.ServerClusters.Add(new ServerCluster
+        {
+            ClusterId = cluster,
+            Name = cluster,
+            Enterprise = "zb",
+            Site = "s",
+            RedundancyMode = RedundancyMode.None,
+            CreatedBy = "test",
+        });
+        db.UnsAreas.Add(new UnsArea { UnsAreaId = "AREA-1", ClusterId = cluster, Name = "a" });
         db.UnsLines.Add(new UnsLine { UnsLineId = "LINE-1", UnsAreaId = "AREA-1", Name = "l" });
         db.Equipment.Add(new Equipment
         {
@@ -50,303 +56,77 @@ public sealed class UnsTreeServiceTagTests
             Name = "machine-1",
             MachineCode = "machine_001",
         });
-
-        // Equipment-kind namespace in the equipment's cluster.
-        db.Namespaces.Add(new Namespace
-        {
-            NamespaceId = "NS-EQ",
-            ClusterId = equipmentCluster,
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:zb:eq",
-        });
-        // Non-Equipment-kind (Simulated) namespace in the equipment's cluster.
-        db.Namespaces.Add(new Namespace
-        {
-            NamespaceId = "NS-SP",
-            ClusterId = equipmentCluster,
-            Kind = NamespaceKind.Simulated,
-            NamespaceUri = "urn:zb:sp",
-        });
-
-        if (seedEquipmentDriver)
-        {
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-EQ",
-                ClusterId = equipmentCluster,
-                NamespaceId = "NS-EQ",
-                Name = "equipment driver",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
-            });
-        }
-
-        if (seedNonEquipmentDriver)
-        {
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-SP",
-                ClusterId = equipmentCluster,
-                NamespaceId = "NS-SP",
-                Name = "non-equipment driver",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
-            });
-        }
-
-        if (otherCluster is not null)
-        {
-            // Equipment-kind namespace + driver in a different cluster.
-            db.Namespaces.Add(new Namespace
-            {
-                NamespaceId = "NS-OTHER",
-                ClusterId = otherCluster,
-                Kind = NamespaceKind.Equipment,
-                NamespaceUri = "urn:zb:other",
-            });
-            db.DriverInstances.Add(new DriverInstance
-            {
-                DriverInstanceId = "DRV-OTHER",
-                ClusterId = otherCluster,
-                NamespaceId = "NS-OTHER",
-                Name = "other-cluster driver",
-                DriverType = "Modbus",
-                DriverConfig = "{}",
-            });
-        }
-
         db.SaveChanges();
     }
 
-    private static TagInput Input(
-        string tagId,
-        string name,
-        string driverInstanceId,
-        string tagConfig = "{}") =>
-        new(tagId, name, driverInstanceId, DataType: "Float",
+    private static TagInput Input(string tagId, string name, string tagConfig = "{}") =>
+        new(tagId, name, "DRV-EQ", DataType: "Float",
             AccessLevel: TagAccessLevel.Read, WriteIdempotent: false,
             PollGroupId: null, TagConfig: tagConfig);
 
-    // ----- CreateTag -----
+    // ----- CreateTag / UpdateTag: retired → Batch-1 refusal -----
 
-    /// <summary>A valid equipment-bound tag persists with EquipmentId set and FolderPath null.</summary>
+    /// <summary>Per-equipment tag creation is retired: the service returns the Batch-1 "moved to Raw tree" refusal.</summary>
     [Fact]
-    public async Task CreateTag_equipment_bound_persists()
+    public async Task CreateTag_is_retired_returns_batch1_stub()
     {
         var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
+        SeedHierarchy(dbName);
 
-        var result = await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-EQ"));
-
-        result.Ok.ShouldBeTrue();
-        result.Error.ShouldBeNull();
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        var tag = db.Tags.Single(t => t.TagId == "TAG-1");
-        tag.EquipmentId.ShouldBe("EQ-1");
-        tag.FolderPath.ShouldBeNull();
-        tag.DriverInstanceId.ShouldBe("DRV-EQ");
-        tag.Name.ShouldBe("speed");
-        tag.DataType.ShouldBe("Float");
-    }
-
-    /// <summary>A tag with invalid TagConfig JSON is blocked.</summary>
-    [Fact]
-    public async Task CreateTag_invalid_json_blocked()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-
-        var result = await service.CreateTagAsync(
-            "EQ-1", Input("TAG-1", "speed", "DRV-EQ", tagConfig: "{ not json"));
+        var result = await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed"));
 
         result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("TagConfig is not valid JSON.");
+        result.Error.ShouldBe(TagAuthoringMovedError);
 
         using var db = UnsTreeTestDb.CreateNamed(dbName);
         db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
     }
 
-    /// <summary>A tag with a null TagConfig is blocked with the friendly "not valid JSON" message
-    /// (rather than an unhandled ArgumentNullException) — AdminUI-002.</summary>
+    /// <summary>The refusal is uniform — it does not depend on equipment resolvability or TagConfig validity.</summary>
     [Fact]
-    public async Task CreateTag_with_null_TagConfig_returns_friendly_error()
+    public async Task CreateTag_refusal_is_uniform_even_for_unknown_equipment_or_bad_json()
     {
         var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
+        SeedHierarchy(dbName);
 
-        var result = await service.CreateTagAsync(
-            "EQ-1", Input("TAG-1", "speed", "DRV-EQ", tagConfig: null!));
+        (await service.CreateTagAsync("EQ-NOPE", Input("TAG-1", "speed"))).Error
+            .ShouldBe(TagAuthoringMovedError);
+        (await service.CreateTagAsync("EQ-1", Input("TAG-2", "speed", tagConfig: "{ not json"))).Error
+            .ShouldBe(TagAuthoringMovedError);
+    }
+
+    /// <summary>Per-equipment tag update is retired: the service returns the Batch-1 "moved to Raw tree" refusal.</summary>
+    [Fact]
+    public async Task UpdateTag_is_retired_returns_batch1_stub()
+    {
+        var (service, _) = Fresh();
+
+        var result = await service.UpdateTagAsync("TAG-1", Input("TAG-1", "renamed"), []);
 
         result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("TagConfig is not valid JSON.");
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
+        result.Error.ShouldBe(TagAuthoringMovedError);
     }
 
-    /// <summary>A tag with a blank/whitespace TagConfig is blocked with the friendly message — AdminUI-002.</summary>
-    [Fact]
-    public async Task CreateTag_with_blank_TagConfig_returns_friendly_error()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
+    // ----- DeleteTag: still live against a raw Tag row -----
 
-        var result = await service.CreateTagAsync(
-            "EQ-1", Input("TAG-1", "speed", "DRV-EQ", tagConfig: "   "));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("TagConfig is not valid JSON.");
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
-    }
-
-    /// <summary>Binding a tag to a driver in a different cluster than the equipment is blocked (#122).</summary>
-    [Fact]
-    public async Task CreateTag_driver_in_other_cluster_blocked()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", otherCluster: "SITE-A");
-
-        var result = await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-OTHER"));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("decision #122");
-        result.Error.ShouldContain("DRV-OTHER");
-        result.Error.ShouldContain("SITE-A");
-        result.Error.ShouldContain("MAIN");
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
-    }
-
-    /// <summary>Binding a tree tag to a driver in a non-Equipment-kind namespace is blocked.</summary>
-    [Fact]
-    public async Task CreateTag_driver_non_equipment_namespace_blocked()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedNonEquipmentDriver: true);
-
-        var result = await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-SP"));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("DRV-SP");
-        result.Error.ShouldContain("Equipment-kind namespace");
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
-    }
-
-    /// <summary>Creating a tag with a TagId that already exists is blocked.</summary>
-    [Fact]
-    public async Task CreateTag_duplicate_tagid_blocked()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-        await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-EQ"));
-
-        var result = await service.CreateTagAsync("EQ-1", Input("TAG-1", "another", "DRV-EQ"));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("Tag 'TAG-1' already exists.");
-    }
-
-    /// <summary>Creating a tag for an equipment id that does not exist returns a not-found error.</summary>
-    [Fact]
-    public async Task CreateTag_unresolvable_equipment_returns_error()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-
-        var result = await service.CreateTagAsync("EQ-NOPE", Input("TAG-1", "speed", "DRV-EQ"));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldNotBeNull();
-        result.Error.ShouldContain("not found");
-
-        using var db = UnsTreeTestDb.CreateNamed(dbName);
-        db.Tags.Any(t => t.TagId == "TAG-1").ShouldBeFalse();
-    }
-
-    /// <summary>Creating a tag whose Name already exists on the same equipment is blocked.</summary>
-    [Fact]
-    public async Task CreateTag_duplicate_name_on_equipment_blocked()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-        await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-EQ"));
-
-        var result = await service.CreateTagAsync("EQ-1", Input("TAG-2", "speed", "DRV-EQ"));
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("A tag named 'speed' already exists on this equipment.");
-    }
-
-    // ----- UpdateTag -----
-
-    /// <summary>Updating a tag changes its mutable fields and keeps EquipmentId / FolderPath.</summary>
-    [Fact]
-    public async Task UpdateTag_changes_fields()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-        await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-EQ"));
-
-        byte[] rv;
-        using (var db = UnsTreeTestDb.CreateNamed(dbName))
-        {
-            rv = db.Tags.Single(t => t.TagId == "TAG-1").RowVersion;
-        }
-
-        var updated = new TagInput("TAG-1", "renamed", "DRV-EQ", DataType: "Int32",
-            AccessLevel: TagAccessLevel.ReadWrite, WriteIdempotent: true,
-            PollGroupId: "  ", TagConfig: """{ "register": 40001 }""");
-
-        var result = await service.UpdateTagAsync("TAG-1", updated, rv);
-
-        result.Ok.ShouldBeTrue();
-        result.Error.ShouldBeNull();
-
-        using var verify = UnsTreeTestDb.CreateNamed(dbName);
-        var after = verify.Tags.Single(t => t.TagId == "TAG-1");
-        after.Name.ShouldBe("renamed");
-        after.DataType.ShouldBe("Int32");
-        after.AccessLevel.ShouldBe(TagAccessLevel.ReadWrite);
-        after.WriteIdempotent.ShouldBeTrue();
-        after.PollGroupId.ShouldBeNull(); // whitespace collapses to null
-        after.EquipmentId.ShouldBe("EQ-1");
-        after.FolderPath.ShouldBeNull();
-    }
-
-    /// <summary>Updating a tag that no longer exists returns the row-gone error.</summary>
-    [Fact]
-    public async Task UpdateTag_missing_row_returns_error()
-    {
-        var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-
-        var result = await service.UpdateTagAsync("TAG-nope", Input("TAG-nope", "x", "DRV-EQ"), []);
-
-        result.Ok.ShouldBeFalse();
-        result.Error.ShouldBe("Row no longer exists.");
-    }
-
-    // ----- DeleteTag -----
-
-    /// <summary>Deleting a tag removes the row.</summary>
+    /// <summary>Deleting a raw tag removes the row (DeleteTagAsync remains functional in Batch 1).</summary>
     [Fact]
     public async Task DeleteTag_removes_row()
     {
         var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
-        await service.CreateTagAsync("EQ-1", Input("TAG-1", "speed", "DRV-EQ"));
-
         byte[] rv;
         using (var db = UnsTreeTestDb.CreateNamed(dbName))
         {
+            db.Devices.Add(new Device
+            {
+                DeviceId = "DEV-1", DriverInstanceId = "DRV-1", Name = "d", DeviceConfig = "{}",
+            });
+            db.Tags.Add(new Tag
+            {
+                TagId = "TAG-1", DeviceId = "DEV-1", Name = "speed", DataType = "Float",
+                AccessLevel = TagAccessLevel.Read, TagConfig = "{}",
+            });
+            db.SaveChanges();
             rv = db.Tags.Single(t => t.TagId == "TAG-1").RowVersion;
         }
 
@@ -371,40 +151,25 @@ public sealed class UnsTreeServiceTagTests
         result.Error.ShouldBeNull();
     }
 
-    // ----- LoadTagDriversForEquipmentAsync -----
+    // ----- Per-equipment loaders: retired → empty -----
 
-    /// <summary>
-    /// The driver loader returns only Equipment-kind drivers in the equipment's cluster — excluding
-    /// non-Equipment-kind drivers in the same cluster and Equipment-kind drivers in other clusters.
-    /// </summary>
+    /// <summary>The per-equipment tag list is retired (Tag is Raw-only) → always empty.</summary>
     [Fact]
-    public async Task LoadTagDriversForEquipment_returns_only_equipment_kind_drivers_in_cluster()
+    public async Task LoadTagsForEquipment_returns_empty()
     {
         var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(
-            dbName,
-            equipmentCluster: "MAIN",
-            seedEquipmentDriver: true,
-            seedNonEquipmentDriver: true,
-            otherCluster: "SITE-A");
+        SeedHierarchy(dbName);
 
-        var drivers = await service.LoadTagDriversForEquipmentAsync("EQ-1");
-
-        drivers.Count.ShouldBe(1);
-        drivers[0].DriverInstanceId.ShouldBe("DRV-EQ");
-        drivers[0].Display.ShouldContain("DRV-EQ");
-        drivers[0].Display.ShouldContain("equipment driver");
+        (await service.LoadTagsForEquipmentAsync("EQ-1")).ShouldBeEmpty();
     }
 
-    /// <summary>An unresolvable equipment yields an empty driver list.</summary>
+    /// <summary>The per-equipment candidate-driver loader is retired (equipment↔driver binding gone) → always empty.</summary>
     [Fact]
-    public async Task LoadTagDriversForEquipment_unresolvable_equipment_returns_empty()
+    public async Task LoadTagDriversForEquipment_returns_empty()
     {
         var (service, dbName) = Fresh();
-        SeedHierarchyAndDrivers(dbName, equipmentCluster: "MAIN", seedEquipmentDriver: true);
+        SeedHierarchy(dbName);
 
-        var drivers = await service.LoadTagDriversForEquipmentAsync("EQ-nope");
-
-        drivers.ShouldBeEmpty();
+        (await service.LoadTagDriversForEquipmentAsync("EQ-1")).ShouldBeEmpty();
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeTestDb.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeTestDb.cs
index ad4c9d6f..d0f5dd51 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeTestDb.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeTestDb.cs
@@ -9,8 +9,10 @@ namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests.Uns;
 /// Shared in-memory fixture for <c>UnsTreeService</c> structural tests. Builds an
 /// <see cref="OtOpcUaConfigDbContext"/> over a named InMemory database and seeds a small,
 /// deterministic UNS hierarchy: enterprise "zb" across two clusters (MAIN populated,
-/// SITE-A intentionally empty), plus tags and a virtual tag on one equipment node so
-/// the per-equipment count joins can be exercised.
+/// SITE-A intentionally empty), a virtual tag on one equipment node (so the per-equipment
+/// virtual-tag count join can be exercised), plus a v3 Raw-tree slice
+/// (Driver→Device→Tag). Under v3, tags are Raw-only — they no longer bind to equipment — so
+/// the per-equipment driver-tag count is always zero; only the virtual-tag count join remains.
 /// </summary>
 internal static class UnsTreeTestDb
 {
@@ -84,12 +86,22 @@ internal static class UnsTreeTestDb
             MachineCode = "machine_001",
         });
 
-        // Two driver tags + one virtual tag on the seeded equipment → ChildCount 3.
+        // v3 Raw tree: a device → two raw tags. Tags are Raw-only and no longer bind to equipment,
+        // so they do NOT contribute to any per-equipment count. The owning DriverInstance is left
+        // unseeded on purpose — no structural test reads it, and seeding one would pollute the
+        // per-cluster driver-list assertions in UnsTreeServiceLoadEditTests (EF InMemory does not
+        // enforce the Device→Driver FK).
+        db.Devices.Add(new Device
+        {
+            DeviceId = "DEV-1",
+            DriverInstanceId = "DRV-1",
+            Name = "device-1",
+            DeviceConfig = "{}",
+        });
         db.Tags.Add(new Tag
         {
             TagId = "TAG-1",
-            DriverInstanceId = "DRV-1",
-            EquipmentId = SeededEquipmentId,
+            DeviceId = "DEV-1",
             Name = "speed",
             DataType = "Float",
             AccessLevel = TagAccessLevel.Read,
@@ -98,24 +110,14 @@ internal static class UnsTreeTestDb
         db.Tags.Add(new Tag
         {
             TagId = "TAG-2",
-            DriverInstanceId = "DRV-1",
-            EquipmentId = SeededEquipmentId,
+            DeviceId = "DEV-1",
             Name = "running",
             DataType = "Boolean",
             AccessLevel = TagAccessLevel.Read,
             TagConfig = "{}",
         });
-        // A tag with no equipment must be ignored by the count query.
-        db.Tags.Add(new Tag
-        {
-            TagId = "TAG-ORPHAN",
-            DriverInstanceId = "DRV-1",
-            EquipmentId = null,
-            Name = "orphan",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{}",
-        });
+
+        // One virtual tag on the seeded equipment → per-equipment virtual-tag ChildCount 1.
         db.VirtualTags.Add(new VirtualTag
         {
             VirtualTagId = "VTAG-1",
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/VirtualTagEquipTokenValidationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/VirtualTagEquipTokenValidationTests.cs
index 58922c56..d8b55a4c 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/VirtualTagEquipTokenValidationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/VirtualTagEquipTokenValidationTests.cs
@@ -24,6 +24,14 @@ public sealed class VirtualTagEquipTokenValidationTests
     private const string EquipBaseScript = "return ctx.GetTag(\"{{equip}}.X\");";
     private const string PlainScript = "return ctx.GetTag(\"TestMachine_001.X\");";
 
+    // v3 Batch-1: the equipment↔Tag binding was retired (Tag is Raw-only), so the {{equip}} token's
+    // equipment-tag-derived base can never resolve — ValidateEquipTokenAsync now derives from an empty
+    // tag set, so any {{equip}} script is rejected. The token-present/no-base rejection and the
+    // no-token success cases stay live below; the tests that assert a DERIVABLE base (success) or the
+    // divergent-prefix derivation logic are dark until per-equipment tag references return in Batch 3.
+    private const string DarkUntilBatch3 =
+        "v3 Batch-1: {{equip}} equipment-tag-derived base is dark — per-equipment tag references return in Batch 3.";
+
     private static (UnsTreeService Service, string DbName) Fresh()
     {
         var dbName = $"uns-equiptoken-{Guid.NewGuid():N}";
@@ -58,11 +66,11 @@ public sealed class VirtualTagEquipTokenValidationTests
         });
         if (tagFullName is not null)
         {
+            // v3: raw tag (no equipment binding). Kept so the dark {{equip}}-base tests still compile.
             db.Tags.Add(new Tag
             {
                 TagId = "TAG-1",
-                DriverInstanceId = "DRV-1",
-                EquipmentId = "EQ-1",
+                DeviceId = "DEV-1",
                 Name = "x",
                 DataType = "Float",
                 AccessLevel = TagAccessLevel.Read,
@@ -95,7 +103,7 @@ public sealed class VirtualTagEquipTokenValidationTests
     // ----- Create -----
 
     /// <summary>{{equip}} script + a driver tag whose FullName gives a base → create succeeds.</summary>
-    [Fact]
+    [Fact(Skip = DarkUntilBatch3)]
     public async Task Create_equip_token_with_derivable_base_succeeds()
     {
         var (service, dbName) = Fresh();
@@ -142,7 +150,7 @@ public sealed class VirtualTagEquipTokenValidationTests
     /// {{equip}} script + TWO driver tags whose FullNames have DIFFERENT object prefixes
     /// (no single base can be derived) → create rejected, error names equipment + token.
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkUntilBatch3)]
     public async Task Create_equip_token_with_divergent_prefixes_rejected()
     {
         var (service, dbName) = Fresh();
@@ -152,8 +160,7 @@ public sealed class VirtualTagEquipTokenValidationTests
             db.Tags.Add(new Tag
             {
                 TagId = "TAG-2",
-                DriverInstanceId = "DRV-1",
-                EquipmentId = "EQ-1",
+                DeviceId = "DEV-1",
                 Name = "y",
                 DataType = "Float",
                 AccessLevel = TagAccessLevel.Read,
@@ -176,7 +183,7 @@ public sealed class VirtualTagEquipTokenValidationTests
     // ----- Update -----
 
     /// <summary>{{equip}} script + a derivable base → update succeeds.</summary>
-    [Fact]
+    [Fact(Skip = DarkUntilBatch3)]
     public async Task Update_equip_token_with_derivable_base_succeeds()
     {
         var (service, dbName) = Fresh();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTagConfigGateTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTagConfigGateTests.cs
index a501ef29..d4e291e6 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTagConfigGateTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTagConfigGateTests.cs
@@ -23,29 +23,25 @@ namespace ZB.MOM.WW.OtOpcUa.ControlPlane.Tests;
 /// </summary>
 public sealed class AdminOperationsActorTagConfigGateTests : ControlPlaneActorTestBase
 {
+    // v3: a raw Tag binds to a Device (Tag.DeviceId), and its driver type is resolved
+    // Tag → Device → DriverInstance.DriverType. The tag-config gate inspects every raw tag against that
+    // resolved driver type. All entity Names must be legal RawPath segments (DraftValidator RawNameInvalid).
     private static void Seed(IDbContextFactory<OtOpcUaConfigDbContext> dbFactory, string driverType, string tagConfig,
         string tagName = "flow")
     {
-        var uuid = Guid.NewGuid();
-        var equipmentId = DraftValidator.DeriveEquipmentId(uuid);
         using var db = dbFactory.CreateDbContext();
-        db.Namespaces.Add(new Namespace
-        {
-            NamespaceId = "ns-1", ClusterId = "", Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq",
-        });
         db.DriverInstances.Add(new DriverInstance
         {
-            DriverInstanceId = "d-1", ClusterId = "", NamespaceId = "ns-1",
+            DriverInstanceId = "d-1", ClusterId = "",
             Name = "drv", DriverType = driverType, DriverConfig = "{}",
         });
-        db.Equipment.Add(new Equipment
+        db.Devices.Add(new Device
         {
-            EquipmentUuid = uuid, EquipmentId = equipmentId, Name = "pump-01",
-            DriverInstanceId = "d-1", UnsLineId = "line-a", MachineCode = "PUMP01",
+            DeviceId = "dev-1", DriverInstanceId = "d-1", Name = "dev", DeviceConfig = "{}",
         });
         db.Tags.Add(new Tag
         {
-            TagId = "tag-1", DriverInstanceId = "d-1", EquipmentId = equipmentId,
+            TagId = "tag-1", DeviceId = "dev-1",
             Name = tagName, DataType = "Int16", AccessLevel = TagAccessLevel.Read, TagConfig = tagConfig,
         });
         db.SaveChanges();
@@ -116,8 +112,8 @@ public sealed class AdminOperationsActorTagConfigGateTests : ControlPlaneActorTe
     public void Unmapped_galaxy_tag_is_skipped_even_in_error_mode()
     {
         var dbFactory = NewInMemoryDbFactory();
-        // Galaxy tag carrying a FullName (passes the DraftValidator Galaxy rule); the inspector has no
-        // Galaxy mapping, so it is skipped regardless of mode.
+        // A Galaxy raw tag (v3: an ordinary Device-bound tag); the inspector has no Galaxy mapping, so it
+        // is skipped regardless of mode — even with a nonsense dataType in its TagConfig.
         Seed(dbFactory, "GalaxyMxGateway", "{\"FullName\":\"Obj.Attr\",\"dataType\":\"nonsense\"}");
         var coordinator = CreateTestProbe("coord");
         var actor = Sys.ActorOf(AdminOperationsActor.Props(
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTests.cs
index d5190b72..819d5618 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/AdminOperationsActorTests.cs
@@ -175,13 +175,14 @@ public sealed class AdminOperationsActorTests : ControlPlaneActorTestBase
         db.ConfigEdits.Single().EntityType.ShouldBe("Deployment");
     }
 
-    /// <summary>Verifies the full DraftValidator gate (reject on ANY error): a Tag↔VirtualTag
-    /// NodeId collision in the live config rejects the deploy (422-mapped
-    /// <see cref="StartDeploymentOutcome.Rejected"/>) before any coordinator dispatch — and inserts
-    /// no Deployment row. The colliding equipment uses a canonical EquipmentId so the rejection is
+    /// <summary>Verifies the full DraftValidator gate (reject on ANY error): a v3 UNS effective-name
+    /// collision — a UnsTagReference (surfacing a raw Tag under an equipment) and a VirtualTag sharing the
+    /// same effective leaf name in that equipment's UNS NodeId space — rejects the deploy (422-mapped
+    /// <see cref="StartDeploymentOutcome.Rejected"/>) before any coordinator dispatch, inserting no
+    /// Deployment row. The colliding equipment uses a canonical EquipmentId so the rejection is
     /// attributable to the collision rule, not to EquipmentIdNotDerived.</summary>
     [Fact]
-    public void StartDeployment_rejects_on_Tag_VirtualTag_NodeId_collision()
+    public void StartDeployment_rejects_on_UNS_effective_name_collision()
     {
         var uuid = Guid.NewGuid();
         var equipmentId = Configuration.Validation.DraftValidator.DeriveEquipmentId(uuid);
@@ -194,20 +195,32 @@ public sealed class AdminOperationsActorTests : ControlPlaneActorTestBase
                 EquipmentUuid = uuid,
                 EquipmentId = equipmentId,
                 Name = "eq",
-                DriverInstanceId = "d",
                 UnsLineId = "line-a",
                 MachineCode = "m",
             });
+            // v3: a raw Tag binds to a Device; it reaches the equipment's UNS space via a UnsTagReference.
+            db.DriverInstances.Add(new Configuration.Entities.DriverInstance
+            {
+                DriverInstanceId = "d", ClusterId = "", Name = "drv", DriverType = "Modbus", DriverConfig = "{}",
+            });
+            db.Devices.Add(new Configuration.Entities.Device
+            {
+                DeviceId = "dev", DriverInstanceId = "d", Name = "dev", DeviceConfig = "{}",
+            });
             db.Tags.Add(new Configuration.Entities.Tag
             {
                 TagId = "tag-speed",
-                DriverInstanceId = "d",
-                EquipmentId = equipmentId,
+                DeviceId = "dev",
                 Name = "speed",
                 DataType = "Float",
                 AccessLevel = TagAccessLevel.Read,
                 TagConfig = "{}",
             });
+            db.UnsTagReferences.Add(new Configuration.Entities.UnsTagReference
+            {
+                UnsTagReferenceId = "ref-speed", EquipmentId = equipmentId, TagId = "tag-speed",
+            });
+            // A VirtualTag whose Name collides with the reference's effective name "speed".
             db.VirtualTags.Add(new Configuration.Entities.VirtualTag
             {
                 VirtualTagId = "vtag-speed",
@@ -228,8 +241,8 @@ public sealed class AdminOperationsActorTests : ControlPlaneActorTestBase
         var reply = ExpectMsg<StartDeploymentResult>(TimeSpan.FromSeconds(3));
         reply.Outcome.ShouldBe(StartDeploymentOutcome.Rejected);
         reply.Message.ShouldNotBeNull();
-        reply.Message.ShouldContain("EquipmentSignalNameCollision");   // the rule's error code
-        reply.Message.ShouldContain("collide");                        // the rule's message text
+        reply.Message.ShouldContain("UnsEffectiveNameCollision");   // the v3 rule's error code
+        reply.Message.ShouldContain("collide");                     // the rule's message text
 
         using var verify = dbFactory.CreateDbContext();
         verify.Deployments.Count().ShouldBe(0);
@@ -251,7 +264,6 @@ public sealed class AdminOperationsActorTests : ControlPlaneActorTestBase
                 EquipmentUuid = Guid.NewGuid(),
                 EquipmentId = "EQ-operator-typed",   // NOT derived from the UUID
                 Name = "rinser-01",
-                DriverInstanceId = "d",
                 UnsLineId = "line-a",
                 MachineCode = "m",
             });
@@ -273,53 +285,11 @@ public sealed class AdminOperationsActorTests : ControlPlaneActorTestBase
         verify.Deployments.Count().ShouldBe(0);
     }
 
-    /// <summary>Verifies that a DriverInstance whose NamespaceId lives in a different cluster
-    /// triggers <c>BadCrossClusterNamespaceBinding</c> and routes to the Rejected branch through
-    /// the actor — no coordinator dispatch, no Deployment row.
-    /// Seeded: Namespace in cluster "MAIN" + DriverInstance in cluster "SITE-A" referencing that
-    /// namespace. NamespaceKind.Equipment + DriverType "Modbus" satisfies the compat rule so
-    /// only the cross-cluster rule fires.</summary>
-    [Fact]
-    public void StartDeployment_rejects_on_cross_cluster_namespace_binding()
-    {
-        const string nsId = "ns-main-equipment";
-
-        var dbFactory = NewInMemoryDbFactory();
-        using (var db = dbFactory.CreateDbContext())
-        {
-            db.Namespaces.Add(new Configuration.Entities.Namespace
-            {
-                NamespaceId  = nsId,
-                ClusterId    = "MAIN",
-                Kind         = Configuration.Enums.NamespaceKind.Equipment,
-                NamespaceUri = "urn:zb:main:equipment",
-            });
-            db.DriverInstances.Add(new Configuration.Entities.DriverInstance
-            {
-                DriverInstanceId = "drv-site-a-01",
-                ClusterId        = "SITE-A",
-                NamespaceId      = nsId,          // cross-cluster: drv is SITE-A, ns is MAIN
-                Name             = "site-a-modbus",
-                DriverType       = "Modbus",       // compatible with Equipment ns — no compat error
-                DriverConfig     = "{}",
-            });
-            db.SaveChanges();
-        }
-
-        var coordinator = CreateTestProbe("coord");
-        var actor = Sys.ActorOf(AdminOperationsActor.Props(dbFactory, coordinator.Ref, Enumerable.Empty<IDriverProbe>()));
-
-        actor.Tell(new StartDeployment("joe", CorrelationId.NewId()));
-
-        coordinator.ExpectNoMsg(TimeSpan.FromMilliseconds(500));
-        var reply = ExpectMsg<StartDeploymentResult>(TimeSpan.FromSeconds(3));
-        reply.Outcome.ShouldBe(StartDeploymentOutcome.Rejected);
-        reply.Message.ShouldNotBeNull();
-        reply.Message.ShouldContain("BadCrossClusterNamespaceBinding");
-
-        using var verify = dbFactory.CreateDbContext();
-        verify.Deployments.Count().ShouldBe(0);
-    }
+    // RETIRED (v3): the Namespace entity and its cluster-binding rule (BadCrossClusterNamespaceBinding)
+    // are deleted — the two OPC UA namespaces (Raw/UNS) are implicit and driver instances no longer bind a
+    // Namespace. There is no v3 analog for a cross-cluster namespace binding, so this deploy-gate case is
+    // dropped (per the v3 schema migration). Cluster scoping is now exercised via the UNS line→area→cluster
+    // attribution covered in DeploymentArtifactTests.
 
     /// <summary>Verifies the warn-only compile-cost advisory: seeding N distinct non-passthrough
     /// (genuinely-compiled) Script rows yields an <see cref="StartDeploymentOutcome.Accepted"/>
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ConfigComposerTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ConfigComposerTests.cs
index f2d2c9c9..ac747ee3 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ConfigComposerTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ConfigComposerTests.cs
@@ -87,29 +87,27 @@ public sealed class ConfigComposerTests : ControlPlaneActorTestBase
     }
 
     /// <summary>
-    ///     Verifies that <see cref="ConfigComposer.SnapshotAndFlattenAsync"/> serialises a
-    ///     <see cref="Device"/>'s <c>HostAddress</c> into the artifact blob and that
-    ///     <see cref="DeploymentArtifact.ParseComposition(ReadOnlySpan{byte})"/> decodes it back
-    ///     as the equipment's <see cref="ZB.MOM.WW.OtOpcUa.OpcUaServer.EquipmentNode.DeviceHost"/>
-    ///     (follow-up E). Guards the real serialize→decode seam: if ConfigComposer's Device
-    ///     serialisation ever drifted, DeviceHost would silently become null in production
-    ///     (feature E degrades to a warn-skip) while hand-rolled artifact tests stayed green.
+    ///     v3: verifies that <see cref="ConfigComposer.SnapshotAndFlattenAsync"/> serialises a
+    ///     <see cref="Device"/>'s endpoint into the artifact blob and that
+    ///     <see cref="DeploymentArtifact.ParseDriverInstances(ReadOnlySpan{byte})"/> folds the sole
+    ///     device's <c>DeviceConfig</c> up into the driver's merged <c>DriverConfig</c> (single-endpoint
+    ///     driver). Guards the real serialize→decode seam: if ConfigComposer's Device serialisation ever
+    ///     drifted, the endpoint would silently vanish from the driver config in production (the driver
+    ///     wouldn't bind) while hand-rolled artifact tests stayed green. (Pre-v3 this rode
+    ///     <c>EquipmentNode.DeviceHost</c>; v3 retired that binding — equipment references raw tags via
+    ///     UnsTagReference, and the endpoint reaches the driver via the RawPath device merge.)
     /// </summary>
     [Fact]
-    public async Task DeviceHost_survives_ConfigComposer_to_ParseComposition_round_trip()
+    public async Task Device_endpoint_survives_ConfigComposer_to_ParseDriverInstances_round_trip()
     {
         var f = NewInMemoryDbFactory();
         await using (var db = f.CreateDbContext())
         {
             db.ServerClusters.Add(NewCluster("c1"));
-            db.Namespaces.Add(new Namespace
-            {
-                NamespaceId = "ns-eq", ClusterId = "c1",
-                Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq",
-            });
+            db.RawFolders.Add(new RawFolder { RawFolderId = "f1", ClusterId = "c1", Name = "Plant" });
             db.DriverInstances.Add(new DriverInstance
             {
-                DriverInstanceId = "drv-1", ClusterId = "c1", NamespaceId = "ns-eq",
+                DriverInstanceId = "drv-1", ClusterId = "c1", RawFolderId = "f1",
                 Name = "Focas", DriverType = "Focas", DriverConfig = "{}",
             });
             db.Devices.Add(new Device
@@ -117,25 +115,23 @@ public sealed class ConfigComposerTests : ControlPlaneActorTestBase
                 DeviceId = "dev-1", DriverInstanceId = "drv-1",
                 Name = "dev-1", DeviceConfig = "{\"HostAddress\":\"10.9.9.9:8193\"}",
             });
-            db.UnsAreas.Add(new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "area-1" });
-            db.UnsLines.Add(new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" });
-            db.Equipment.Add(new Equipment
-            {
-                EquipmentId = "eq-1", DriverInstanceId = "drv-1", DeviceId = "dev-1",
-                UnsLineId = "line-1", Name = "machine-1", MachineCode = "MACHINE_001",
-            });
             await db.SaveChangesAsync();
         }
 
         await using var readDb = f.CreateDbContext();
         var artifact = await ConfigComposer.SnapshotAndFlattenAsync(readDb);
-        var composition = DeploymentArtifact.ParseComposition(artifact.Blob);
+        var specs = DeploymentArtifact.ParseDriverInstances(artifact.Blob);
 
-        var node = composition.EquipmentNodes.ShouldHaveSingleItem();
-        node.EquipmentId.ShouldBe("eq-1");
-        node.DriverInstanceId.ShouldBe("drv-1");
-        node.DeviceId.ShouldBe("dev-1");
-        node.DeviceHost.ShouldBe("10.9.9.9:8193");
+        var spec = specs.ShouldHaveSingleItem();
+        spec.DriverInstanceId.ShouldBe("drv-1");
+
+        // The sole device's DeviceConfig endpoint is folded up to the top level of the merged DriverConfig.
+        using var doc = System.Text.Json.JsonDocument.Parse(spec.DriverConfig);
+        doc.RootElement.GetProperty("HostAddress").GetString().ShouldBe("10.9.9.9:8193");
+
+        // And the device is still discoverable by its routing-key name in the reconstructed Devices array.
+        var devices = doc.RootElement.GetProperty("Devices").EnumerateArray().ToList();
+        devices.ShouldHaveSingleItem().GetProperty("DeviceName").GetString().ShouldBe("dev-1");
     }
 
     /// <summary>
@@ -160,21 +156,16 @@ public sealed class ConfigComposerTests : ControlPlaneActorTestBase
         await using (var db = f.CreateDbContext())
         {
             db.ServerClusters.Add(NewCluster("c1"));
-            db.Namespaces.Add(new Namespace
-            {
-                NamespaceId = "ns-eq", ClusterId = "c1",
-                Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq",
-            });
             db.DriverInstances.Add(new DriverInstance
             {
-                DriverInstanceId = "drv-1", ClusterId = "c1", NamespaceId = "ns-eq",
+                DriverInstanceId = "drv-1", ClusterId = "c1",
                 Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}",
                 ResilienceConfig = resilienceJson,
             });
             // A second instance with no override proves the null case rides the same real composer path.
             db.DriverInstances.Add(new DriverInstance
             {
-                DriverInstanceId = "drv-2", ClusterId = "c1", NamespaceId = "ns-eq",
+                DriverInstanceId = "drv-2", ClusterId = "c1",
                 Name = "Modbus2", DriverType = "Modbus", DriverConfig = "{}",
             });
             await db.SaveChangesAsync();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/DriverReconnectE2eTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/DriverReconnectE2eTests.cs
index 645fbb5e..72c1ea61 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/DriverReconnectE2eTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/DriverReconnectE2eTests.cs
@@ -225,14 +225,7 @@ public sealed class DriverReconnectE2eTests
             CreatedBy = "test",
         });
 
-        db.Namespaces.Add(new Namespace
-        {
-            NamespaceId = "RECONNECT-E2E-equipment",
-            ClusterId = ClusterId,
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:zb:reconnect-e2e:equipment",
-        });
-
+        // v3: the Namespace entity is deleted (DriverInstance no longer binds a Namespace).
         db.ClusterNodes.Add(new ClusterNode
         {
             NodeId = harness.NodeANodeId,
@@ -258,7 +251,6 @@ public sealed class DriverReconnectE2eTests
         {
             DriverInstanceId = DriverId,
             ClusterId = ClusterId,
-            NamespaceId = "RECONNECT-E2E-equipment",
             Name = DriverId,
             DriverType = "Modbus",
             Enabled = true,
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/EquipmentNamespaceMaterializationTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/EquipmentNamespaceMaterializationTests.cs
index e95e2e1e..03fd19ca 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/EquipmentNamespaceMaterializationTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/EquipmentNamespaceMaterializationTests.cs
@@ -13,20 +13,32 @@ using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 namespace ZB.MOM.WW.OtOpcUa.Host.IntegrationTests;
 
 /// <summary>
-/// End-to-end deploy of an Equipment-kind namespace through the <b>real</b>
-/// <c>ConfigComposer</c>: seed a 1-area / 1-line / 1-equipment / 1-tag Equipment namespace,
-/// <c>StartDeployment</c>, then assert the deployment's persisted artifact decodes (via
-/// <see cref="DeploymentArtifact.ParseComposition"/>) to the equipment signal + the friendly
-/// UNS folder name. This covers the <c>ConfigComposer → ArtifactBlob → ParseComposition.EquipmentTags</c>
-/// seam that the OpcUaServer unit tests only approximate with hand-built JSON.
+/// End-to-end deploy of a UNS folder hierarchy through the <b>real</b> <c>ConfigComposer</c>: seed a
+/// 1-area / 1-line / 1-equipment UNS plus a v3 raw-tag chain (RawFolder → DriverInstance → Device →
+/// Tag), <c>StartDeployment</c>, then assert the deployment's persisted artifact decodes (via
+/// <see cref="DeploymentArtifact.ParseComposition"/>).
+/// <para>
+/// <b>v3 DARK address space (Batch 1):</b> the composer + artifact deliberately emit an EMPTY
+/// equipment-tag plan set — raw-tag variable nodes are lit up in Batch 4's dual-namespace UNS↔Raw
+/// fan-out. So the live assertion here is the DARK contract: the Area/Line/Equipment folder nodes
+/// decode with their friendly UNS names, and <c>EquipmentTags</c> is empty EVEN THOUGH a raw tag was
+/// seeded. The full equipment-signal materialization (raw tag → EquipmentTag with FullName) is
+/// preserved as a Batch-4-pending Skipped test below (the plan explicitly says keep it, don't delete).
+/// </para>
 /// <para>
 /// The OPC UA address-space browse is exercised separately against a real SDK node manager in
-/// <c>AddressSpaceApplierHierarchyTests.Equipment_namespace_structure_materialises_end_to_end_against_real_SDK</c>,
-/// because the in-process <see cref="TwoNodeClusterHarness"/> binds the no-op address-space sink.
+/// <c>AddressSpaceApplierHierarchyTests</c>, because the in-process <see cref="TwoNodeClusterHarness"/>
+/// binds the no-op address-space sink.
 /// </para>
 /// </summary>
 public sealed class EquipmentNamespaceMaterializationTests
 {
+    private const string Batch4Pending =
+        "v3 dark address space: equipment-tag variable plans (raw tag → EquipmentTag with FullName) do " +
+        "not materialize until Batch 4 (dual-namespace UNS↔Raw fan-out). The composer + artifact emit an " +
+        "empty equipment-tag plan set this batch; re-enable this full-materialization assertion (re-authored " +
+        "against the UnsTagReference fan-out) when Batch 4 lights the raw/UNS variable nodes.";
+
     private static CancellationToken Ct => TestContext.Current.CancellationToken;
 
     // Equipment.EquipmentId must equal DraftValidator.DeriveEquipmentId(EquipmentUuid) — the
@@ -35,16 +47,18 @@ public sealed class EquipmentNamespaceMaterializationTests
     private static readonly Guid EquipmentUuid = Guid.Parse("11111111-1111-1111-1111-111111111111");
     private static readonly string EquipmentId = DraftValidator.DeriveEquipmentId(EquipmentUuid); // EQ-111111111111
 
-    /// <summary>Verifies a deployed Equipment namespace carries its signal into the composed artifact.</summary>
+    /// <summary>Verifies a deployed UNS hierarchy carries its Area/Line/Equipment folder nodes into the
+    /// composed artifact with their friendly UNS names, and — the v3 Batch-1 DARK contract — that the
+    /// equipment-tag plan set is EMPTY even though a raw tag was seeded (raw-tag variables are Batch 4).</summary>
     [Fact]
-    public async Task Deploying_an_equipment_namespace_carries_the_signal_into_the_artifact()
+    public async Task Deploying_a_uns_hierarchy_carries_folder_nodes_and_leaves_equipment_tags_dark()
     {
         await using var harness = await TwoNodeClusterHarness.StartAsync();
 
         // Seed the parent ServerCluster + ClusterNode rows the SQL FKs require (the c1 config below
         // FKs to ServerCluster; on the in-memory provider this is unnecessary — FKs aren't enforced).
         await harness.SeedDefaultClusterAsync("c1");
-        await SeedEquipmentNamespaceAsync(harness);
+        await SeedUnsHierarchyAsync(harness);
 
         await using var scope = harness.NodeA.Services.CreateAsyncScope();
         var client = scope.ServiceProvider.GetRequiredService<IAdminOperationsClient>();
@@ -71,47 +85,88 @@ public sealed class EquipmentNamespaceMaterializationTests
 
         var composition = DeploymentArtifact.ParseComposition(artifact);
 
-        // The real ConfigComposer serialised the equipment Tag (incl. its TagConfig), and
-        // ParseComposition extracted it as an EquipmentTag with FullName pulled from TagConfig.
+        // The UNS folder hierarchy decodes with its friendly UNS names (browse names), not MachineCodes.
+        composition.EquipmentNodes.ShouldContain(e => e.EquipmentId == EquipmentId && e.DisplayName == "station-1");
+        composition.UnsAreas.ShouldContain(a => a.UnsAreaId == "nw-area-filling" && a.DisplayName == "filling");
+        composition.UnsLines.ShouldContain(l => l.UnsLineId == "nw-line-1" && l.DisplayName == "line-1");
+
+        // v3 DARK contract: no equipment-tag variable plans materialize this batch — even though a raw
+        // tag ("Speed" / FullName 40001) was seeded under the device. Batch 4 lights these via the UNS↔Raw fan-out.
+        composition.EquipmentTags.ShouldBeEmpty();
+    }
+
+    /// <summary>BATCH-4-PENDING: the full equipment-signal materialization — the seeded raw tag decodes
+    /// (via the real ConfigComposer → ParseComposition) into an EquipmentTag carrying its FullName. Dark
+    /// until Batch 4's UNS↔Raw fan-out; preserved (not deleted) so re-enabling is a one-line change once
+    /// the equipment-tag plan set is lit up.</summary>
+    [Fact(Skip = Batch4Pending)]
+    public async Task Deploying_an_equipment_namespace_carries_the_signal_into_the_artifact()
+    {
+        await using var harness = await TwoNodeClusterHarness.StartAsync();
+        await harness.SeedDefaultClusterAsync("c1");
+        await SeedUnsHierarchyAsync(harness);
+
+        await using var scope = harness.NodeA.Services.CreateAsyncScope();
+        var client = scope.ServiceProvider.GetRequiredService<IAdminOperationsClient>();
+
+        var result = await client.StartDeploymentAsync(createdBy: "alice@test", Ct);
+        result.Outcome.ShouldBe(StartDeploymentOutcome.Accepted, $"Deploy not accepted: {result.Message}");
+        var deploymentId = result.DeploymentId!.Value.Value;
+
+        var artifact = Array.Empty<byte>();
+        await WaitForAsync(async () =>
+        {
+            await using var db = await CreateDbAsync(harness);
+            var d = await db.Deployments.AsNoTracking()
+                .FirstOrDefaultAsync(x => x.DeploymentId == deploymentId, Ct);
+            if (d is { ArtifactBlob.Length: > 0 })
+            {
+                artifact = d.ArtifactBlob;
+                return true;
+            }
+            return false;
+        }, TimeSpan.FromSeconds(15));
+
+        var composition = DeploymentArtifact.ParseComposition(artifact);
+
+        // Batch 4: the raw tag surfaces as an EquipmentTag with FullName pulled from TagConfig.
         var tag = composition.EquipmentTags.ShouldHaveSingleItem();
         tag.TagId.ShouldBe("tag-speed");
         tag.EquipmentId.ShouldBe(EquipmentId);
         tag.Name.ShouldBe("Speed");
         tag.DataType.ShouldBe("Float");
         tag.FullName.ShouldBe("40001");
-
-        // The equipment folder browses by its friendly UNS Name, not the MachineCode.
-        composition.EquipmentNodes.ShouldContain(e => e.EquipmentId == EquipmentId && e.DisplayName == "station-1");
-        composition.UnsAreas.ShouldContain(a => a.UnsAreaId == "nw-area-filling" && a.DisplayName == "filling");
-        composition.UnsLines.ShouldContain(l => l.UnsLineId == "nw-line-1" && l.DisplayName == "line-1");
     }
 
-    private static async Task SeedEquipmentNamespaceAsync(TwoNodeClusterHarness harness)
+    private static async Task SeedUnsHierarchyAsync(TwoNodeClusterHarness harness)
     {
         await using var db = await CreateDbAsync(harness);
 
-        db.Namespaces.Add(new Namespace
-        {
-            NamespaceId = "ns-eq", ClusterId = "c1", Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq",
-        });
+        // v3 raw-tag chain: RawFolder → DriverInstance(RawFolderId) → Device(DriverInstanceId) →
+        // Tag(DeviceId). The Namespace entity is deleted; equipment no longer binds a driver/device.
+        db.RawFolders.Add(new RawFolder { RawFolderId = "raw-plant", ClusterId = "c1", Name = "Plant" });
         // Disabled so the driver-role nodes don't spawn a live Modbus driver (no endpoint to reach);
         // the composition still carries the instance (ParseComposition does not filter on Enabled).
         db.DriverInstances.Add(new DriverInstance
         {
-            DriverInstanceId = "drv-modbus", ClusterId = "c1", NamespaceId = "ns-eq",
+            DriverInstanceId = "drv-modbus", ClusterId = "c1", RawFolderId = "raw-plant",
             Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}", Enabled = false,
         });
+        db.Devices.Add(new Device
+        {
+            DeviceId = "dev-1", DriverInstanceId = "drv-modbus",
+            Name = "dev-1", DeviceConfig = "{}",
+        });
         db.UnsAreas.Add(new UnsArea { UnsAreaId = "nw-area-filling", ClusterId = "c1", Name = "filling" });
         db.UnsLines.Add(new UnsLine { UnsLineId = "nw-line-1", UnsAreaId = "nw-area-filling", Name = "line-1" });
         db.Equipment.Add(new Equipment
         {
             EquipmentId = EquipmentId, EquipmentUuid = EquipmentUuid,
-            DriverInstanceId = "drv-modbus", UnsLineId = "nw-line-1",
-            Name = "station-1", MachineCode = "STATION_001",
+            UnsLineId = "nw-line-1", Name = "station-1", MachineCode = "STATION_001",
         });
         db.Tags.Add(new Tag
         {
-            TagId = "tag-speed", DriverInstanceId = "drv-modbus", EquipmentId = EquipmentId,
+            TagId = "tag-speed", DeviceId = "dev-1",
             Name = "Speed", DataType = "Float", AccessLevel = TagAccessLevel.Read,
             TagConfig = "{\"FullName\":\"40001\"}",
         });
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/MultiClusterScopingTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/MultiClusterScopingTests.cs
index a554b8d2..c7d75e5e 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/MultiClusterScopingTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/MultiClusterScopingTests.cs
@@ -120,17 +120,15 @@ public sealed class MultiClusterScopingTests
             NewCluster(MainCluster, "Main Cluster", "central"),
             NewCluster(SiteACluster, "Site A Cluster", "site-a"));
 
-        db.Namespaces.AddRange(
-            NewNamespace(MainCluster, "MAIN-equipment", "urn:zb:central:equipment"),
-            NewNamespace(SiteACluster, "SITE-A-equipment", "urn:zb:site-a:equipment"));
-
+        // v3: the Namespace entity is deleted (DriverInstance no longer binds a Namespace). Cluster
+        // scoping filters by NodeId/ClusterId, so the namespace seed is dropped here.
         db.ClusterNodes.AddRange(
             NewNode(mainNodeId, MainCluster, "urn:zb:central:node-a"),
             NewNode(siteANodeId, SiteACluster, "urn:zb:site-a:node-b"));
 
         db.DriverInstances.AddRange(
-            NewDriver(MainDriverId, MainCluster, "MAIN-equipment"),
-            NewDriver(SiteADriverId, SiteACluster, "SITE-A-equipment"));
+            NewDriver(MainDriverId, MainCluster),
+            NewDriver(SiteADriverId, SiteACluster));
 
         await db.SaveChangesAsync(Ct);
     }
@@ -146,14 +144,6 @@ public sealed class MultiClusterScopingTests
         CreatedBy = "test",
     };
 
-    private static Namespace NewNamespace(string clusterId, string namespaceId, string uri) => new()
-    {
-        NamespaceId = namespaceId,
-        ClusterId = clusterId,
-        Kind = NamespaceKind.Equipment,
-        NamespaceUri = uri,
-    };
-
     private static ClusterNode NewNode(string nodeId, string clusterId, string applicationUri) => new()
     {
         NodeId = nodeId,
@@ -163,11 +153,10 @@ public sealed class MultiClusterScopingTests
         CreatedBy = "test",
     };
 
-    private static DriverInstance NewDriver(string driverInstanceId, string clusterId, string namespaceId) => new()
+    private static DriverInstance NewDriver(string driverInstanceId, string clusterId) => new()
     {
         DriverInstanceId = driverInstanceId,
         ClusterId = clusterId,
-        NamespaceId = namespaceId,
         Name = driverInstanceId,
         DriverType = "Modbus",
         Enabled = true,
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceApplierHierarchyTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceApplierHierarchyTests.cs
index 6215eea9..14cc8f87 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceApplierHierarchyTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceApplierHierarchyTests.cs
@@ -165,7 +165,7 @@ public sealed class AddressSpaceApplierHierarchyTests : IDisposable
     ///     network-browse E2E (Host.IntegrationTests) needs the docker-dev fixture and is tracked
     ///     as a follow-up.
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public async Task Equipment_namespace_structure_materialises_end_to_end_against_real_SDK()
     {
         await using var host = new OpcUaApplicationHost(
@@ -183,20 +183,23 @@ public sealed class AddressSpaceApplierHierarchyTests : IDisposable
         await host.StartAsync(sdkServer, Ct);
         sdkServer.NodeManager.ShouldNotBeNull();
 
-        // One area / line / equipment + a Modbus FK driver in an Equipment-kind namespace, with a
-        // single equipment-bound Tag (the signal). Equipment.Name is the UNS browse segment.
-        var ns = new Namespace { NamespaceId = "ns-eq", ClusterId = "c1", Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq" };
-        var driver = new DriverInstance { DriverInstanceId = "drv-modbus", ClusterId = "c1", NamespaceId = "ns-eq", Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}" };
+        // One area / line / equipment + a Modbus driver. v3: no Namespace entity, DriverInstance no
+        // longer binds a Namespace, and Equipment no longer binds a driver. The equipment-bound Tag
+        // (the Speed signal) that this end-to-end test materialised as a Variable node is DARK until
+        // Batch 4 — the composer emits an empty EquipmentTags set, so it is no longer seeded/passed
+        // here. Equipment.Name is the UNS browse segment. (Folder-only materialisation is covered live
+        // by the sibling MaterialiseHierarchy_against_real_SDK test; this suite's equipment-tag
+        // Variable end-to-end leg re-enables in Batch 4 via the UnsTagReference fan-out.)
+        var driver = new DriverInstance { DriverInstanceId = "drv-modbus", ClusterId = "c1", Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}" };
         var area = new UnsArea { UnsAreaId = "nw-area-filling", ClusterId = "c1", Name = "filling" };
         var line = new UnsLine { UnsLineId = "nw-line-1", UnsAreaId = "nw-area-filling", Name = "line-1" };
-        var equipment = new Equipment { EquipmentId = "eq-1", DriverInstanceId = "drv-modbus", UnsLineId = "nw-line-1", Name = "station-1", MachineCode = "STATION_001" };
-        var tag = new Tag { TagId = "tag-speed", DriverInstanceId = "drv-modbus", EquipmentId = "eq-1", Name = "Speed", DataType = "Float", AccessLevel = TagAccessLevel.Read, TagConfig = "{\"FullName\":\"40001\"}" };
+        var equipment = new Equipment { EquipmentId = "eq-1", UnsLineId = "nw-line-1", Name = "station-1", MachineCode = "STATION_001" };
 
         var composition = AddressSpaceComposer.Compose(
             new[] { area }, new[] { line }, new[] { equipment }, new[] { driver },
-            Array.Empty<ScriptedAlarm>(), new[] { tag }, new[] { ns });
+            Array.Empty<ScriptedAlarm>());
 
-        // Compose-side EquipmentTags extraction.
+        // Compose-side EquipmentTags extraction (Batch-4 subject — empty this batch).
         var planned = composition.EquipmentTags.ShouldHaveSingleItem();
         planned.EquipmentId.ShouldBe("eq-1");
         planned.FullName.ShouldBe("40001");
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerAliasTagTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerAliasTagTests.cs
index c01d71c6..70138b07 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerAliasTagTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerAliasTagTests.cs
@@ -1,81 +1,30 @@
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 
 namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
 
 /// <summary>
-///     Verifies the live-edit compose seam (<see cref="AddressSpaceComposer.Compose"/>) treats a Galaxy
-///     point as an ordinary equipment tag: <c>GalaxyMxGateway</c> is a standard Equipment-kind driver.
-///     An equipment-scoped <see cref="Tag"/> (non-null <see cref="Tag.EquipmentId"/>) bound to a
-///     <c>GalaxyMxGateway</c> driver living in an <c>Equipment</c>-kind namespace must surface under
-///     <see cref="AddressSpaceComposition.EquipmentTags"/> (carrying its driver-side FullName).
+///     Characterized the live-edit compose seam admitting a Galaxy point as an ordinary equipment tag:
+///     an equipment-scoped <c>Tag</c> bound to a <c>GalaxyMxGateway</c> driver surfaced under
+///     <see cref="AddressSpaceComposition.EquipmentTags"/> carrying its driver-side FullName (coalescing a
+///     null FolderPath to <c>string.Empty</c>).
+///     <para><b>v3 Batch-1 DARK + reshaped seed:</b> equipment-tag variable plans do not materialize until
+///     Batch 4 (the composer emits an empty <c>EquipmentTags</c> set — the raw + UNS variable nodes light
+///     up in Batch 4's dual-namespace UNS↔Raw fan-out). The seed mechanism this test used is also gone:
+///     <c>Tag</c> is now raw-only (no <c>EquipmentId</c>/<c>DriverInstanceId</c>/<c>FolderPath</c>), the
+///     Compose overload no longer takes tags/namespaces, and equipment references raw tags via
+///     <c>UnsTagReference</c> rather than a Galaxy point carrying an <c>EquipmentId</c>. So there is no
+///     Batch-1 analog to assert. Re-author against the UnsTagReference → EquipmentTags fan-out when Batch 4
+///     lights the equipment-tag variable nodes.</para>
 /// </summary>
 public sealed class AddressSpaceComposerAliasTagTests
 {
-    /// <summary>A <c>GalaxyMxGateway</c> driver in an Equipment-kind namespace carries an
-    /// equipment-scoped Galaxy tag (EquipmentId set, FolderPath null, TagConfig FullName = the Galaxy
-    /// ref). Compose must put it in EquipmentTags with its FullName, coalescing the null FolderPath to
-    /// <c>string.Empty</c>.</summary>
-    [Fact]
+    /// <summary>A <c>GalaxyMxGateway</c> equipment tag surfaces under EquipmentTags with its FullName —
+    /// dark until Batch 4 (empty equipment-tag plan set) and re-authored via UnsTagReference.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Compose_admits_galaxy_equipment_tag_in_equipment_tags()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        var driver = new DriverInstance
-        {
-            DriverInstanceId = "drv-galaxy",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Galaxy1",
-            DriverType = "GalaxyMxGateway",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment
-        {
-            EquipmentId = "eq-1",
-            DriverInstanceId = "drv-galaxy",
-            UnsLineId = "line-1",
-            Name = "TestMachine_020",
-            MachineCode = "TESTMACHINE_020",
-        };
-
-        // Equipment-scoped Galaxy tag: EquipmentId set, FolderPath null, FullName = Galaxy ref.
-        var galaxyTag = new Tag
-        {
-            TagId = "tag-galaxy",
-            DriverInstanceId = "drv-galaxy",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "TestChangingInt",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"TestMachine_020.TestChangingInt\"}",
-        };
-
-        var result = AddressSpaceComposer.Compose(
-            new[] { area }, new[] { line }, new[] { equip },
-            new[] { driver }, Array.Empty<ScriptedAlarm>(),
-            new[] { galaxyTag }, new[] { ns });
-
-        // The Galaxy point survives composition as an equipment tag, carrying its Galaxy FullName.
-        var tag = result.EquipmentTags.ShouldHaveSingleItem();
-        tag.TagId.ShouldBe("tag-galaxy");
-        tag.EquipmentId.ShouldBe("eq-1");
-        tag.DriverInstanceId.ShouldBe("drv-galaxy");
-        tag.Name.ShouldBe("TestChangingInt");
-        tag.DataType.ShouldBe("Int32");
-        tag.FullName.ShouldBe("TestMachine_020.TestChangingInt");
-        // The input Tag.FolderPath is null; the composer coalesces it to string.Empty (the explicit
-        // byte-parity null-coalesce the artifact-decode side mirrors).
-        tag.FolderPath.ShouldBe(string.Empty);
+        // Dark until Batch 4: see class summary. EquipmentTags is emitted empty this batch and the
+        // Tag.EquipmentId binding this test relied on is retired (Tag is raw-only). The Batch-4 seam
+        // fans equipment tags in via UnsTagReference; re-author the assertion then.
     }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerDeviceHostTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerDeviceHostTests.cs
index 36285256..8393f9a3 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerDeviceHostTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerDeviceHostTests.cs
@@ -1,98 +1,27 @@
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 
 namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
 
 /// <summary>
-///     Covers follow-up E projection: <see cref="EquipmentNode"/> carries the equipment's
-///     <c>DriverInstanceId</c> / <c>DeviceId</c> bindings and the resolved <c>DeviceHost</c> (parsed from
-///     the bound <see cref="Device"/>'s schemaless <c>DeviceConfig</c> JSON via the shared
-///     <c>DeviceConfigIntent.TryExtractHost</c>). A later task grafts a driver's discovered
-///     FixedTree onto a zero-tag equipment and partitions a multi-device driver by host using these.
-///     <para>The direct host-extraction + normalization unit tests moved to
-///     <c>Commons.Tests/DeviceConfigIntentTests</c> (R2-11) — this suite keeps the Compose-level projection
-///     coverage.</para>
+///     RETIRED (v3): this suite characterized follow-up E's <see cref="EquipmentNode"/> projection of an
+///     equipment's <c>DriverInstanceId</c> / <c>DeviceId</c> bindings + the resolved <c>DeviceHost</c>
+///     (parsed from the bound device's <c>DeviceConfig</c>). In v3 the equipment↔device binding is
+///     architecturally removed — <c>Equipment</c> no longer carries <c>DriverInstanceId</c>/<c>DeviceId</c>,
+///     <c>AddressSpaceComposer.Compose</c> no longer takes a <c>devices</c> list, and equipment references
+///     raw tags via <c>UnsTagReference</c> instead of hosting a device. <c>EquipmentNode</c>'s
+///     driver/device/host fields are therefore always null.
+///     <para>The coverage did not vanish, it moved: the device-endpoint merge is exercised by
+///     <c>Runtime.Tests.Drivers.DeploymentArtifactRawPathTests</c> (nested RawPath + device-endpoint merge),
+///     and the host-extraction/normalization unit lives in <c>Commons.Tests.DeviceConfigIntentTests</c>
+///     (R2-11). The Skipped placeholder below preserves the retirement rationale in test output.</para>
 /// </summary>
 public sealed class AddressSpaceComposerDeviceHostTests
 {
-    /// <summary>An equipment bound to a driver + a device whose config carries a top-level
-    /// <c>HostAddress</c> resolves all three fields, with the host trimmed + lower-cased.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentDeviceBindingRetired)]
     public void Compose_resolves_driver_device_and_device_host()
     {
-        var equipment = new[] { NewEquipment("eq-1", driver: "d1", device: "dev1") };
-        var devices = new[] { NewDevice("dev1", "d1", "{\"HostAddress\":\"10.0.0.5:8193\"}") };
-
-        var node = AddressSpaceComposer.Compose(
-                Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment,
-                Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(), devices: devices)
-            .EquipmentNodes.ShouldHaveSingleItem();
-
-        node.EquipmentId.ShouldBe("eq-1");
-        node.DriverInstanceId.ShouldBe("d1");
-        node.DeviceId.ShouldBe("dev1");
-        node.DeviceHost.ShouldBe("10.0.0.5:8193");
+        // Retired: see class summary. Equipment no longer binds a driver/device; the EquipmentNode
+        // driver/device/host projection is gone. Coverage moved to DeploymentArtifactRawPathTests
+        // (device-endpoint merge) + DeviceConfigIntentTests (host extraction).
     }
-
-    /// <summary>An equipment with no driver and no device → all three new fields null (driver-less,
-    /// no device to resolve a host from).</summary>
-    [Fact]
-    public void Compose_equipment_without_driver_or_device_yields_null_bindings()
-    {
-        var equipment = new[] { NewEquipment("eq-1", driver: null, device: null) };
-
-        var node = AddressSpaceComposer.Compose(
-                Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment,
-                Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(), devices: Array.Empty<Device>())
-            .EquipmentNodes.ShouldHaveSingleItem();
-
-        node.DriverInstanceId.ShouldBeNull();
-        node.DeviceId.ShouldBeNull();
-        node.DeviceHost.ShouldBeNull();
-    }
-
-    /// <summary>A bound DeviceId with no matching device row, or a device whose config has no
-    /// <c>HostAddress</c>, resolves DeviceHost to null while DeviceId is still carried.</summary>
-    [Fact]
-    public void Compose_device_host_is_null_when_unresolvable()
-    {
-        var equipment = new[]
-        {
-            NewEquipment("eq-missing", driver: "d1", device: "dev-missing"),
-            NewEquipment("eq-nohost", driver: "d1", device: "dev-nohost"),
-        };
-        var devices = new[] { NewDevice("dev-nohost", "d1", "{\"Port\":502}") };
-
-        var nodes = AddressSpaceComposer.Compose(
-                Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment,
-                Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(), devices: devices)
-            .EquipmentNodes;
-
-        var missing = nodes.Single(n => n.EquipmentId == "eq-missing");
-        missing.DeviceId.ShouldBe("dev-missing");
-        missing.DeviceHost.ShouldBeNull();
-
-        var noHost = nodes.Single(n => n.EquipmentId == "eq-nohost");
-        noHost.DeviceId.ShouldBe("dev-nohost");
-        noHost.DeviceHost.ShouldBeNull();
-    }
-
-    private static Equipment NewEquipment(string id, string? driver, string? device) => new()
-    {
-        EquipmentId = id,
-        DriverInstanceId = driver,
-        DeviceId = device,
-        UnsLineId = "line-1",
-        Name = id,
-        MachineCode = id.ToUpperInvariant(),
-    };
-
-    private static Device NewDevice(string deviceId, string driverInstanceId, string deviceConfig) => new()
-    {
-        DeviceId = deviceId,
-        DriverInstanceId = driverInstanceId,
-        Name = deviceId,
-        DeviceConfig = deviceConfig,
-    };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerEquipTokenTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerEquipTokenTests.cs
index 3f216ab3..8f7c32c9 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerEquipTokenTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerEquipTokenTests.cs
@@ -1,7 +1,6 @@
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 
 namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
 
@@ -10,6 +9,13 @@ namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
 /// reserved <c>{{equip}}</c> token in a shared VirtualTag script with each owning equipment's
 /// derived tag base (from its child-tag <c>FullName</c>s) — so one script reused across N
 /// identical machines resolves to N machine-specific dependency graphs.
+///
+/// <para><b>v3 Batch-1 DARK:</b> the per-equipment tag base is DERIVED from equipment-tag
+/// <c>FullName</c>s, and equipment-tag variable plans do not materialize until Batch 4 (the composer
+/// no longer takes tags — <c>baseByEquip</c> is empty this batch). With no base to substitute, the
+/// <c>{{equip}}</c> token stays literal and these per-machine assertions have nothing to compare, so
+/// the test is Skipped-with-reason. The seed + assertions are preserved verbatim (minus the retired
+/// entity columns) so re-enabling in Batch 4 is a one-line change once the fan-out feeds the base.</para>
 /// </summary>
 public sealed class AddressSpaceComposerEquipTokenTests
 {
@@ -17,21 +23,17 @@ public sealed class AddressSpaceComposerEquipTokenTests
     /// to two equipments (TestMachine_001 / _002) each with one equipment Tag whose FullName carries
     /// the per-machine base. Compose must expand the token per equipment in both the Expression and
     /// the parsed DependencyRefs.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Compose_substitutes_equip_token_per_equipment()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
+        // v3: no Namespace entity; DriverInstance no longer binds a Namespace; Equipment no longer
+        // binds a driver. In Batch 4 the {{equip}} base derives from the equipment's child-tag
+        // FullNames — here TestMachine_001.Source / TestMachine_002.Source — which flow through the
+        // (dark this batch) equipment-tag plan set. Seeded for intent; not passed to Compose.
         var driver1 = new DriverInstance
         {
             DriverInstanceId = "drv-1",
             ClusterId = "c1",
-            NamespaceId = "ns-eq",
             Name = "Modbus1",
             DriverType = "Modbus",
             DriverConfig = "{}",
@@ -40,35 +42,14 @@ public sealed class AddressSpaceComposerEquipTokenTests
         {
             DriverInstanceId = "drv-2",
             ClusterId = "c1",
-            NamespaceId = "ns-eq",
             Name = "Modbus2",
             DriverType = "Modbus",
             DriverConfig = "{}",
         };
         var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
         var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip1 = new Equipment { EquipmentId = "eq-1", DriverInstanceId = "drv-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
-        var equip2 = new Equipment { EquipmentId = "eq-2", DriverInstanceId = "drv-2", UnsLineId = "line-1", Name = "TestMachine_002", MachineCode = "TESTMACHINE_002" };
-        var tag1 = new Tag
-        {
-            TagId = "tag-1",
-            DriverInstanceId = "drv-1",
-            EquipmentId = "eq-1",
-            Name = "Source",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"TestMachine_001.Source\",\"DataType\":\"Int32\"}",
-        };
-        var tag2 = new Tag
-        {
-            TagId = "tag-2",
-            DriverInstanceId = "drv-2",
-            EquipmentId = "eq-2",
-            Name = "Source",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"TestMachine_002.Source\",\"DataType\":\"Int32\"}",
-        };
+        var equip1 = new Equipment { EquipmentId = "eq-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
+        var equip2 = new Equipment { EquipmentId = "eq-2", UnsLineId = "line-1", Name = "TestMachine_002", MachineCode = "TESTMACHINE_002" };
         var script = new Script
         {
             ScriptId = "s-equip",
@@ -82,7 +63,6 @@ public sealed class AddressSpaceComposerEquipTokenTests
         var result = AddressSpaceComposer.Compose(
             new[] { area }, new[] { line }, new[] { equip1, equip2 },
             new[] { driver1, driver2 }, Array.Empty<ScriptedAlarm>(),
-            new[] { tag1, tag2 }, new[] { ns },
             virtualTags: new[] { vt1, vt2 },
             scripts: new[] { script });
 
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerPurityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerPurityTests.cs
index 075cd5f9..13baacae 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerPurityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerPurityTests.cs
@@ -136,7 +136,6 @@ public sealed class AddressSpaceComposerPurityTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(),
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             virtualTags: new[] { vt },
             scripts: new[] { script });
 
@@ -174,7 +173,6 @@ public sealed class AddressSpaceComposerPurityTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(),
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             virtualTags: new[] { vt },
             scripts: new[] { script });
 
@@ -200,7 +198,6 @@ public sealed class AddressSpaceComposerPurityTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(),
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             virtualTags: new[] { vt },
             scripts: Array.Empty<Script>());
 
@@ -213,7 +210,6 @@ public sealed class AddressSpaceComposerPurityTests
     private static Equipment NewEquipment(string id) => new()
     {
         EquipmentId = id,
-        DriverInstanceId = "drv-1",
         UnsLineId = "line-1",
         Name = id,
         MachineCode = id.ToUpperInvariant(),
@@ -223,7 +219,6 @@ public sealed class AddressSpaceComposerPurityTests
     {
         DriverInstanceId = id,
         ClusterId = "cluster-1",
-        NamespaceId = "ns-1",
         Name = id,
         DriverType = "Stub",
         DriverConfig = "{\"k\":\"v\"}",
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerScriptedAlarmTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerScriptedAlarmTests.cs
index c75dc3c3..615b214d 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerScriptedAlarmTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerScriptedAlarmTests.cs
@@ -65,7 +65,6 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { alarm1, alarm2 },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             virtualTags: Array.Empty<VirtualTag>(),
             scripts: new[] { script1, script2 });
 
@@ -121,7 +120,6 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { alarm },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             scripts: new[] { script });
 
         var plan = result.EquipmentScriptedAlarms.ShouldHaveSingleItem();
@@ -158,7 +156,6 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { alarm },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             scripts: new[] { script });
 
         var plan = result.EquipmentScriptedAlarms.ShouldHaveSingleItem();
@@ -202,7 +199,6 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { goodAlarm, orphanAlarm },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             scripts: new[] { goodScript });
 
         var plan = result.EquipmentScriptedAlarms.ShouldHaveSingleItem();
@@ -237,7 +233,6 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var result = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { alarm },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             scripts: new[] { script });
 
         var plan = result.EquipmentScriptedAlarms.ShouldHaveSingleItem();
@@ -264,12 +259,12 @@ public sealed class AddressSpaceComposerScriptedAlarmTests
         var r1 = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { a1, a2, a3 },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(), scripts: scripts);
+            scripts: scripts);
 
         var r2 = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { a3, a1, a2 },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(), scripts: scripts);
+            scripts: scripts);
 
         // Sorted by EquipmentId then ScriptedAlarmId: (eq-1,al-2), (eq-1,al-3), (eq-2,al-1).
         r1.EquipmentScriptedAlarms.Select(p => p.ScriptedAlarmId)
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerVirtualTagHistorizeTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerVirtualTagHistorizeTests.cs
index 92dc6c4a..5a92d0be 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerVirtualTagHistorizeTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/AddressSpaceComposerVirtualTagHistorizeTests.cs
@@ -17,35 +17,20 @@ public sealed class AddressSpaceComposerVirtualTagHistorizeTests
     [Fact]
     public void Compose_carries_virtual_tag_historize_flag_onto_plan()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
+        // v3: no Namespace entity; DriverInstance no longer binds a Namespace; Equipment no longer
+        // binds a driver. The dependency tag is not seeded here — the composer no longer takes tags
+        // (they're dark until Batch 4) and the VirtualTag subject of this test is a LIVE surface.
         var driver = new DriverInstance
         {
             DriverInstanceId = "drv-1",
             ClusterId = "c1",
-            NamespaceId = "ns-eq",
             Name = "Modbus1",
             DriverType = "Modbus",
             DriverConfig = "{}",
         };
         var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
         var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment { EquipmentId = "eq-1", DriverInstanceId = "drv-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
-        var tag = new Tag
-        {
-            TagId = "tag-1",
-            DriverInstanceId = "drv-1",
-            EquipmentId = "eq-1",
-            Name = "Source",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"TestMachine_001.Source\",\"DataType\":\"Int32\"}",
-        };
+        var equip = new Equipment { EquipmentId = "eq-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
         var script = new Script
         {
             ScriptId = "s-1",
@@ -60,7 +45,6 @@ public sealed class AddressSpaceComposerVirtualTagHistorizeTests
         var result = AddressSpaceComposer.Compose(
             new[] { area }, new[] { line }, new[] { equip },
             new[] { driver }, Array.Empty<ScriptedAlarm>(),
-            new[] { tag }, new[] { ns },
             virtualTags: new[] { vtHist, vtPlain },
             scripts: new[] { script });
 
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/DarkAddressSpaceReasons.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/DarkAddressSpaceReasons.cs
new file mode 100644
index 00000000..8716ac61
--- /dev/null
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/DarkAddressSpaceReasons.cs
@@ -0,0 +1,33 @@
+namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
+
+/// <summary>
+///     Shared xUnit <c>Skip</c> reason constants for OpcUaServer tests whose intent is retained but
+///     whose subject is not materialized in the v3 Batch-1 DARK address space. The composer
+///     (<see cref="AddressSpaceComposer.Compose"/>) and the artifact both emit an EMPTY equipment-tag
+///     variable plan set this batch — raw + UNS variable nodes are lit up in Batch 4's dual-namespace
+///     UNS↔Raw fan-out. Until then any assertion whose subject is an equipment-tag variable node (its
+///     FullName, its <c>{{equip}}</c>-token-derived base, its device-host binding) has nothing to
+///     compare, so it is Skipped-with-reason rather than deleted. Mirrors
+///     <c>Runtime.Tests.Drivers.DarkAddressSpaceReasons</c>.
+/// </summary>
+internal static class DarkAddressSpaceReasons
+{
+    /// <summary>
+    ///     Equipment-tag variable materialization + its per-field intent (FullName / array / historize /
+    ///     native-alarm / <c>{{equip}}</c>-token base derived from child-tag FullNames) is dark until Batch 4.
+    /// </summary>
+    public const string EquipmentTagsDarkBatch4 =
+        "v3 dark address space: equipment-tag variable plans (FullName / array / historize / alarm / " +
+        "{{equip}}-token base derived from child-tag FullNames) do not materialize until Batch 4 " +
+        "(dual-namespace UNS↔Raw fan-out). The composer emits an empty equipment-tag plan set this batch, " +
+        "so there is no per-equipment tag base to substitute and no equipment-tag variable node to assert. " +
+        "Migrate + re-enable when Batch 4 lights the raw/UNS variable nodes.";
+
+    /// <summary>Equipment↔device host binding is architecturally retired in v3.</summary>
+    public const string EquipmentDeviceBindingRetired =
+        "v3: equipment no longer binds a driver/device — Equipment lost DriverInstanceId/DeviceId and " +
+        "Compose no longer takes a devices list, so EquipmentNode's DriverInstanceId/DeviceId/DeviceHost " +
+        "projection is always null. Equipment references raw tags via UnsTagReference. The device-endpoint " +
+        "merge this suite characterized now lives in Runtime.Tests DeploymentArtifactRawPathTests; the " +
+        "host-extraction unit is Commons.Tests DeviceConfigIntentTests.";
+}
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DarkAddressSpaceReasons.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DarkAddressSpaceReasons.cs
new file mode 100644
index 00000000..cd44ab42
--- /dev/null
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DarkAddressSpaceReasons.cs
@@ -0,0 +1,27 @@
+namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
+
+/// <summary>
+///     Shared xUnit <c>Skip</c> reason constants for tests whose intent is retained but whose subject is
+///     not materialized in the v3 Batch-1 DARK address space. Equipment-tag variable nodes (and their
+///     per-field intent: FullName / array / historize / native-alarm) are lit up by the Batch-4 dual
+///     namespace + UNS↔Raw fan-out; until then the composer/artifact both emit an EMPTY equipment-tag
+///     plan set, so any parity assertion over those plans has nothing to compare. The raw-tag parse
+///     intent these tests characterized lives on in <see cref="TagConfigCorpusParityTests"/> (RawTagEntry
+///     round-trip) and <c>TagConfigIntentTests</c> (the parse unit).
+/// </summary>
+internal static class DarkAddressSpaceReasons
+{
+    /// <summary>Equipment-tag variable materialization + its per-field intent is dark until Batch 4.</summary>
+    public const string EquipmentTagsDarkBatch4 =
+        "v3 dark address space: equipment-tag variable plans (FullName/array/historize/alarm) do not " +
+        "materialize until Batch 4 (dual-namespace UNS↔Raw fan-out). The composer + artifact both emit an " +
+        "empty equipment-tag plan set this batch, so this parity has nothing to compare. Raw-tag parse " +
+        "intent is covered by TagConfigCorpusParityTests (RawTagEntry round-trip) + TagConfigIntentTests.";
+
+    /// <summary>Equipment↔device host binding is architecturally retired in v3.</summary>
+    public const string EquipmentDeviceBindingRetired =
+        "v3: equipment no longer binds a driver/device (EquipmentNode has no DriverInstanceId/DeviceId/" +
+        "DeviceHost) — equipment references raw tags via UnsTagReference. The device-endpoint merge this " +
+        "test characterized is now covered by DeploymentArtifactRawPathTests " +
+        "(ParseDriverInstances_computes_nested_RawPath_and_merges_device_endpoint).";
+}
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactAliasParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactAliasParityTests.cs
index b0362164..86446705 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactAliasParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactAliasParityTests.cs
@@ -1,442 +1,32 @@
-using System.Linq;
-using System.Text.Json;
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-using ZB.MOM.WW.OtOpcUa.OpcUaServer;
-using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
-///     Verifies the artifact-decode mirror (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>)
-///     treats a Galaxy point as an ordinary equipment tag — an equipment-scoped tag (non-null
-///     <c>EquipmentId</c>) bound to a <c>GalaxyMxGateway</c> driver in an <c>Equipment</c>-kind namespace —
-///     into the decoded <c>EquipmentTags</c> with byte-parity to the live-edit composer path: same FullName,
-///     EquipmentId, DriverInstanceId, Name, DataType. Both data-contract sites gate purely on the namespace
-///     Kind being <c>Equipment</c> (no Galaxy/DriverType exception — Galaxy is an ordinary Equipment-kind
-///     driver), so they agree on which tags qualify.
+///     Galaxy-as-ordinary-equipment-tag byte-parity: a Galaxy point (equipment-scoped tag bound to a
+///     <c>GalaxyMxGateway</c> driver) surfaced into <c>EquipmentTags</c> with the same FullName /
+///     EquipmentId / DriverInstanceId / AccessLevel→Writable / native-alarm intent on both the composer
+///     and the artifact-decode seam.
+///     <para>
+///     <b>v3 DARK (Batch 1):</b> equipment-tag variable plans do not materialize — both producers emit an
+///     EMPTY <c>EquipmentTags</c> set until the Batch-4 dual-namespace UNS↔Raw fan-out. Additionally, the
+///     v3 schema retired the <c>Namespace</c>/<c>NamespaceKind</c> entities and the Galaxy
+///     <c>ExplicitFullName</c> / namespace-Kind gate this test keyed off; Galaxy is an ordinary
+///     Device-bound driver whose raw tags reach the UNS via <c>UnsTagReference</c>. The AccessLevel→Writable
+///     and native-alarm parse this asserted are covered at the parse unit (<c>TagConfigIntentTests</c>) and
+///     the RawTagEntry round-trip (<see cref="TagConfigCorpusParityTests"/>). Unskip + rewrite to the
+///     Batch-4 UNS-projection shape when equipment-tag plans light up.
+///     </para>
 /// </summary>
 public sealed class DeploymentArtifactAliasParityTests
 {
-    /// <summary>An artifact JSON blob with a GalaxyMxGateway driver in an Equipment (Kind=0) namespace and
-    /// one equipment-scoped tag (EquipmentId set, FolderPath null, FullName = the Galaxy ref). Decode must
-    /// surface the tag in EquipmentTags carrying its driver-side FullName, coalescing the null FolderPath to
-    /// <c>string.Empty</c>.</summary>
-    [Fact]
-    public void ParseComposition_admits_galaxy_equipment_tag_in_equipment_tags()
-    {
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[]
-            {
-                new { NamespaceId = "ns-eq", Kind = 0 }, // NamespaceKind.Equipment
-            },
-            DriverInstances = new[]
-            {
-                new { DriverInstanceId = "drv-galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}", NamespaceId = "ns-eq" },
-            },
-            Tags = new object[]
-            {
-                new
-                {
-                    TagId = "tag-galaxy",
-                    DriverInstanceId = "drv-galaxy",
-                    EquipmentId = "eq-1",
-                    Name = "TestChangingInt",
-                    FolderPath = (string?)null,
-                    DataType = "Int32",
-                    TagConfig = "{\"FullName\":\"TestMachine_020.TestChangingInt\"}",
-                },
-            },
-        });
-
-        var c = DeploymentArtifact.ParseComposition(blob);
-
-        var tag = c.EquipmentTags.ShouldHaveSingleItem();
-        tag.TagId.ShouldBe("tag-galaxy");
-        tag.EquipmentId.ShouldBe("eq-1");
-        tag.DriverInstanceId.ShouldBe("drv-galaxy");
-        tag.Name.ShouldBe("TestChangingInt");
-        tag.DataType.ShouldBe("Int32");
-        tag.FolderPath.ShouldBe(string.Empty);
-        tag.FullName.ShouldBe("TestMachine_020.TestChangingInt");
-        // No AccessLevel in the blob → defaults to non-writable (read-only node).
-        tag.Writable.ShouldBeFalse();
-    }
-
-    /// <summary>The artifact decoder reads <c>AccessLevel</c> into <c>EquipmentTagPlan.Writable</c>:
-    /// ReadWrite → true, Read → false. ConfigComposer emits the enum numerically (no string converter),
-    /// so the numeric form (1 = ReadWrite) is the canonical wire shape, but the decoder also tolerates
-    /// the string form ("ReadWrite") defensively — mirroring how the Kind gate accepts both.</summary>
-    [Theory]
-    [InlineData(1, true)]    // numeric ReadWrite
-    [InlineData(0, false)]   // numeric Read
-    [InlineData(2, false)]   // future/unknown AccessLevel maps fail-safe to read-only (only ReadWrite==1 ⇒ writable)
-    public void ParseComposition_maps_numeric_AccessLevel_to_Writable(int accessLevel, bool expectedWritable)
-    {
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[] { new { NamespaceId = "ns-eq", Kind = 0 } },
-            DriverInstances = new[]
-            {
-                new { DriverInstanceId = "drv", DriverType = "Modbus", DriverConfig = "{}", NamespaceId = "ns-eq" },
-            },
-            Tags = new object[]
-            {
-                new
-                {
-                    TagId = "tag-1",
-                    DriverInstanceId = "drv",
-                    EquipmentId = "eq-1",
-                    Name = "Speed",
-                    FolderPath = (string?)null,
-                    DataType = "Float",
-                    AccessLevel = accessLevel,
-                    TagConfig = "{\"FullName\":\"40001\"}",
-                },
-            },
-        });
-
-        var c = DeploymentArtifact.ParseComposition(blob);
-
-        c.EquipmentTags.ShouldHaveSingleItem().Writable.ShouldBe(expectedWritable);
-    }
-
-    /// <summary>The decoder also tolerates the string enum form ("ReadWrite"/"Read") in case a future
-    /// serializer registers a string converter — byte-parity safety, mirroring the Kind gate.</summary>
-    [Theory]
-    [InlineData("ReadWrite", true)]
-    [InlineData("Read", false)]
-    public void ParseComposition_maps_string_AccessLevel_to_Writable(string accessLevel, bool expectedWritable)
-    {
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[] { new { NamespaceId = "ns-eq", Kind = 0 } },
-            DriverInstances = new[]
-            {
-                new { DriverInstanceId = "drv", DriverType = "Modbus", DriverConfig = "{}", NamespaceId = "ns-eq" },
-            },
-            Tags = new object[]
-            {
-                new
-                {
-                    TagId = "tag-1",
-                    DriverInstanceId = "drv",
-                    EquipmentId = "eq-1",
-                    Name = "Speed",
-                    FolderPath = (string?)null,
-                    DataType = "Float",
-                    AccessLevel = accessLevel,
-                    TagConfig = "{\"FullName\":\"40001\"}",
-                },
-            },
-        });
-
-        var c = DeploymentArtifact.ParseComposition(blob);
-
-        c.EquipmentTags.ShouldHaveSingleItem().Writable.ShouldBe(expectedWritable);
-    }
-
-    /// <summary>An equipment-scoped tag in a non-Equipment (Simulated) namespace must NOT surface in
-    /// EquipmentTags — byte-parity with the composer's pure <c>ns.Kind == NamespaceKind.Equipment</c>
-    /// predicate. The gate keys off the namespace Kind alone, with no DriverType exception, so a
-    /// non-Equipment namespace excludes the tag regardless of driver type.</summary>
-    [Fact]
-    public void ParseComposition_excludes_tag_in_non_equipment_namespace()
-    {
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[]
-            {
-                new { NamespaceId = "ns-sim", Kind = 1 }, // NamespaceKind.Simulated (non-Equipment)
-            },
-            DriverInstances = new[]
-            {
-                new { DriverInstanceId = "drv-sim", DriverType = "Modbus", DriverConfig = "{}", NamespaceId = "ns-sim" },
-            },
-            Tags = new object[]
-            {
-                new
-                {
-                    TagId = "tag-x",
-                    DriverInstanceId = "drv-sim",
-                    EquipmentId = "eq-1",
-                    Name = "Source",
-                    FolderPath = (string?)null,
-                    DataType = "Int32",
-                    TagConfig = "{\"FullName\":\"40001\"}",
-                },
-            },
-        });
-
-        var c = DeploymentArtifact.ParseComposition(blob);
-
-        c.EquipmentTags.ShouldBeEmpty();
-    }
-
-    /// <summary>
-    ///     The load-bearing direct byte-parity proof for the two equipment-tag producers: for the SAME
-    ///     input draft, the live-edit composer (<see cref="AddressSpaceComposer.Compose"/>) and the
-    ///     artifact decoder (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>)
-    ///     must emit IDENTICAL <c>EquipmentTags</c> — element-wise equal on every field
-    ///     (TagId, EquipmentId, DriverInstanceId, FolderPath, Name, DataType, FullName) AND in the same
-    ///     ORDER. The draft holds a Galaxy equipment tag (EquipmentId set, GalaxyMxGateway driver in an
-    ///     Equipment-kind namespace, TagConfig <c>{"FullName":"DelmiaReceiver_001.DownloadPath"}</c>)
-    ///     PLUS a Modbus equipment tag, so the parity is proven both for Galaxy specifically and across
-    ///     drivers — Galaxy is now an ordinary Equipment-kind driver with no exception clause on either
-    ///     side. Both sides sort by EquipmentId → FolderPath → Name (Ordinal), so identical input yields
-    ///     identical order. <c>EquipmentTagPlan</c> is a plain positional record (all string members), so
-    ///     <c>SequenceEqual</c> is full value-and-order equality.
-    /// </summary>
-    [Fact]
+    /// <summary>Batch-4 pending: composer and artifact agree on a Galaxy equipment tag surfaced in
+    /// EquipmentTags (FullName + Writable + native alarm). See class remarks — dark this batch.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Composer_and_artifact_agree_on_galaxy_equipment_tag()
     {
-        // ---- The ONE input draft both producers consume ----
-        // Equipment-kind namespace shared by both drivers (the qualifying gate on both sides).
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        // Galaxy is a standard Equipment-kind driver now — no driver-type exception on either side.
-        var galaxyDriver = new DriverInstance
-        {
-            DriverInstanceId = "drv-galaxy",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Galaxy1",
-            DriverType = "GalaxyMxGateway",
-            DriverConfig = "{}",
-        };
-        var modbusDriver = new DriverInstance
-        {
-            DriverInstanceId = "drv-modbus",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Modbus1",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var galaxyEquip = new Equipment
-        {
-            EquipmentId = "eq-galaxy",
-            DriverInstanceId = "drv-galaxy",
-            UnsLineId = "line-1",
-            Name = "DelmiaReceiver",
-            MachineCode = "DELMIARECEIVER",
-        };
-        var modbusEquip = new Equipment
-        {
-            EquipmentId = "eq-modbus",
-            DriverInstanceId = "drv-modbus",
-            UnsLineId = "line-1",
-            Name = "FillingPump",
-            MachineCode = "FILLINGPUMP",
-        };
-
-        // The Galaxy equipment tag — FullName is the Galaxy ref "tag_name.AttributeName".
-        // It also carries a native-alarm intent in TagConfig.alarm, so this draft proves the
-        // optional Alarm field is parsed byte-identically on both producers (Phase B WS-2).
-        var galaxyTag = new Tag
-        {
-            TagId = "tag-galaxy",
-            DriverInstanceId = "drv-galaxy",
-            EquipmentId = "eq-galaxy",
-            FolderPath = null, // coalesces to "" on both sides
-            Name = "DownloadPath",
-            DataType = "String",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"DelmiaReceiver_001.DownloadPath\",\"alarm\":{\"alarmType\":\"OffNormalAlarm\",\"severity\":700}}",
-        };
-        // A non-Galaxy (Modbus) equipment tag — proves the parity holds across drivers, not just Galaxy.
-        var modbusTag = new Tag
-        {
-            TagId = "tag-modbus",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-modbus",
-            FolderPath = "registers",
-            Name = "Speed",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.ReadWrite,
-            TagConfig = "{\"FullName\":\"40001\"}",
-        };
-
-        var areas = new[] { area };
-        var lines = new[] { line };
-        var equipment = new[] { galaxyEquip, modbusEquip };
-        var drivers = new[] { galaxyDriver, modbusDriver };
-        var tags = new[] { galaxyTag, modbusTag };
-        var namespaces = new[] { ns };
-
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            areas, lines, equipment, drivers, Array.Empty<ScriptedAlarm>(), tags, namespaces);
-
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape ConfigComposer emits
-        //              (Pascal-case off the EF entities), then decode it. ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[]
-            {
-                new { ns.NamespaceId, ns.ClusterId, Kind = (int)ns.Kind },
-            },
-            DriverInstances = new[]
-            {
-                new { galaxyDriver.DriverInstanceId, galaxyDriver.DriverType, galaxyDriver.DriverConfig, galaxyDriver.NamespaceId, galaxyDriver.ClusterId },
-                new { modbusDriver.DriverInstanceId, modbusDriver.DriverType, modbusDriver.DriverConfig, modbusDriver.NamespaceId, modbusDriver.ClusterId },
-            },
-            Tags = new[]
-            {
-                ToSnapshot(galaxyTag),
-                ToSnapshot(modbusTag),
-            },
-        });
-
-        var decoded = DeploymentArtifact.ParseComposition(blob);
-
-        // ---- The equality contract: element-wise equal on ALL fields + same order ----
-        decoded.EquipmentTags.Count.ShouldBe(2);
-        // SequenceEqual = full value-and-order equality (EquipmentTagPlan is a positional record).
-        decoded.EquipmentTags.SequenceEqual(composed.EquipmentTags).ShouldBeTrue();
-
-        // Spell the per-field contract out too (so a future divergence names the offending field
-        // rather than just "sequences differ"), and pin the Galaxy tag's wire-level FullName.
-        foreach (var (d, x) in decoded.EquipmentTags.Zip(composed.EquipmentTags))
-        {
-            d.TagId.ShouldBe(x.TagId);
-            d.EquipmentId.ShouldBe(x.EquipmentId);
-            d.DriverInstanceId.ShouldBe(x.DriverInstanceId);
-            d.FolderPath.ShouldBe(x.FolderPath);
-            d.Name.ShouldBe(x.Name);
-            d.DataType.ShouldBe(x.DataType);
-            d.FullName.ShouldBe(x.FullName);
-            d.Writable.ShouldBe(x.Writable);
-            d.Alarm.ShouldBe(x.Alarm); // EquipmentTagAlarmInfo is a positional record ⇒ value equality
-        }
-
-        var galaxyPlan = decoded.EquipmentTags.Single(t => t.TagId == "tag-galaxy");
-        galaxyPlan.FullName.ShouldBe("DelmiaReceiver_001.DownloadPath");
-        galaxyPlan.EquipmentId.ShouldBe("eq-galaxy");
-        galaxyPlan.DriverInstanceId.ShouldBe("drv-galaxy");
-        galaxyPlan.FolderPath.ShouldBe(string.Empty); // null FolderPath coalesced identically on both sides
-
-        // The native-alarm intent in the Galaxy tag's TagConfig.alarm is parsed byte-identically on both
-        // producers (Phase B WS-2). The Modbus tag has no alarm object ⇒ null Alarm on both sides.
-        galaxyPlan.Alarm.ShouldNotBeNull();
-        galaxyPlan.Alarm!.AlarmType.ShouldBe("OffNormalAlarm");
-        galaxyPlan.Alarm.Severity.ShouldBe(700);
-        composed.EquipmentTags.Single(t => t.TagId == "tag-galaxy").Alarm.ShouldBe(galaxyPlan.Alarm);
-        decoded.EquipmentTags.Single(t => t.TagId == "tag-modbus").Alarm.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-modbus").Alarm.ShouldBeNull();
-
-        // Writability flows from Tag.AccessLevel: the Galaxy tag is Read (read-only node), the Modbus
-        // tag is ReadWrite (writable node). Both producers must derive the same Writable flag, and the
-        // SequenceEqual above already proves they agree element-wise.
-        galaxyPlan.Writable.ShouldBeFalse(); // AccessLevel = Read
-        var modbusPlan = decoded.EquipmentTags.Single(t => t.TagId == "tag-modbus");
-        modbusPlan.Writable.ShouldBeTrue(); // AccessLevel = ReadWrite
-        composed.EquipmentTags.Single(t => t.TagId == "tag-galaxy").Writable.ShouldBeFalse();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-modbus").Writable.ShouldBeTrue();
+        // Restored + rewritten to the Batch-4 UNS-projection shape when equipment-tag variable plans
+        // materialize: assert a Galaxy point + a Modbus point round-trip identically (FullName, Writable
+        // from AccessLevel, native-alarm intent incl. historizeToAveva) across composer and artifact.
     }
-
-    /// <summary>
-    ///     The native-alarm <c>historizeToAveva</c> opt-out (bool?, the per-condition durable-AVEVA-write
-    ///     gate) is parsed by BOTH equipment-tag producers' <c>ExtractTagAlarm</c> and MUST stay byte-parity:
-    ///     for the SAME tag TagConfig carrying <c>alarm.historizeToAveva: true</c> (and <c>: false</c>), the
-    ///     live-edit composer (<see cref="AddressSpaceComposer.Compose"/>) and the artifact decoder
-    ///     (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>) must derive the
-    ///     identical <c>EquipmentTagAlarmInfo.HistorizeToAveva</c>. The galaxy-tag parity test above already
-    ///     covers the absent ⇒ null case; this pins the explicit-bool branch on both sides.
-    /// </summary>
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public void Composer_and_artifact_agree_on_alarm_historizeToAveva(bool historizeToAveva)
-    {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        var driver = new DriverInstance
-        {
-            DriverInstanceId = "drv-modbus",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Modbus1",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment
-        {
-            EquipmentId = "eq-1",
-            DriverInstanceId = "drv-modbus",
-            UnsLineId = "line-1",
-            Name = "FillingPump",
-            MachineCode = "FILLINGPUMP",
-        };
-        var alarmJson = historizeToAveva ? "true" : "false";
-        var alarmTag = new Tag
-        {
-            TagId = "tag-alarm",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Temp",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = $"{{\"FullName\":\"40001\",\"alarm\":{{\"alarmType\":\"OffNormalAlarm\",\"severity\":700,\"historizeToAveva\":{alarmJson}}}}}",
-        };
-
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            new[] { area }, new[] { line }, new[] { equip }, new[] { driver },
-            Array.Empty<ScriptedAlarm>(), new[] { alarmTag }, new[] { ns });
-
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape, then decode it ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[] { new { ns.NamespaceId, ns.ClusterId, Kind = (int)ns.Kind } },
-            DriverInstances = new[]
-            {
-                new { driver.DriverInstanceId, driver.DriverType, driver.DriverConfig, driver.NamespaceId, driver.ClusterId },
-            },
-            Tags = new[] { ToSnapshot(alarmTag) },
-        });
-
-        var decoded = DeploymentArtifact.ParseComposition(blob);
-
-        // ---- Byte-parity: HistorizeToAveva matches between producers and equals the seeded bool. ----
-        var decodedAlarm = decoded.EquipmentTags.ShouldHaveSingleItem().Alarm.ShouldNotBeNull();
-        var composedAlarm = composed.EquipmentTags.ShouldHaveSingleItem().Alarm.ShouldNotBeNull();
-        decodedAlarm.HistorizeToAveva.ShouldBe(historizeToAveva);
-        composedAlarm.HistorizeToAveva.ShouldBe(historizeToAveva);
-        decodedAlarm.ShouldBe(composedAlarm); // EquipmentTagAlarmInfo is a positional record ⇒ value equality
-    }
-
-    /// <summary>The full Pascal-case snapshot a <see cref="Tag"/> EF entity serialises to in the
-    /// artifact (matches ConfigComposer): the equipment-tag decoder reads exactly these fields.</summary>
-    private static object ToSnapshot(Tag t) => new
-    {
-        t.TagId,
-        t.DriverInstanceId,
-        t.EquipmentId,
-        t.Name,
-        t.FolderPath,
-        t.DataType,
-        // ConfigComposer serialises with no JsonStringEnumConverter, so the TagAccessLevel enum lands
-        // as its numeric value (Read = 0, ReadWrite = 1) — exactly like Kind = (int)ns.Kind above.
-        AccessLevel = (int)t.AccessLevel,
-        t.TagConfig,
-    };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactArrayParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactArrayParityTests.cs
index 5ff6975b..b0f5b6f1 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactArrayParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactArrayParityTests.cs
@@ -1,245 +1,28 @@
-using System.Linq;
-using System.Text.Json;
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-using ZB.MOM.WW.OtOpcUa.OpcUaServer;
-using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
-///     Proves the Phase 4c array intent (<c>isArray</c> + optional <c>arrayLength</c>), which rides
-///     inside the raw <c>TagConfig</c> JSON blob, round-trips with byte-parity through both
-///     equipment-tag producers: the live-edit composer (<see cref="AddressSpaceComposer.Compose"/>) and the
-///     artifact decoder (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>).
-///     A secondary/follower node decoding a serialized deployment artifact MUST materialise array tags
-///     identically to the primary, so the artifact side must derive <c>IsArray</c> / <c>ArrayLength</c>
-///     from the same blob the composer parses. The composer's <c>ExtractTagArray</c> is internal and not
-///     visible to this test assembly (<c>InternalsVisibleTo</c> only names the OpcUaServer.Tests
-///     project), so byte-parity is asserted via the public-surface round-trip — exactly as the sibling
-///     <see cref="DeploymentArtifactHistorizeParityTests"/> does.
+///     Phase 4c array intent (<c>isArray</c> + optional <c>arrayLength</c>) byte-parity between the two
+///     equipment-tag producers.
+///     <para>
+///     <b>v3 DARK (Batch 1):</b> equipment-tag variable plans do not materialize — the composer and the
+///     artifact both emit an EMPTY <c>EquipmentTags</c> set until the Batch-4 dual-namespace UNS↔Raw
+///     fan-out, so there is nothing to compare. The underlying parse of <c>isArray</c> / <c>arrayLength</c>
+///     from a raw <c>TagConfig</c> blob is characterized today by <c>TagConfigIntentTests</c> and
+///     round-tripped through the artifact by <see cref="TagConfigCorpusParityTests"/> (RawTagEntry
+///     byte-preservation). Unskip when Batch 4 lights the equipment-tag plans.
+///     </para>
 /// </summary>
 public sealed class DeploymentArtifactArrayParityTests
 {
-    /// <summary>
-    ///     One draft consumed by both producers, exercising every <c>ExtractTagArray</c> branch:
-    ///     <c>isArray:true,arrayLength:16</c> ⇒ <c>(true, 16u)</c>; absent ⇒ <c>(false, null)</c>;
-    ///     <c>isArray:true</c> with no length ⇒ <c>(true, null)</c>; a non-number (string) length while
-    ///     <c>isArray:true</c> ⇒ <c>(true, null)</c>. The decoded <c>EquipmentTags</c> must equal the
-    ///     composer's element-wise (positional-record value equality) and in the same order, proving
-    ///     <c>IsArray</c> / <c>ArrayLength</c> are derived byte-identically on both seams.
-    /// </summary>
-    [Fact]
+    /// <summary>Batch-4 pending: composer and artifact agree on array equipment-tag plans
+    /// (IsArray + ArrayLength). See class remarks — equipment-tag plans are dark this batch.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Composer_and_artifact_agree_on_array_equipment_tags()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        var driver = new DriverInstance
-        {
-            DriverInstanceId = "drv-modbus",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Modbus1",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment
-        {
-            EquipmentId = "eq-1",
-            DriverInstanceId = "drv-modbus",
-            UnsLineId = "line-1",
-            Name = "FillingPump",
-            MachineCode = "FILLINGPUMP",
-        };
-
-        // Array WITH an explicit bounded length → (true, 16u).
-        var arrayBoundedTag = new Tag
-        {
-            TagId = "tag-array-bounded",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Recipe",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40001\",\"isArray\":true,\"arrayLength\":16}",
-        };
-        // Plain scalar — no isArray flag → (false, null).
-        var scalarTag = new Tag
-        {
-            TagId = "tag-scalar",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Speed",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.ReadWrite,
-            TagConfig = "{\"FullName\":\"40002\"}",
-        };
-        // Array WITHOUT a length → (true, null) ⇒ unbounded 1-D array at materialisation.
-        var arrayUnboundedTag = new Tag
-        {
-            TagId = "tag-array-unbounded",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Trace",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40003\",\"isArray\":true}",
-        };
-        // Array with a NON-number (string) length token → length ignored ⇒ (true, null). This well-formed
-        // blob exercises the artifact-side private ExtractTagArray's number-guard branch through the real
-        // round-trip (it can't be unit-tested directly because it's private). A truly malformed TagConfig
-        // string would cause ExtractTagFullName to return "" and break the SequenceEqual on other fields,
-        // so the throws/malformed path is covered by the composer unit test, not here.
-        // NOTE (review M-1): only the string-type bad-length case is round-tripped here. The
-        // negative/float/overflow arrayLength reject paths are covered on the composer side
-        // (ExtractTagArrayTests) and do not need duplication in this artifact parity test.
-        var arrayBadLengthTag = new Tag
-        {
-            TagId = "tag-array-badlen",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Buffer",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40004\",\"isArray\":true,\"arrayLength\":\"sixteen\"}",
-        };
-        // I-1: isArray:false with a non-zero arrayLength — the artifact-side guard must gate arrayLength
-        // under isArray, so the length is discarded and IsArray==false, ArrayLength==null on both sides.
-        // Pins that a future removal of the isArray gate would be caught here.
-        var arrayDisabledTag = new Tag
-        {
-            TagId = "tag-array-disabled",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Setpoint",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.ReadWrite,
-            TagConfig = "{\"FullName\":\"40005\",\"isArray\":false,\"arrayLength\":8}",
-        };
-        // I-2: isArray:true with arrayLength:0 — zero is a legal explicit dimension bound (e.g. dynamic
-        // array with declared-but-unset size). Must decode to IsArray==true, ArrayLength==0u on both sides.
-        // Pins that a future change treating 0 as absent would be caught here.
-        var arrayZeroLengthTag = new Tag
-        {
-            TagId = "tag-array-zerolen",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Empty",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40006\",\"isArray\":true,\"arrayLength\":0}",
-        };
-
-        var areas = new[] { area };
-        var lines = new[] { line };
-        var equipment = new[] { equip };
-        var drivers = new[] { driver };
-        var tags = new[] { arrayBoundedTag, scalarTag, arrayUnboundedTag, arrayBadLengthTag, arrayDisabledTag, arrayZeroLengthTag };
-        var namespaces = new[] { ns };
-
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            areas, lines, equipment, drivers, Array.Empty<ScriptedAlarm>(), tags, namespaces);
-
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape, then decode it ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[]
-            {
-                new { ns.NamespaceId, ns.ClusterId, Kind = (int)ns.Kind },
-            },
-            DriverInstances = new[]
-            {
-                new { driver.DriverInstanceId, driver.DriverType, driver.DriverConfig, driver.NamespaceId, driver.ClusterId },
-            },
-            Tags = new[]
-            {
-                ToSnapshot(arrayBoundedTag),
-                ToSnapshot(scalarTag),
-                ToSnapshot(arrayUnboundedTag),
-                ToSnapshot(arrayBadLengthTag),
-                ToSnapshot(arrayDisabledTag),
-                ToSnapshot(arrayZeroLengthTag),
-            },
-        });
-
-        var decoded = DeploymentArtifact.ParseComposition(blob);
-
-        // ---- Full byte-parity: every field, same order (positional-record value equality) ----
-        decoded.EquipmentTags.Count.ShouldBe(6);
-        decoded.EquipmentTags.SequenceEqual(composed.EquipmentTags).ShouldBeTrue();
-
-        // Spell out the array fields per-tag so a divergence names the offending tag.
-        var arrayBounded = decoded.EquipmentTags.Single(t => t.TagId == "tag-array-bounded");
-        arrayBounded.IsArray.ShouldBeTrue();
-        arrayBounded.ArrayLength.ShouldBe(16u);
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-bounded").IsArray.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-bounded").ArrayLength.ShouldBe(16u);
-
-        var scalar = decoded.EquipmentTags.Single(t => t.TagId == "tag-scalar");
-        scalar.IsArray.ShouldBeFalse();
-        scalar.ArrayLength.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-scalar").IsArray.ShouldBeFalse();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-scalar").ArrayLength.ShouldBeNull();
-
-        var arrayUnbounded = decoded.EquipmentTags.Single(t => t.TagId == "tag-array-unbounded");
-        arrayUnbounded.IsArray.ShouldBeTrue();
-        arrayUnbounded.ArrayLength.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-unbounded").IsArray.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-unbounded").ArrayLength.ShouldBeNull();
-
-        // 4th tag: isArray:true with a string arrayLength ⇒ (true, null) on both sides. Exercises the
-        // artifact-side private ExtractTagArray's number-guard branch.
-        var arrayBadLength = decoded.EquipmentTags.Single(t => t.TagId == "tag-array-badlen");
-        arrayBadLength.IsArray.ShouldBeTrue();
-        arrayBadLength.ArrayLength.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-badlen").IsArray.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-badlen").ArrayLength.ShouldBeNull();
-
-        // I-1: isArray:false with a non-zero arrayLength ⇒ (false, null) on both sides.
-        // The artifact-side isArray gate must suppress arrayLength even when it is present in the blob.
-        var arrayDisabled = decoded.EquipmentTags.Single(t => t.TagId == "tag-array-disabled");
-        arrayDisabled.IsArray.ShouldBeFalse();
-        arrayDisabled.ArrayLength.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-disabled").IsArray.ShouldBeFalse();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-disabled").ArrayLength.ShouldBeNull();
-
-        // I-2: isArray:true with arrayLength:0 ⇒ (true, 0u) on both sides.
-        // Zero is a legal explicit dimension bound; it must not be treated as absent.
-        var arrayZeroLength = decoded.EquipmentTags.Single(t => t.TagId == "tag-array-zerolen");
-        arrayZeroLength.IsArray.ShouldBeTrue();
-        arrayZeroLength.ArrayLength.ShouldBe(0u);
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-zerolen").IsArray.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-array-zerolen").ArrayLength.ShouldBe(0u);
+        // Restored when Batch 4 materializes equipment-tag variable plans: compose a draft exercising every
+        // array branch (isArray:true+length, absent, isArray:true no length, non-number length) and assert
+        // decoded EquipmentTags == composed element-wise.
     }
-
-    /// <summary>The Pascal-case snapshot a <see cref="Tag"/> EF entity serialises to in the artifact
-    /// (matches ConfigComposer); the equipment-tag decoder re-parses these fields — including the raw
-    /// <c>TagConfig</c> blob the array flags ride inside.</summary>
-    private static object ToSnapshot(Tag t) => new
-    {
-        t.TagId,
-        t.DriverInstanceId,
-        t.EquipmentId,
-        t.Name,
-        t.FolderPath,
-        t.DataType,
-        AccessLevel = (int)t.AccessLevel,
-        t.TagConfig,
-    };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactDeviceHostParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactDeviceHostParityTests.cs
index 23f5023d..b714eda3 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactDeviceHostParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactDeviceHostParityTests.cs
@@ -1,130 +1,27 @@
-using System.Linq;
-using System.Text.Json;
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.OpcUaServer;
-using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
-///     Proves follow-up E: the equipment's <c>DriverInstanceId</c> / <c>DeviceId</c> bindings and the
-///     resolved <c>DeviceHost</c> (parsed from the bound <see cref="Device"/>'s schemaless
-///     <c>DeviceConfig</c> JSON) round-trip with byte-parity through both <see cref="EquipmentNode"/>
-///     producers: the live-edit composer (<see cref="AddressSpaceComposer.Compose(System.Collections.Generic.IReadOnlyList{UnsArea},System.Collections.Generic.IReadOnlyList{UnsLine},System.Collections.Generic.IReadOnlyList{Equipment},System.Collections.Generic.IReadOnlyList{DriverInstance},System.Collections.Generic.IReadOnlyList{ScriptedAlarm},System.Collections.Generic.IReadOnlyList{Device})"/>)
-///     and the artifact decoder (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>).
-///     A secondary/follower node decoding a serialized artifact MUST see the same DeviceHost as the
-///     primary so it grafts FixedTree / partitions multi-device drivers identically. Both sides resolve
-///     the host through the shared <c>DeviceConfigIntent.TryExtractHost</c> (single source
-///     of truth + identical trim + lower-case normalization).
+///     Equipment <c>DriverInstanceId</c> / <c>DeviceId</c> binding + resolved <c>DeviceHost</c> byte-parity
+///     across the two <c>EquipmentNode</c> producers (composer + artifact decode).
+///     <para>
+///     <b>v3 RETIRED:</b> equipment no longer binds a driver/device — <c>EquipmentNode</c> is
+///     <c>(EquipmentId, DisplayName, UnsLineId)</c> only, <c>Equipment</c> dropped
+///     <c>DriverInstanceId</c>/<c>DeviceId</c>, and devices bind to drivers (tags bind to devices) while
+///     equipment references raw tags via <c>UnsTagReference</c>. The device-endpoint resolution this test
+///     characterized (fold the sole device's <c>DeviceConfig</c> host into the driver config so a follower
+///     node dials the same endpoint) is now proven by
+///     <see cref="DeploymentArtifactRawPathTests.ParseDriverInstances_computes_nested_RawPath_and_merges_device_endpoint"/>.
+///     Kept as a skipped marker so the retired coverage is discoverable, not silently deleted.
+///     </para>
 /// </summary>
 public sealed class DeploymentArtifactDeviceHostParityTests
 {
-    /// <summary>
-    ///     One draft exercising every branch: driver + device + host (with a mixed-case/whitespace host
-    ///     that must normalize identically on both sides); a driver-bound equipment with NO device
-    ///     (DeviceId null ⇒ DeviceHost null); a driver-less, device-less equipment (all three null); and a
-    ///     device whose config carries no <c>HostAddress</c> (DeviceId carried, DeviceHost null). The decoded
-    ///     <c>EquipmentNodes</c> must equal the composer's element-wise (positional-record value equality)
-    ///     and in the same order.
-    /// </summary>
-    [Fact]
+    /// <summary>Retired: equipment↔device host binding removed in v3; superseded by
+    /// DeploymentArtifactRawPathTests device-endpoint merge. See class remarks.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentDeviceBindingRetired)]
     public void Composer_and_artifact_agree_on_equipment_node_device_host()
     {
-        // eq-1: driver d1 + device dev1 (host needs trim + lower-case)
-        var eq1 = NewEquipment("eq-1", driver: "d1", device: "dev1");
-        // eq-2: driver d1, NO device → DeviceHost null
-        var eq2 = NewEquipment("eq-2", driver: "d1", device: null);
-        // eq-3: driver-less + device-less → all three null
-        var eq3 = NewEquipment("eq-3", driver: null, device: null);
-        // eq-4: device dev-nohost whose config has no HostAddress → DeviceHost null
-        var eq4 = NewEquipment("eq-4", driver: "d1", device: "dev-nohost");
-
-        var dev1 = NewDevice("dev1", "d1", "{\"HostAddress\":\"  HOST-A:8193 \"}");      // → host-a:8193
-        var devNoHost = NewDevice("dev-nohost", "d1", "{\"Port\":502}");                  // → null
-
-        var equipment = new[] { eq1, eq2, eq3, eq4 };
-        var devices = new[] { dev1, devNoHost };
-
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), equipment,
-            Array.Empty<DriverInstance>(), Array.Empty<ScriptedAlarm>(), devices: devices);
-
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape, then decode it ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Equipment = equipment.Select(ToEquipmentSnapshot).ToArray(),
-            Devices = devices.Select(ToDeviceSnapshot).ToArray(),
-        });
-
-        var decoded = DeploymentArtifact.ParseComposition(blob);
-
-        // ---- Full byte-parity: every field, same order (positional-record value equality) ----
-        decoded.EquipmentNodes.Count.ShouldBe(4);
-        decoded.EquipmentNodes.SequenceEqual(composed.EquipmentNodes).ShouldBeTrue();
-
-        // Spell out per-equipment so a divergence names the offending node.
-        var d1Node = decoded.EquipmentNodes.Single(e => e.EquipmentId == "eq-1");
-        d1Node.DriverInstanceId.ShouldBe("d1");
-        d1Node.DeviceId.ShouldBe("dev1");
-        d1Node.DeviceHost.ShouldBe("host-a:8193"); // trimmed + lower-cased on both sides
-
-        var d2Node = decoded.EquipmentNodes.Single(e => e.EquipmentId == "eq-2");
-        d2Node.DriverInstanceId.ShouldBe("d1");
-        d2Node.DeviceId.ShouldBeNull();
-        d2Node.DeviceHost.ShouldBeNull();
-
-        var d3Node = decoded.EquipmentNodes.Single(e => e.EquipmentId == "eq-3");
-        d3Node.DriverInstanceId.ShouldBeNull();
-        d3Node.DeviceId.ShouldBeNull();
-        d3Node.DeviceHost.ShouldBeNull();
-
-        var d4Node = decoded.EquipmentNodes.Single(e => e.EquipmentId == "eq-4");
-        d4Node.DriverInstanceId.ShouldBe("d1");
-        d4Node.DeviceId.ShouldBe("dev-nohost");
-        d4Node.DeviceHost.ShouldBeNull();
     }
-
-    private static Equipment NewEquipment(string id, string? driver, string? device) => new()
-    {
-        EquipmentId = id,
-        DriverInstanceId = driver,
-        DeviceId = device,
-        UnsLineId = "line-1",
-        Name = id,
-        MachineCode = id.ToUpperInvariant(),
-    };
-
-    private static Device NewDevice(string deviceId, string driverInstanceId, string deviceConfig) => new()
-    {
-        DeviceId = deviceId,
-        DriverInstanceId = driverInstanceId,
-        Name = deviceId,
-        DeviceConfig = deviceConfig,
-    };
-
-    /// <summary>The Pascal-case snapshot an <see cref="Equipment"/> EF entity serialises to in the
-    /// artifact (matches ConfigComposer) — including the nullable <c>DriverInstanceId</c> / <c>DeviceId</c>
-    /// the equipment-node decoder re-reads.</summary>
-    private static object ToEquipmentSnapshot(Equipment e) => new
-    {
-        e.EquipmentId,
-        e.Name,
-        e.MachineCode,
-        e.UnsLineId,
-        e.DriverInstanceId,
-        e.DeviceId,
-    };
-
-    /// <summary>The Pascal-case snapshot a <see cref="Device"/> EF entity serialises to in the artifact —
-    /// the decoder re-reads <c>DeviceId</c> + the raw <c>DeviceConfig</c> blob the host rides inside.</summary>
-    private static object ToDeviceSnapshot(Device d) => new
-    {
-        d.DeviceId,
-        d.DriverInstanceId,
-        d.Name,
-        d.DeviceConfig,
-    };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactEquipTokenTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactEquipTokenTests.cs
index 98ce4523..2759d519 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactEquipTokenTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactEquipTokenTests.cs
@@ -14,7 +14,10 @@ namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 /// </summary>
 public sealed class DeploymentArtifactEquipTokenTests
 {
-    [Fact]
+    // v3 dark: the {{equip}} tag base is DERIVED from the owning equipment's child equipment-tag FullNames,
+    // and equipment-tag plans do not materialize until Batch 4 — so baseByEquip is empty and {{equip}} has
+    // no per-equipment base to substitute. Unskip when Batch 4 lights the equipment-tag plans.
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void ParseComposition_substitutes_equip_token_in_virtual_tag_expression()
     {
         var blob = JsonSerializer.SerializeToUtf8Bytes(new
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactHistorizeParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactHistorizeParityTests.cs
index 3783aa63..02c11f0e 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactHistorizeParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactHistorizeParityTests.cs
@@ -1,194 +1,30 @@
-using System.Linq;
-using System.Text.Json;
-using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-using ZB.MOM.WW.OtOpcUa.OpcUaServer;
-using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
-///     Proves the Phase C HistoryRead intent (<c>isHistorized</c> + optional <c>historianTagname</c>),
-///     which rides inside the raw <c>TagConfig</c> JSON blob, round-trips with byte-parity through both
-///     equipment-tag producers: the live-edit composer (<see cref="AddressSpaceComposer.Compose"/>) and the
-///     artifact decoder (<see cref="DeploymentArtifact.ParseComposition(System.ReadOnlySpan{byte})"/>).
-///     The artifact serializer re-parses the SAME <c>TagConfig</c> string both sides emit, so no
-///     ConfigComposer change is needed — the flags are already carried in the blob.
+///     Phase C HistoryRead intent (<c>isHistorized</c> + optional <c>historianTagname</c>) byte-parity
+///     between the two equipment-tag producers.
+///     <para>
+///     <b>v3 DARK (Batch 1):</b> equipment-tag variable plans do not materialize —
+///     <c>AddressSpaceComposer.Compose</c> and <c>DeploymentArtifact.ParseComposition</c> both emit an
+///     EMPTY <c>EquipmentTags</c> set until the Batch-4 dual-namespace UNS↔Raw fan-out. There is nothing
+///     to compare, so the parity assertion is parked. The underlying parse of <c>isHistorized</c> /
+///     <c>historianTagname</c> from a raw <c>TagConfig</c> blob is characterized today by
+///     <c>TagConfigIntentTests</c> (the parse unit) and round-tripped through the artifact by
+///     <see cref="TagConfigCorpusParityTests"/> (RawTagEntry byte-preservation). Unskip + restore the
+///     composer↔artifact equipment-tag comparison when Batch 4 lights the equipment-tag plans.
+///     </para>
 /// </summary>
 public sealed class DeploymentArtifactHistorizeParityTests
 {
-    /// <summary>
-    ///     One draft consumed by both producers: a historized equipment tag with no explicit historian
-    ///     tagname (defaults to FullName later, so <c>HistorianTagname</c> is null on both sides), plus a
-    ///     historized equipment tag WITH an explicit <c>historianTagname</c> override, plus a plain
-    ///     non-historized tag. The decoded <c>EquipmentTags</c> must equal the composer's element-wise
-    ///     (positional-record value equality) and in the same order, proving <c>IsHistorized</c> /
-    ///     <c>HistorianTagname</c> are derived byte-identically on both seams.
-    /// </summary>
-    [Fact]
+    /// <summary>Batch-4 pending: composer and artifact agree on historized equipment-tag plans
+    /// (IsHistorized + HistorianTagname). See class remarks — equipment-tag plans are dark this batch.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Composer_and_artifact_agree_on_historized_equipment_tags()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        var driver = new DriverInstance
-        {
-            DriverInstanceId = "drv-modbus",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Modbus1",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment
-        {
-            EquipmentId = "eq-1",
-            DriverInstanceId = "drv-modbus",
-            UnsLineId = "line-1",
-            Name = "FillingPump",
-            MachineCode = "FILLINGPUMP",
-        };
-
-        // Historized, no explicit tagname → HistorianTagname null (defaults to FullName later).
-        var histDefaultTag = new Tag
-        {
-            TagId = "tag-hist-default",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Flow",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40001\",\"isHistorized\":true}",
-        };
-        // Historized WITH an explicit historian-tagname override.
-        var histOverrideTag = new Tag
-        {
-            TagId = "tag-hist-override",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Pressure",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40002\",\"isHistorized\":true,\"historianTagname\":\"Plant.Line1.Pressure\"}",
-        };
-        // Plain tag — not historized.
-        var plainTag = new Tag
-        {
-            TagId = "tag-plain",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Speed",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.ReadWrite,
-            TagConfig = "{\"FullName\":\"40003\"}",
-        };
-        // Well-formed but non-historized: explicit isHistorized:false + a JSON-null historianTagname
-        // (not a string token → falls through the ValueKind==String guard → tagname null).
-        // This exercises the artifact-side private ExtractTagHistorize through the real round-trip
-        // (it can't be unit-tested directly because it's private). A truly malformed TagConfig string
-        // would cause ExtractTagFullName to return "" and break the SequenceEqual on other fields, so
-        // we use a well-formed blob and note that the malformed/throws path is already covered by
-        // the composer unit test in ExtractTagHistorizeTests.
-        var notHistorizedNullNameTag = new Tag
-        {
-            TagId = "tag-not-hist-nullname",
-            DriverInstanceId = "drv-modbus",
-            EquipmentId = "eq-1",
-            FolderPath = null,
-            Name = "Temp",
-            DataType = "Float",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"40004\",\"isHistorized\":false,\"historianTagname\":null}",
-        };
-
-        var areas = new[] { area };
-        var lines = new[] { line };
-        var equipment = new[] { equip };
-        var drivers = new[] { driver };
-        var tags = new[] { histDefaultTag, histOverrideTag, plainTag, notHistorizedNullNameTag };
-        var namespaces = new[] { ns };
-
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            areas, lines, equipment, drivers, Array.Empty<ScriptedAlarm>(), tags, namespaces);
-
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape, then decode it ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
-        {
-            Namespaces = new[]
-            {
-                new { ns.NamespaceId, ns.ClusterId, Kind = (int)ns.Kind },
-            },
-            DriverInstances = new[]
-            {
-                new { driver.DriverInstanceId, driver.DriverType, driver.DriverConfig, driver.NamespaceId, driver.ClusterId },
-            },
-            Tags = new[]
-            {
-                ToSnapshot(histDefaultTag),
-                ToSnapshot(histOverrideTag),
-                ToSnapshot(plainTag),
-                ToSnapshot(notHistorizedNullNameTag),
-            },
-        });
-
-        var decoded = DeploymentArtifact.ParseComposition(blob);
-
-        // ---- Full byte-parity: every field, same order (positional-record value equality) ----
-        decoded.EquipmentTags.Count.ShouldBe(4);
-        decoded.EquipmentTags.SequenceEqual(composed.EquipmentTags).ShouldBeTrue();
-
-        // Spell out the Phase C fields per-tag so a divergence names the offending tag.
-        var histDefault = decoded.EquipmentTags.Single(t => t.TagId == "tag-hist-default");
-        histDefault.IsHistorized.ShouldBeTrue();
-        histDefault.HistorianTagname.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-hist-default").IsHistorized.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-hist-default").HistorianTagname.ShouldBeNull();
-
-        var histOverride = decoded.EquipmentTags.Single(t => t.TagId == "tag-hist-override");
-        histOverride.IsHistorized.ShouldBeTrue();
-        histOverride.HistorianTagname.ShouldBe("Plant.Line1.Pressure");
-        composed.EquipmentTags.Single(t => t.TagId == "tag-hist-override").IsHistorized.ShouldBeTrue();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-hist-override").HistorianTagname.ShouldBe("Plant.Line1.Pressure");
-
-        var plain = decoded.EquipmentTags.Single(t => t.TagId == "tag-plain");
-        plain.IsHistorized.ShouldBeFalse();
-        plain.HistorianTagname.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-plain").IsHistorized.ShouldBeFalse();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-plain").HistorianTagname.ShouldBeNull();
-
-        // 4th tag: explicit isHistorized:false + JSON-null historianTagname ⇒ (false, null) on both sides.
-        // Exercises the artifact-side private ExtractTagHistorize's null-JSON-token guard path.
-        var notHistorizedNullName = decoded.EquipmentTags.Single(t => t.TagId == "tag-not-hist-nullname");
-        notHistorizedNullName.IsHistorized.ShouldBeFalse();
-        notHistorizedNullName.HistorianTagname.ShouldBeNull();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-not-hist-nullname").IsHistorized.ShouldBeFalse();
-        composed.EquipmentTags.Single(t => t.TagId == "tag-not-hist-nullname").HistorianTagname.ShouldBeNull();
+        // Restored when Batch 4 materializes equipment-tag variable plans: compose a draft with a
+        // historized tag (no explicit tagname → HistorianTagname null), a historized tag WITH an explicit
+        // historianTagname override, and a plain tag; assert decoded EquipmentTags == composed element-wise.
     }
-
-    /// <summary>The Pascal-case snapshot a <see cref="Tag"/> EF entity serialises to in the artifact
-    /// (matches ConfigComposer); the equipment-tag decoder re-parses these fields — including the raw
-    /// <c>TagConfig</c> blob the Phase C flags ride inside.</summary>
-    private static object ToSnapshot(Tag t) => new
-    {
-        t.TagId,
-        t.DriverInstanceId,
-        t.EquipmentId,
-        t.Name,
-        t.FolderPath,
-        t.DataType,
-        AccessLevel = (int)t.AccessLevel,
-        t.TagConfig,
-    };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactRawPathTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactRawPathTests.cs
new file mode 100644
index 00000000..3d3eb87c
--- /dev/null
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactRawPathTests.cs
@@ -0,0 +1,89 @@
+using System.Text.Json;
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
+
+namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
+
+/// <summary>
+///     v3 (B1-WP4) — the deploy artifact must compute each raw tag's RawPath by walking
+///     RawFolder → Driver → Device → TagGroup ancestry, inject the per-driver RawTags into the driver's
+///     merged config, and fold the sole device's DeviceConfig endpoint up to the top level. A strong signal
+///     for the docker-dev live gate (a driver that gets the wrong RawPath or a missing endpoint won't bind).
+/// </summary>
+public sealed class DeploymentArtifactRawPathTests
+{
+    private static byte[] BlobOf(object snapshot) => JsonSerializer.SerializeToUtf8Bytes(snapshot);
+
+    private static object NestedSingleDeviceSnapshot() => new
+    {
+        Clusters = new[] { new { ClusterId = "MAIN" } },
+        Nodes = Array.Empty<object>(),
+        RawFolders = new[]
+        {
+            new { RawFolderId = "f1", ParentRawFolderId = (string?)null, Name = "Plant", ClusterId = "MAIN" },
+            new { RawFolderId = "f2", ParentRawFolderId = (string?)"f1", Name = "Line1", ClusterId = "MAIN" },
+        },
+        DriverInstances = new[]
+        {
+            new { DriverInstanceRowId = Guid.NewGuid(), DriverInstanceId = "drv1", Name = "Modbus1", DriverType = "Modbus", Enabled = true, DriverConfig = "{\"UnitId\":3}", ClusterId = "MAIN", RawFolderId = "f2" },
+        },
+        Devices = new[]
+        {
+            new { DeviceId = "dev1", DriverInstanceId = "drv1", Name = "PLC-A", DeviceConfig = "{\"Host\":\"10.0.0.5\",\"Port\":502}" },
+        },
+        TagGroups = new[]
+        {
+            new { TagGroupId = "g1", DeviceId = "dev1", ParentTagGroupId = (string?)null, Name = "Motors" },
+            new { TagGroupId = "g2", DeviceId = "dev1", ParentTagGroupId = (string?)"g1", Name = "M1" },
+        },
+        Tags = new[]
+        {
+            new { TagId = "t1", DeviceId = "dev1", TagGroupId = (string?)"g2", Name = "Speed", DataType = "Float", TagConfig = "{\"address\":\"40001\"}", WriteIdempotent = true },
+            new { TagId = "t2", DeviceId = "dev1", TagGroupId = (string?)null, Name = "Status", DataType = "Boolean", TagConfig = "{\"address\":\"1\"}", WriteIdempotent = false },
+        },
+    };
+
+    /// <summary>The nested folder + nested group tag resolves to
+    /// <c>Plant/Line1/Modbus1/PLC-A/Motors/M1/Speed</c>; a device-root tag drops the group segments.</summary>
+    [Fact]
+    public void ParseDriverInstances_computes_nested_RawPath_and_merges_device_endpoint()
+    {
+        var specs = DeploymentArtifact.ParseDriverInstances(BlobOf(NestedSingleDeviceSnapshot()));
+        var spec = specs.ShouldHaveSingleItem();
+        spec.DriverInstanceId.ShouldBe("drv1");
+
+        using var doc = JsonDocument.Parse(spec.DriverConfig);
+        var root = doc.RootElement;
+
+        // Endpoint from the sole device's DeviceConfig merged up to the top level (single-endpoint driver).
+        root.GetProperty("Host").GetString().ShouldBe("10.0.0.5");
+        root.GetProperty("Port").GetInt32().ShouldBe(502);
+        // Protocol/channel setting from the driver-level DriverConfig survives.
+        root.GetProperty("UnitId").GetInt32().ShouldBe(3);
+
+        // RawTags injected, ordinal-ordered by RawPath, each carrying its computed RawPath + device name.
+        var rawTags = root.GetProperty("RawTags").EnumerateArray().ToList();
+        rawTags.Count.ShouldBe(2);
+        var paths = rawTags.Select(e => e.GetProperty("RawPath").GetString()).ToList();
+        paths.ShouldContain("Plant/Line1/Modbus1/PLC-A/Motors/M1/Speed");
+        paths.ShouldContain("Plant/Line1/Modbus1/PLC-A/Status");
+
+        var speed = rawTags.Single(e => e.GetProperty("RawPath").GetString() == "Plant/Line1/Modbus1/PLC-A/Motors/M1/Speed");
+        speed.GetProperty("WriteIdempotent").GetBoolean().ShouldBeTrue();
+        speed.GetProperty("DeviceName").GetString().ShouldBe("PLC-A");
+
+        // Reconstructed Devices array carries the device name (routing key) + endpoint.
+        var devices = root.GetProperty("Devices").EnumerateArray().ToList();
+        devices.ShouldHaveSingleItem();
+        devices[0].GetProperty("DeviceName").GetString().ShouldBe("PLC-A");
+    }
+
+    /// <summary>The DARK address space this batch: no equipment-tag variable plans materialize.</summary>
+    [Fact]
+    public void ParseComposition_emits_dark_address_space_no_equipment_tags()
+    {
+        var composition = DeploymentArtifact.ParseComposition(BlobOf(NestedSingleDeviceSnapshot()));
+        composition.EquipmentTags.ShouldBeEmpty();
+    }
+}
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactScriptedAlarmParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactScriptedAlarmParityTests.cs
index 721d5269..1265ac85 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactScriptedAlarmParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactScriptedAlarmParityTests.cs
@@ -73,7 +73,6 @@ public sealed class DeploymentArtifactScriptedAlarmParityTests
         var composed = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { alarm1, alarm2 },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             virtualTags: Array.Empty<VirtualTag>(),
             scripts: new[] { script1, script2 });
 
@@ -127,10 +126,21 @@ public sealed class DeploymentArtifactScriptedAlarmParityTests
                 new { DriverInstanceId = "main-modbus", DriverType = "Modbus", DriverConfig = "{}", ClusterId = "MAIN",   NamespaceId = "main-ns" },
                 new { DriverInstanceId = "sa-modbus",   DriverType = "Modbus", DriverConfig = "{}", ClusterId = "SITE-A", NamespaceId = "sa-ns" },
             },
+            // v3: equipment is attributed to a cluster via its UNS line's area cluster, not via a driver.
+            UnsAreas = new[]
+            {
+                new { UnsAreaId = "a-main", Name = "AreaMain", ClusterId = "MAIN" },
+                new { UnsAreaId = "a-sa",   Name = "AreaSa",   ClusterId = "SITE-A" },
+            },
+            UnsLines = new[]
+            {
+                new { UnsLineId = "l1", UnsAreaId = "a-main", Name = "L1" },
+                new { UnsLineId = "l2", UnsAreaId = "a-sa",   Name = "L2" },
+            },
             Equipment = new[]
             {
-                new { EquipmentId = "eq-main", Name = "eqm", UnsLineId = "l1", DriverInstanceId = "main-modbus" },
-                new { EquipmentId = "eq-sa",   Name = "eqs", UnsLineId = "l2", DriverInstanceId = "sa-modbus" },
+                new { EquipmentId = "eq-main", Name = "eqm", UnsLineId = "l1" },
+                new { EquipmentId = "eq-sa",   Name = "eqs", UnsLineId = "l2" },
             },
             Scripts = new[]
             {
@@ -192,7 +202,6 @@ public sealed class DeploymentArtifactScriptedAlarmParityTests
         var composed = AddressSpaceComposer.Compose(
             Array.Empty<UnsArea>(), Array.Empty<UnsLine>(), Array.Empty<Equipment>(),
             Array.Empty<DriverInstance>(), new[] { goodAlarm, orphanAlarm },
-            Array.Empty<Tag>(), Array.Empty<Namespace>(),
             scripts: new[] { goodScript });
 
         var blob = BlobOf(new
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactTests.cs
index f7a35041..fe046209 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactTests.cs
@@ -198,7 +198,7 @@ public sealed class DeploymentArtifactTests
     ///     <c>ns.Kind == NamespaceKind.Equipment</c> predicate (only Equipment-kind namespaces route
     ///     into EquipmentTags, so such a tag routes nowhere).
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void ParseComposition_reads_EquipmentTags_from_equipment_namespace()
     {
         var blob = JsonSerializer.SerializeToUtf8Bytes(new
@@ -405,17 +405,20 @@ public sealed class DeploymentArtifactTests
     };
 
     [Fact]
-    public void ParseComposition_scoped_keeps_only_my_clusters_drivers_and_tags()
+    public void ParseComposition_scoped_keeps_only_my_clusters_drivers()
     {
+        // v3: DriverInstance cluster scoping still holds. The EquipmentTags leg of the original assertion
+        // is dark this batch (equipment-tag plans don't materialize until Batch 4) — see
+        // TagConfigCorpusParityTests + DarkAddressSpaceReasons.
         var blob = BlobOf(MultiClusterSnapshotWithTags());
 
         var main = DeploymentArtifact.ParseComposition(blob, "central-1:4053");
         main.DriverInstancePlans.Select(d => d.DriverInstanceId).ShouldBe(new[] { "main-galaxy" });
-        main.EquipmentTags.Select(t => t.TagId).ShouldBe(new[] { "t-main" });
+        main.EquipmentTags.ShouldBeEmpty(); // dark this batch
 
         var siteA = DeploymentArtifact.ParseComposition(blob, "site-a-1:4053");
         siteA.DriverInstancePlans.Select(d => d.DriverInstanceId).ShouldBe(new[] { "sa-galaxy" });
-        siteA.EquipmentTags.Select(t => t.TagId).ShouldBe(new[] { "t-sa" });
+        siteA.EquipmentTags.ShouldBeEmpty(); // dark this batch
     }
 
     [Fact]
@@ -444,10 +447,22 @@ public sealed class DeploymentArtifactTests
                 new { DriverInstanceId = "main-modbus", DriverType = "Modbus", DriverConfig = "{}", ClusterId = "MAIN",   NamespaceId = "main-ns" },
                 new { DriverInstanceId = "sa-modbus",   DriverType = "Modbus", DriverConfig = "{}", ClusterId = "SITE-A", NamespaceId = "sa-ns" },
             },
+            // v3: equipment carries no driver binding — it is attributed to a cluster solely via its UNS
+            // line's area cluster (Equipment -> UnsLine.UnsAreaId -> UnsArea.ClusterId).
+            UnsAreas = new[]
+            {
+                new { UnsAreaId = "a-main", Name = "AreaMain", ClusterId = "MAIN" },
+                new { UnsAreaId = "a-sa",   Name = "AreaSa",   ClusterId = "SITE-A" },
+            },
+            UnsLines = new[]
+            {
+                new { UnsLineId = "l1", UnsAreaId = "a-main", Name = "L1" },
+                new { UnsLineId = "l2", UnsAreaId = "a-sa",   Name = "L2" },
+            },
             Equipment = new[]
             {
-                new { EquipmentId = "eq-main", Name = "eqm", UnsLineId = "l1", DriverInstanceId = "main-modbus" },
-                new { EquipmentId = "eq-sa",   Name = "eqs", UnsLineId = "l2", DriverInstanceId = "sa-modbus" },
+                new { EquipmentId = "eq-main", Name = "eqm", UnsLineId = "l1" },
+                new { EquipmentId = "eq-sa",   Name = "eqs", UnsLineId = "l2" },
             },
             Scripts = new[]
             {
@@ -500,7 +515,7 @@ public sealed class DeploymentArtifactTests
 
     /// <summary>Verifies the inconsistency callback fires when a kept equipment's UNS line belongs to
     /// another cluster (a cross-cluster orphan binding).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentDeviceBindingRetired)]
     public void ParseComposition_scoped_flags_cross_cluster_orphan_equipment()
     {
         var warnings = new List<string>();
@@ -622,9 +637,11 @@ public sealed class DeploymentArtifactTests
         comp.EquipmentVirtualTags.ShouldBeEmpty();
     }
 
-    /// <summary>Verifies the unchanged driver-bound path: equipment with an in-cluster DriverInstanceId is
-    /// kept even when (as here) no UNS line/area rows describe it — attribution is still by driver.</summary>
-    [Fact]
+    /// <summary>RETIRED (v3): equipment no longer carries a DriverInstanceId, so there is no driver-bound
+    /// attribution path — equipment is attributed to a cluster solely via its UNS line's area
+    /// (Driverless_equipment_kept_when_its_line_area_is_in_cluster is the v3 replacement, and passes).
+    /// The original premise ("attribution is still by driver") no longer exists.</summary>
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentDeviceBindingRetired)]
     public void Driverbound_equipment_kept_when_driver_in_cluster()
     {
         var blob = BlobOf(new
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactVirtualTagHistorizeParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactVirtualTagHistorizeParityTests.cs
index b1d34622..a84da7c0 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactVirtualTagHistorizeParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DeploymentArtifactVirtualTagHistorizeParityTests.cs
@@ -26,35 +26,17 @@ public sealed class DeploymentArtifactVirtualTagHistorizeParityTests
     [Fact]
     public void ParseComposition_virtual_tag_historize_is_byte_parity_with_composer()
     {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
         var driver = new DriverInstance
         {
             DriverInstanceId = "drv-1",
             ClusterId = "c1",
-            NamespaceId = "ns-eq",
             Name = "Modbus1",
             DriverType = "Modbus",
             DriverConfig = "{}",
         };
         var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
         var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment { EquipmentId = "eq-1", DriverInstanceId = "drv-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
-        var tag = new Tag
-        {
-            TagId = "tag-1",
-            DriverInstanceId = "drv-1",
-            EquipmentId = "eq-1",
-            Name = "Source",
-            DataType = "Int32",
-            AccessLevel = TagAccessLevel.Read,
-            TagConfig = "{\"FullName\":\"TestMachine_001.Source\",\"DataType\":\"Int32\"}",
-        };
+        var equip = new Equipment { EquipmentId = "eq-1", UnsLineId = "line-1", Name = "TestMachine_001", MachineCode = "TESTMACHINE_001" };
         var script = new Script
         {
             ScriptId = "s-1",
@@ -68,7 +50,6 @@ public sealed class DeploymentArtifactVirtualTagHistorizeParityTests
         var composed = AddressSpaceComposer.Compose(
             new[] { area }, new[] { line }, new[] { equip },
             new[] { driver }, Array.Empty<ScriptedAlarm>(),
-            new[] { tag }, new[] { ns },
             virtualTags: new[] { vtHist, vtPlain },
             scripts: new[] { script });
 
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DiscoveryInjectionEndToEndTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DiscoveryInjectionEndToEndTests.cs
index 82a378ce..94088347 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DiscoveryInjectionEndToEndTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DiscoveryInjectionEndToEndTests.cs
@@ -108,7 +108,7 @@ public sealed class DiscoveryInjectionEndToEndTests : RuntimeActorTestBase
     ///         <see cref="OpcUaQuality.Good"/> — proving the live value routed end-to-end and (in production)
     ///         overwrote the BadWaitingForInitialData seed.
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_node_materialises_at_equipment_and_polled_value_flows_Good()
     {
         var db = NewInMemoryDbFactory();
@@ -154,7 +154,7 @@ public sealed class DiscoveryInjectionEndToEndTests : RuntimeActorTestBase
     ///     (re-materialised after the rebuild) at the same NodeId, and a subsequent published value STILL
     ///     <c>WriteValue</c>s Good there (the routing map was rebuilt, not left empty by the Clear()).
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_node_and_value_survive_a_redeploy()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorDiscoveryTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorDiscoveryTests.cs
index 2c111462..64bcb14a 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorDiscoveryTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorDiscoveryTests.cs
@@ -54,7 +54,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// rooted at the equipment NodeId; (b) the driver re-subscribes the UNION of the authored ref + the
     /// FixedTree refs; (c) a value published for a FixedTree ref now routes to its mapped NodeId (proving the
     /// live-value routing map was extended).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void DiscoveredNodes_materialise_extend_routing_and_merge_subscription()
     {
         var db = NewInMemoryDbFactory();
@@ -121,7 +121,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// <see cref="OpcUaPublishActor.MaterialiseDiscoveredNodes"/> rooted at its NodeId and the driver
     /// subscribes the discovered refs (no authored ref exists to union). Previously this was skipped with
     /// "no equipment/authored tags".</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Tag_less_equipment_resolved_via_EquipmentNode_grafts_discovered_nodes()
     {
         var db = NewInMemoryDbFactory();
@@ -198,7 +198,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// equipment), (b) the union subscription carries BOTH devices' refs, and (c) a value for each device's ref
     /// routes to the right equipment's node (proving BOTH inner-map entries cached + keyed correctly). The "H1"
     /// vs stored "h1" wrinkle proves the SHARED <c>DeviceConfigIntent.NormalizeHost</c> match.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Multi_device_driver_partitions_fixed_tree_by_device_host_under_matching_equipment()
     {
         var db = NewInMemoryDbFactory();
@@ -264,7 +264,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// NO matching equipment is warn-skipped (NOT mis-grafted), while the matched partitions still graft. Here
     /// d1 fans out to EQ-A("h1") + EQ-B("h2"), but a third discovered partition "h3" matches no equipment: only
     /// EQ-A + EQ-B materialise (no third), and the unmatched ref routes nowhere (no crash).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Multi_device_unmatched_device_host_is_warn_skipped_matched_still_graft()
     {
         var db = NewInMemoryDbFactory();
@@ -305,7 +305,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// logged at Debug, which the suite's <c>loglevel = WARNING</c> HOCON suppresses at source, so EventFilter
     /// observes the dedup as "zero further matching warnings". (The matched EQ-A/EQ-B partitions still graft on
     /// pass 1; pass 2's matched routing is short-circuited by <c>PlansRoutingEqual</c>.)</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Repeated_unmatched_device_host_partition_warns_once_then_is_quiet()
     {
         var db = NewInMemoryDbFactory();
@@ -378,7 +378,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// <summary>Dedup: a discovered node whose <c>FullReference</c> equals an authored equipment tag's
     /// FullName is NOT injected (it would shadow the authored node) — only the genuinely-new FixedTree refs
     /// are materialised.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_node_shadowing_an_authored_ref_is_not_injected()
     {
         var db = NewInMemoryDbFactory();
@@ -413,7 +413,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// re-discovers each ~2s pass) is a no-op — it materialises ONCE and does not force the child to
     /// re-subscribe. A GROWN set, however, DOES re-apply (materialise again + re-subscribe), so a stabilising
     /// FixedTree still converges.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Repeated_identical_discovery_does_not_reapply_but_a_grown_set_does()
     {
         var db = NewInMemoryDbFactory();
@@ -469,7 +469,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// FixedTree routes + materialised nodes would be lost until the driver reconnects. Asserts the cached
     /// plan is (a) re-materialised under EQ-1 after the rebuild, (b) still present in the child's
     /// post-redeploy subscription, and (c) still routes a published value to its mapped NodeId.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_nodes_survive_a_redeploy_rebuild()
     {
         var db = NewInMemoryDbFactory();
@@ -536,7 +536,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// (its authored tags were removed) must DROP the cached discovered plan rather than re-graft it onto a
     /// stale equipment. After such a redeploy the host re-applies the authored rebuild but does NOT re-tell
     /// <see cref="OpcUaPublishActor.MaterialiseDiscoveredNodes"/> for the now-unresolved driver.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_nodes_dropped_when_equipment_no_longer_resolves()
     {
         var db = NewInMemoryDbFactory();
@@ -578,7 +578,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// drops the entry. After the redeploy NO <see cref="OpcUaPublishActor.MaterialiseDiscoveredNodes"/> is
     /// re-told. (Complements <see cref="Discovered_nodes_dropped_when_equipment_no_longer_resolves"/>, which
     /// covers the Count==0 branch; this covers the rebind/StartsWith branch.)</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Discovered_nodes_dropped_when_driver_rebound_to_a_different_equipment()
     {
         var db = NewInMemoryDbFactory();
@@ -627,7 +627,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// single Once pass — impossible without the trigger, since the child stays Connected so nothing else re-kicks
     /// discovery) AND a fresh <see cref="OpcUaPublishActor.MaterialiseDiscoveredNodes"/> re-grafts the FixedTree
     /// under the new equipment EQ-2.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Config_unchanged_rebind_re_triggers_discovery_on_the_child()
     {
         var db = NewInMemoryDbFactory();
@@ -706,7 +706,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// guard — so they would NOT catch a future regression that sets <c>droppedAny</c> on a non-drop path). The
     /// regression is observable here: a spurious trigger would advance <c>DiscoverCount</c> past the single Once
     /// pass.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void No_drop_redeploy_does_not_re_trigger_discovery()
     {
         var db = NewInMemoryDbFactory();
@@ -757,7 +757,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// SubscribeAsync — no de-dup in <see cref="DriverInstanceActor"/>): the count rises by EXACTLY 1 across the
     /// redeploy and the final subscribed set is the union. (Pre-task: the bulk loop ALSO sent the authored-only
     /// set first ⇒ the count rose by 2 and the set transiently dropped "ft-ref-1".)</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Cached_driver_survivor_redeploy_sends_exactly_one_union_subscription()
     {
         var db = NewInMemoryDbFactory();
@@ -823,7 +823,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// via <c>SubscribeCount</c> (+1) and the subscribed set ("40001" only, NOT the dropped "ft-ref-1"). (It also
     /// gets a <see cref="DriverInstanceActor.TriggerRediscovery"/> — a different message type the non-discovery
     /// child no-ops, so it adds no subscribe.) Guards that the bulk-skip didn't reduce this path to ZERO sends.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Cached_driver_fully_dropped_redeploy_sends_exactly_one_authored_only_fallback()
     {
         var db = NewInMemoryDbFactory();
@@ -885,7 +885,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// authored-only <see cref="DriverInstanceActor.SetDesiredSubscriptions"/> per redeploy (the re-inject tail
     /// never runs for it). Guards that the skip didn't accidentally suppress (or double) a non-cached driver's
     /// send. Observed via <c>SubscribeCount</c> (+1) and the subscribed set ("40001" only).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Non_cached_driver_redeploy_sends_exactly_one_authored_only_subscription()
     {
         var db = NewInMemoryDbFactory();
@@ -934,7 +934,7 @@ public sealed class DriverHostActorDiscoveryTests : RuntimeActorTestBase
     /// the Connected handler routes to <c>Unsubscribe</c> (dropping the stale FixedTree handle) — NOT a subscribe.
     /// Proven by <c>SubscribeCount</c> staying FLAT across the redeploy (no spurious subscribe), closing the
     /// SubscribeCount-proxy blind spot for the empty-set fallback.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Cached_tag_less_driver_fully_dropped_redeploy_sends_empty_fallback_without_subscribing()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorLiveValueTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorLiveValueTests.cs
index 919e0313..75000f7f 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorLiveValueTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorLiveValueTests.cs
@@ -42,7 +42,7 @@ public sealed class DriverHostActorLiveValueTests : RuntimeActorTestBase
 
     /// <summary>A driver value published by FullName lands on the equipment variable's folder-scoped
     /// NodeId (here <c>eq-1/speed</c>, no sub-folder), carrying the value/quality/timestamp.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Driver_value_routes_to_folder_scoped_equipment_NodeId()
     {
         var db = NewInMemoryDbFactory();
@@ -68,7 +68,7 @@ public sealed class DriverHostActorLiveValueTests : RuntimeActorTestBase
 
     /// <summary>The same driver ref backing two equipments fans out: a single publish produces one
     /// <see cref="OpcUaPublishActor.AttributeValueUpdate"/> per equipment variable NodeId.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Same_ref_on_two_equipments_fans_out_to_both_NodeIds()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmAckRoutingTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmAckRoutingTests.cs
index a55fe10a..55464a3e 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmAckRoutingTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmAckRoutingTests.cs
@@ -46,7 +46,7 @@ public sealed class DriverHostActorNativeAlarmAckRoutingTests : RuntimeActorTest
     /// forwards exactly one <see cref="AlarmAcknowledgeRequest"/> to the owning driver's
     /// <see cref="IAlarmSource.AcknowledgeAsync"/>, with <c>ConditionId == FullName</c>, the operator
     /// principal, and the comment.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void RouteNativeAlarmAck_routes_to_driver_AcknowledgeAsync_with_principal()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmTests.cs
index 6f38c06d..f46f70f3 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmTests.cs
@@ -54,7 +54,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// <see cref="OpcUaPublishActor.AlarmStateUpdate"/> with <c>State.Active == true</c>. The event carries a
     /// production-shaped <c>SourceNodeId</c> (the bare owning object, distinct from <c>ConditionId</c>) so the
     /// lookup is proven to key on <c>ConditionId</c>, not <c>SourceNodeId</c>.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Native_alarm_raise_routes_to_folder_scoped_condition_NodeId_active()
     {
         var db = NewInMemoryDbFactory();
@@ -110,7 +110,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// publishes exactly one <see cref="AlarmTransitionEvent"/> to the cluster <c>alerts</c> topic with
     /// <c>AlarmId</c> = the folder-scoped condition NodeId, alongside the (ungated) OPC UA condition
     /// update. No <see cref="RedundancyStateChanged"/> is sent, so the cached role is unknown ⇒ emit.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Native_alarm_publishes_AlarmTransitionEvent_to_alerts_when_primary()
     {
         var db = NewInMemoryDbFactory();
@@ -159,7 +159,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// (<c>historizeToAveva is not false</c>) suppresses the durable AVEVA write — the same opt-out the
     /// scripted-alarm plan flag drives. The live <c>/alerts</c> fan-out is unaffected (the transition still
     /// publishes; only the durable row is gated downstream).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Native_alarm_historizeToAveva_false_threads_through()
     {
         var db = NewInMemoryDbFactory();
@@ -191,7 +191,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// <summary>Native-alarm HistorizeToAveva opt-IN (Task 3): an explicit <c>historizeToAveva: true</c>
     /// rides through as <c>true</c> (distinct from the absent ⇒ null default-on case) so an operator who
     /// deliberately opts in is recorded as such on the transition.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Native_alarm_historizeToAveva_true_threads_through()
     {
         var db = NewInMemoryDbFactory();
@@ -222,7 +222,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// MUST still write the local OPC UA condition node (ungated — keeps the standby's address space warm
     /// for failover) but MUST NOT publish the cluster-wide <c>alerts</c> transition (the Primary publishes
     /// the single fleet-wide copy).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Secondary_node_suppresses_alerts_publish_but_still_updates_condition()
     {
         var db = NewInMemoryDbFactory();
@@ -261,7 +261,7 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     /// <c>Comment</c> carries the operator string and <c>User</c> is <c>"device"</c> (a non-null comment
     /// signals the upstream alarm system provided an operator origin, but without a specific user identity).
     /// </summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Native_alarm_operator_comment_flows_to_transition_event()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorPrimaryGateTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorPrimaryGateTests.cs
index 036a9007..cce53094 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorPrimaryGateTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorPrimaryGateTests.cs
@@ -61,7 +61,7 @@ public sealed class DriverHostActorPrimaryGateTests : RuntimeActorTestBase
 
     /// <summary>Role unknown + no driver peer (count 1) ⇒ the write is SERVICED (single-node / boot-window
     /// posture preserved).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Unknown_role_single_driver_services_write()
     {
         var db = NewInMemoryDbFactory();
@@ -86,7 +86,7 @@ public sealed class DriverHostActorPrimaryGateTests : RuntimeActorTestBase
 
     /// <summary>A Primary snapshot services even at count 2; a Secondary snapshot denies with the steady-state
     /// reason (distinct from the boot-window reason).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Known_role_wins_over_member_count()
     {
         var db = NewInMemoryDbFactory();
@@ -162,7 +162,7 @@ public sealed class DriverHostActorPrimaryGateTests : RuntimeActorTestBase
 
     /// <summary>Role unknown + count 2 ⇒ ForwardNativeAlarm still writes the (ungated) OPC UA condition update
     /// but publishes NO cluster-wide alerts transition.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Unknown_role_multi_driver_suppresses_alerts_emit_but_updates_condition()
     {
         var db = NewInMemoryDbFactory();
@@ -181,7 +181,7 @@ public sealed class DriverHostActorPrimaryGateTests : RuntimeActorTestBase
 
     /// <summary>Role unknown + count 1 ⇒ ForwardNativeAlarm publishes the alerts transition (single-node
     /// posture preserved).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Unknown_role_single_driver_publishes_alerts_emit()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorWriteRoutingTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorWriteRoutingTests.cs
index 70c79197..af733d2a 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorWriteRoutingTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorWriteRoutingTests.cs
@@ -46,7 +46,7 @@ public sealed class DriverHostActorWriteRoutingTests : RuntimeActorTestBase
 
     /// <summary>On the PRIMARY, a RouteNodeWrite for a mapped NodeId forwards the driver-side FullName to
     /// the right driver child (observed via the recording driver) and replies NodeWriteResult(true).</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Primary_routes_write_to_driver_by_full_name_and_replies_success()
     {
         var db = NewInMemoryDbFactory();
@@ -130,7 +130,7 @@ public sealed class DriverHostActorWriteRoutingTests : RuntimeActorTestBase
     /// blob string when no top-level <c>FullName</c> property is present, so the reverse map keys on
     /// <c>(DriverInstanceId, &lt;raw-blob&gt;)</c> and the driver receives that exact string as its
     /// <c>WriteRequest.FullReference</c> — not a FullName value extracted from the blob.</summary>
-    [Fact]
+    [Fact(Skip = DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Primary_routes_write_for_raw_protocol_blob_tag()
     {
         var db = NewInMemoryDbFactory();
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigCorpusParityTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigCorpusParityTests.cs
index 562c27a4..9913c64f 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigCorpusParityTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigCorpusParityTests.cs
@@ -1,111 +1,100 @@
-using System.Linq;
 using System.Text.Json;
 using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
-using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
-using ZB.MOM.WW.OtOpcUa.OpcUaServer;
+using ZB.MOM.WW.OtOpcUa.Commons.Types;
 using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
 
 namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
-///     The cross-seam characterization net for R2-11 (01/C-1 + 01/P-1). Composes one equipment tag per
-///     <see cref="TagConfigGoldenCorpus"/> blob, serialises the SAME draft to the artifact blob shape,
-///     decodes it, and asserts the decoded <see cref="EquipmentTagPlan"/> list equals the composer's
-///     element-wise (positional-record value equality) over the WHOLE corpus. Because both producers parse
-///     the identical raw <c>TagConfig</c> string, this proves the four byte-parity parse sites agree TODAY,
-///     and is the permanent regression guard held green through every subsequent seam swap
-///     (<c>TagConfigIntent.Parse</c> consolidation).
+///     v3 cross-seam characterization net for the raw-tag path. Injects every
+///     <see cref="TagConfigGoldenCorpus"/> blob as a raw <c>Tag</c>'s <c>TagConfig</c> under a
+///     RawFolder → Driver → Device chain, flattens the snapshot through
+///     <see cref="DeploymentArtifact.ParseDriverInstances(System.ReadOnlySpan{byte})"/> into the driver's
+///     merged <c>RawTags</c> array (keyed by RawPath), and asserts over the WHOLE corpus that:
+///     <list type="number">
+///       <item>every corpus tag survives (none dropped) and lands at its expected RawPath;</item>
+///       <item>the decoded <see cref="RawTagEntry.TagConfig"/> is byte-identical to the authored blob
+///             (the artifact carries the raw address blob verbatim — no PascalCase/FullName rewrite); and</item>
+///       <item><see cref="TagConfigIntent.Parse"/> over the decoded blob equals the parse over the original
+///             blob (record value equality incl. the nested alarm intent) — so any downstream intent
+///             consumer sees identical platform intents whether it reads the authored Tag or the deploy
+///             artifact. The permanent regression guard for the compose→encode→decode raw-tag seam.</item>
+///     </list>
+///     <b>Dark address space (Batch 1):</b> the same snapshot yields an EMPTY equipment-tag plan set —
+///     equipment-tag variable materialization lands in Batch 4 (asserted here so the darkness is pinned).
 /// </summary>
 public sealed class TagConfigCorpusParityTests
 {
-    [Fact]
-    public void Composer_and_artifact_agree_over_the_whole_TagConfig_corpus()
-    {
-        var ns = new Namespace
-        {
-            NamespaceId = "ns-eq",
-            ClusterId = "c1",
-            Kind = NamespaceKind.Equipment,
-            NamespaceUri = "urn:eq",
-        };
-        var driver = new DriverInstance
-        {
-            DriverInstanceId = "drv-1",
-            ClusterId = "c1",
-            NamespaceId = "ns-eq",
-            Name = "Modbus1",
-            DriverType = "Modbus",
-            DriverConfig = "{}",
-        };
-        var area = new UnsArea { UnsAreaId = "area-1", ClusterId = "c1", Name = "filling" };
-        var line = new UnsLine { UnsLineId = "line-1", UnsAreaId = "area-1", Name = "line-1" };
-        var equip = new Equipment
-        {
-            EquipmentId = "eq-1",
-            DriverInstanceId = "drv-1",
-            UnsLineId = "line-1",
-            Name = "Machine_001",
-            MachineCode = "MACHINE_001",
-        };
+    private const string Folder = "Plant";
+    private const string DriverName = "Modbus1";
+    private const string DeviceName = "PLC-A";
 
-        var tags = TagConfigGoldenCorpus.Blobs
-            .Select((blob, i) => new Tag
+    private static byte[] Snapshot() => JsonSerializer.SerializeToUtf8Bytes(new
+    {
+        Clusters = new[] { new { ClusterId = "MAIN" } },
+        RawFolders = new[]
+        {
+            new { RawFolderId = "f1", ParentRawFolderId = (string?)null, Name = Folder, ClusterId = "MAIN" },
+        },
+        DriverInstances = new[]
+        {
+            new { DriverInstanceId = "drv1", Name = DriverName, DriverType = "Modbus", Enabled = true, DriverConfig = "{\"UnitId\":1}", ClusterId = "MAIN", RawFolderId = "f1" },
+        },
+        Devices = new[]
+        {
+            new { DeviceId = "dev1", DriverInstanceId = "drv1", Name = DeviceName, DeviceConfig = "{\"Host\":\"10.0.0.5\",\"Port\":502}" },
+        },
+        Tags = TagConfigGoldenCorpus.Blobs
+            .Select((blob, i) => new
             {
                 TagId = $"tag-{i:D2}",
-                DriverInstanceId = "drv-1",
-                EquipmentId = "eq-1",
-                FolderPath = null,
+                DeviceId = "dev1",
+                TagGroupId = (string?)null,
                 Name = $"Sig{i:D2}",
                 DataType = "Float",
-                AccessLevel = TagAccessLevel.Read,
                 TagConfig = blob,
+                WriteIdempotent = i % 2 == 0,
             })
-            .ToArray();
+            .ToArray(),
+    });
 
-        // ---- Side 1: the live-edit composer ----
-        var composed = AddressSpaceComposer.Compose(
-            new[] { area }, new[] { line }, new[] { equip },
-            new[] { driver }, Array.Empty<ScriptedAlarm>(), tags, new[] { ns });
+    /// <summary>Byte-parity + intent-parity of every corpus blob round-tripped through the deploy artifact
+    /// as a raw tag's TagConfig (keyed by RawPath).</summary>
+    [Fact]
+    public void Artifact_round_trips_every_TagConfig_blob_byte_and_intent_identical()
+    {
+        var blob = Snapshot();
 
-        // ---- Side 2: serialise the SAME draft to the artifact blob shape, then decode it ----
-        var blob = JsonSerializer.SerializeToUtf8Bytes(new
+        var spec = DeploymentArtifact.ParseDriverInstances(blob).ShouldHaveSingleItem();
+        using var doc = JsonDocument.Parse(spec.DriverConfig);
+        var rawTags = doc.RootElement.GetProperty("RawTags").EnumerateArray().ToList();
+
+        // (1) No corpus tag dropped.
+        rawTags.Count.ShouldBe(TagConfigGoldenCorpus.Blobs.Count);
+
+        for (var i = 0; i < TagConfigGoldenCorpus.Blobs.Count; i++)
         {
-            Namespaces = new[]
-            {
-                new { ns.NamespaceId, ns.ClusterId, Kind = (int)ns.Kind },
-            },
-            DriverInstances = new[]
-            {
-                new { driver.DriverInstanceId, driver.DriverType, driver.DriverConfig, driver.NamespaceId, driver.ClusterId },
-            },
-            Tags = tags.Select(ToSnapshot).ToArray(),
-        });
+            var expectedBlob = TagConfigGoldenCorpus.Blobs[i];
+            var expectedRawPath = $"{Folder}/{DriverName}/{DeviceName}/Sig{i:D2}";
 
-        var decoded = DeploymentArtifact.ParseComposition(blob);
+            var entry = rawTags.SingleOrDefault(e => e.GetProperty("RawPath").GetString() == expectedRawPath);
+            entry.ValueKind.ShouldNotBe(JsonValueKind.Undefined, $"corpus blob #{i} missing at RawPath {expectedRawPath}");
 
-        decoded.EquipmentTags.Count.ShouldBe(tags.Length);
-        // Full byte-parity: every field, same order (positional-record value equality). A field-by-field
-        // spell-out per blob so a divergence names the offending corpus entry.
-        for (var i = 0; i < composed.EquipmentTags.Count; i++)
-        {
-            var c = composed.EquipmentTags[i];
-            var d = decoded.EquipmentTags.Single(t => t.TagId == c.TagId);
-            d.ShouldBe(c, customMessage: $"corpus blob #{c.TagId} diverged: '{tags.Single(t => t.TagId == c.TagId).TagConfig}'");
+            // (2) The raw address blob is carried verbatim (no rewrite).
+            var decodedTagConfig = entry.GetProperty("TagConfig").GetString();
+            decodedTagConfig.ShouldBe(expectedBlob, $"corpus blob #{i} TagConfig not byte-preserved");
+
+            // (3) The platform intent parses identically off the decoded blob and the authored blob.
+            TagConfigIntent.Parse(decodedTagConfig)
+                .ShouldBe(TagConfigIntent.Parse(expectedBlob), $"corpus blob #{i} intent diverged: '{expectedBlob}'");
         }
-        decoded.EquipmentTags.SequenceEqual(composed.EquipmentTags).ShouldBeTrue();
     }
 
-    private static object ToSnapshot(Tag t) => new
+    /// <summary>Dark address space this batch: the same snapshot materializes no equipment-tag plans.</summary>
+    [Fact]
+    public void ParseComposition_over_the_corpus_emits_dark_equipment_tags()
     {
-        t.TagId,
-        t.DriverInstanceId,
-        t.EquipmentId,
-        t.Name,
-        t.FolderPath,
-        t.DataType,
-        AccessLevel = (int)t.AccessLevel,
-        t.TagConfig,
-    };
+        DeploymentArtifact.ParseComposition(Snapshot()).EquipmentTags.ShouldBeEmpty();
+    }
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigGoldenCorpus.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigGoldenCorpus.cs
index a76bed77..32192ca2 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigGoldenCorpus.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/TagConfigGoldenCorpus.cs
@@ -2,82 +2,84 @@ namespace ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers;
 
 /// <summary>
 ///     The shared golden corpus of <c>TagConfig</c> JSON blobs used to characterise the cross-driver
-///     platform-intent parse (FullName / alarm / isHistorized / historianTagname / isArray / arrayLength).
-///     Every entry is a NON-NULL string (the DB <c>CK_Tag_TagConfig_IsJson</c> constraint guarantees a
-///     non-null TagConfig for a real deploy) so the compose→encode→decode parity test
-///     (<see cref="TagConfigCorpusParityTests"/>) can round-trip each through both equipment-tag producers
-///     and assert byte-parity field-by-field. The <c>null</c>-input divergence (composer returns the raw
-///     null, artifact coalesces to "") is a documented seam handled only at the
-///     <c>TagConfigIntent.Parse</c> unit level, not through the parity round-trip.
-///     <para>Covers: happy path, blank, non-object root, malformed JSON, FullName absent/non-string/whitespace,
+///     platform-intent parse (<c>TagConfigIntent.Parse</c>: alarm / isHistorized / historianTagname /
+///     isArray / arrayLength). v3: the retired <c>FullName</c> key is gone — a raw tag's driver address is
+///     an ordinary driver-specific key (e.g. <c>address</c>), and the tag's RawPath (not any in-blob
+///     FullName) is its identity. Each entry is a NON-NULL string (the DB <c>CK_Tag_TagConfig</c> constraint
+///     guarantees non-null) so the v3 round-trip parity test (<see cref="TagConfigCorpusParityTests"/>) can
+///     inject each as a raw tag's <c>TagConfig</c>, flatten it through the deploy artifact into the driver's
+///     <c>RawTags</c> array (keyed by RawPath), and assert the decoded <c>RawTagEntry.TagConfig</c> is
+///     byte-preserved AND parses to the identical <c>TagConfigIntent</c> — the cross-seam parse-agreement
+///     guarantee, now over the raw path rather than the retired equipment-tag path.
+///     <para>Covers: happy path, blank, non-object root, malformed JSON, driver-only keys,
 ///     alarm object with each field absent/wrong-type, historizeToAveva true/false/non-bool,
 ///     historianTagname whitespace, isArray/arrayLength combinations (incl. negative/overflow/non-number/
 ///     length-without-flag/zero), unknown keys, and mixed platform+driver keys.</para>
 /// </summary>
 public static class TagConfigGoldenCorpus
 {
-    /// <summary>The corpus blobs, index-ordered. The parity test builds one equipment tag per blob.</summary>
+    /// <summary>The corpus blobs, index-ordered. The parity test builds one raw tag per blob.</summary>
     public static readonly IReadOnlyList<string> Blobs = new[]
     {
-        // 0 happy path
-        "{\"FullName\":\"X.Y\"}",
-        // 1 blank (whitespace) — FullName falls back to the raw (blank) blob on both seams
+        // 0 happy path (plain driver address, no platform intents)
+        "{\"address\":\"40001\"}",
+        // 1 blank (whitespace) — never-throws, no intents
         "   ",
         // 2 non-object root
         "[1,2]",
         // 3 malformed JSON
         "not json {",
-        // 4 FullName absent (driver keys only) — FullName = raw blob
+        // 4 driver keys only — no platform intents
         "{\"region\":\"HoldingRegisters\",\"address\":5}",
-        // 5 FullName present but non-string — FullName = raw blob
-        "{\"FullName\":123}",
-        // 6 FullName whitespace value (not trimmed)
-        "{\"FullName\":\"   \"}",
+        // 5 numeric address value — no platform intents
+        "{\"address\":123}",
+        // 6 whitespace address value — no platform intents
+        "{\"address\":\"   \"}",
         // 7 alarm empty object → defaults (AlarmCondition, 500, historize null)
-        "{\"FullName\":\"A\",\"alarm\":{}}",
+        "{\"address\":\"A\",\"alarm\":{}}",
         // 8 alarm fully specified
-        "{\"FullName\":\"A\",\"alarm\":{\"alarmType\":\"OffNormalAlarm\",\"severity\":700}}",
+        "{\"address\":\"A\",\"alarm\":{\"alarmType\":\"OffNormalAlarm\",\"severity\":700}}",
         // 9 alarm non-object → no alarm
-        "{\"FullName\":\"A\",\"alarm\":\"oops\"}",
+        "{\"address\":\"A\",\"alarm\":\"oops\"}",
         // 10 alarm historizeToAveva true
-        "{\"FullName\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":true}}",
+        "{\"address\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":true}}",
         // 11 alarm historizeToAveva false
-        "{\"FullName\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":false}}",
+        "{\"address\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":false}}",
         // 12 alarm historizeToAveva non-bool → null
-        "{\"FullName\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":\"oops\"}}",
+        "{\"address\":\"A\",\"alarm\":{\"alarmType\":\"LimitAlarm\",\"severity\":500,\"historizeToAveva\":\"oops\"}}",
         // 13 alarm severity non-number → 500
-        "{\"FullName\":\"A\",\"alarm\":{\"severity\":\"high\"}}",
+        "{\"address\":\"A\",\"alarm\":{\"severity\":\"high\"}}",
         // 14 alarm alarmType non-string → AlarmCondition
-        "{\"FullName\":\"A\",\"alarm\":{\"alarmType\":123}}",
+        "{\"address\":\"A\",\"alarm\":{\"alarmType\":123}}",
         // 15 isHistorized true
-        "{\"FullName\":\"A\",\"isHistorized\":true}",
+        "{\"address\":\"A\",\"isHistorized\":true}",
         // 16 isHistorized true + explicit tagname
-        "{\"FullName\":\"A\",\"isHistorized\":true,\"historianTagname\":\"P.L.X\"}",
+        "{\"address\":\"A\",\"isHistorized\":true,\"historianTagname\":\"P.L.X\"}",
         // 17 isHistorized false + JSON-null tagname
-        "{\"FullName\":\"A\",\"isHistorized\":false,\"historianTagname\":null}",
+        "{\"address\":\"A\",\"isHistorized\":false,\"historianTagname\":null}",
         // 18 historianTagname whitespace → null
-        "{\"FullName\":\"A\",\"isHistorized\":true,\"historianTagname\":\"   \"}",
+        "{\"address\":\"A\",\"isHistorized\":true,\"historianTagname\":\"   \"}",
         // 19 isHistorized non-bool → false
-        "{\"FullName\":\"A\",\"isHistorized\":\"yes\"}",
+        "{\"address\":\"A\",\"isHistorized\":\"yes\"}",
         // 20 isArray true + length
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":16}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":16}",
         // 21 isArray true, no length
-        "{\"FullName\":\"A\",\"isArray\":true}",
+        "{\"address\":\"A\",\"isArray\":true}",
         // 22 isArray false + length → scalar
-        "{\"FullName\":\"A\",\"isArray\":false,\"arrayLength\":16}",
+        "{\"address\":\"A\",\"isArray\":false,\"arrayLength\":16}",
         // 23 isArray true, length 0 → true, 0
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":0}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":0}",
         // 24 arrayLength non-number → true, null
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":\"16\"}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":\"16\"}",
         // 25 arrayLength negative → true, null
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":-1}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":-1}",
         // 26 arrayLength float → true, null
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":16.5}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":16.5}",
         // 27 arrayLength overflow (uint.MaxValue + 1) → true, null
-        "{\"FullName\":\"A\",\"isArray\":true,\"arrayLength\":4294967296}",
+        "{\"address\":\"A\",\"isArray\":true,\"arrayLength\":4294967296}",
         // 28 unknown + mixed platform/driver keys
-        "{\"FullName\":\"A.B\",\"region\":\"Coils\",\"address\":5,\"dataType\":\"Int16\",\"isHistorized\":true,\"alarm\":{\"severity\":250},\"foo\":\"bar\"}",
+        "{\"address\":5,\"region\":\"Coils\",\"dataType\":\"Int16\",\"isHistorized\":true,\"alarm\":{\"severity\":250},\"foo\":\"bar\"}",
         // 29 all intents combined
-        "{\"FullName\":\"C.D\",\"isArray\":true,\"arrayLength\":4,\"isHistorized\":true,\"historianTagname\":\"H\",\"alarm\":{\"alarmType\":\"DiscreteAlarm\",\"severity\":900,\"historizeToAveva\":false}}",
+        "{\"address\":\"C.D\",\"isArray\":true,\"arrayLength\":4,\"isHistorized\":true,\"historianTagname\":\"H\",\"alarm\":{\"alarmType\":\"DiscreteAlarm\",\"severity\":900,\"historizeToAveva\":false}}",
     };
 }
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorRebuildTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorRebuildTests.cs
index cc3b2fa1..04894b13 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorRebuildTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorRebuildTests.cs
@@ -120,7 +120,7 @@ public sealed class OpcUaPublishActorRebuildTests : RuntimeActorTestBase
     ///     mirror holds for the MAIN node. Without the production scoping edit, the unscoped parse
     ///     would materialise BOTH variables on every node.
     /// </summary>
-    [Fact]
+    [Fact(Skip = ZB.MOM.WW.OtOpcUa.Runtime.Tests.Drivers.DarkAddressSpaceReasons.EquipmentTagsDarkBatch4)]
     public void Rebuild_materialises_only_the_nodes_cluster()
     {
         // --- SITE-A node: only the SITE-A tag's variable, never MAIN's. ---