diff --git a/api/package.json b/api/package.json
index 24e77cad..081e2b7a 100644
--- a/api/package.json
+++ b/api/package.json
@@ -29,9 +29,9 @@
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "document-drive": "1.0.0-alpha.88",
-    "document-model": "1.7.0",
-    "document-model-libs": "^1.82.0",
+    "document-drive": "1.0.0-alpha.92",
+    "document-model": "^1.8.0",
+    "document-model-libs": "^1.84.0",
     "dotenv": "^16.4.5",
     "esbuild": "^0.21.2",
     "ethers": "^5.7.2",
diff --git a/api/pnpm-lock.yaml b/api/pnpm-lock.yaml
index 739b6e1a..c1cea70c 100644
--- a/api/pnpm-lock.yaml
+++ b/api/pnpm-lock.yaml
@@ -36,14 +36,14 @@ importers:
         specifier: ^2.8.5
         version: 2.8.5
       document-drive:
-        specifier: 1.0.0-alpha.88
-        version: 1.0.0-alpha.88(document-model-libs@1.82.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4))(document-model@1.7.0)(encoding@0.1.13)(prisma@5.16.0)
+        specifier: 1.0.0-alpha.92
+        version: 1.0.0-alpha.92(document-model-libs@1.84.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4))(document-model@1.8.0)(encoding@0.1.13)(prisma@5.16.0)
       document-model:
-        specifier: 1.7.0
-        version: 1.7.0
+        specifier: ^1.8.0
+        version: 1.8.0
       document-model-libs:
-        specifier: ^1.82.0
-        version: 1.82.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4)
+        specifier: ^1.84.0
+        version: 1.84.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4)
       dotenv:
         specifier: ^16.4.5
         version: 16.4.5
@@ -1276,8 +1276,8 @@ packages:
       prisma:
         optional: true
 
-  '@prisma/client@5.17.0':
-    resolution: {integrity: sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==}
+  '@prisma/client@5.19.1':
+    resolution: {integrity: sha512-x30GFguInsgt+4z5I4WbkZP2CGpotJMUXy+Gl/aaUjHn2o1DnLYNTA+q9XdYmAQZM8fIIkvUiA2NpgosM3fneg==}
     engines: {node: '>=16.13'}
     peerDependencies:
       prisma: '*'
@@ -1646,8 +1646,8 @@ packages:
   '@types/serve-static@1.15.7':
     resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
 
-  '@types/validator@13.12.0':
-    resolution: {integrity: sha512-nH45Lk7oPIJ1RVOF6JgFI6Dy0QpHEzq4QecZhvguxYPDwT8c93prCMqAtiIttm39voZ+DDR+qkNnMpJmMBRqag==}
+  '@types/validator@13.12.1':
+    resolution: {integrity: sha512-w0URwf7BQb0rD/EuiG12KP0bailHKHP5YVviJG9zw3ykAokL0TuxU2TUqMB7EwZ59bDHYdeTIvjI5m0S7qHfOA==}
 
   '@typescript-eslint/eslint-plugin@5.62.0':
     resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==}
@@ -2305,6 +2305,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.3.7:
+    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -2392,20 +2401,20 @@ packages:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
 
-  document-drive@1.0.0-alpha.88:
-    resolution: {integrity: sha512-HwLtyr9wo5Q4c6aMKOK8rFqXO0NZwB07gVljCeCqrromcDekHeQREvYUQaqXlo4RKhQP3dyyzcI6itzS0g5qjQ==}
+  document-drive@1.0.0-alpha.92:
+    resolution: {integrity: sha512-fBtlSBldSvrrZFdqaPm/Ha13iHg0uwKk38CvZEhq7uDDmEV0ktfw038djwjFIDlr+uRISL43n3S7WAnzrVhCjw==}
     peerDependencies:
-      document-model: ^1.7.0
+      document-model: ^1.8.0
       document-model-libs: ^1.57.0
 
-  document-model-libs@1.82.0:
-    resolution: {integrity: sha512-718kbi3sdWWlOWGmXaujhk0hOEJE/omLZ7wT+DaSkw4+mlnNz4ItBAAo3GoHRWcqucRDsF3wEm8uj5keGpONDA==}
+  document-model-libs@1.84.0:
+    resolution: {integrity: sha512-v3dc9asjf+pvAPffubUb8Pr1R8ahPwKUU1/qIwLrlXbSJ4Rz3ctsvjcwW2z0uIiCZJPoLCRTE+VESIIAO5GiHQ==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^18.2.0
 
-  document-model@1.7.0:
-    resolution: {integrity: sha512-g35SSY9+pqsCKz0xwZm3tWp9/bEQlvrVEp+96vyFtR/w1zyrGXwBOYslpKhpfuDmqJfN0ERq+LgB26rmf+YDyQ==}
+  document-model@1.8.0:
+    resolution: {integrity: sha512-dgJHAFIsJddwhjZDspFexmJifaZv4yL3Hbak2pNim22lIEW3n+wSw8IvNV+ZAWJW7ql5lIOcFDU4mUhQO2Gi4g==}
 
   dom-accessibility-api@0.5.16:
     resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
@@ -2566,8 +2575,8 @@ packages:
   eslint-import-resolver-node@0.3.9:
     resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
 
-  eslint-module-utils@2.8.1:
-    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
+  eslint-module-utils@2.11.0:
+    resolution: {integrity: sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -3229,8 +3238,8 @@ packages:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
 
-  is-core-module@2.14.0:
-    resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==}
+  is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
     engines: {node: '>= 0.4'}
 
   is-data-view@1.0.1:
@@ -3844,12 +3853,15 @@ packages:
     resolution: {integrity: sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==}
     engines: {node: '>=10'}
 
+  node-abi@3.67.0:
+    resolution: {integrity: sha512-bLn/fU/ALVBE9wj+p4Y21ZJWYFjUXLXPi/IewyLZkx3ApxKDNBWCKdReeKOtD8dWpOdDCeMyLh6ZewzcLsG2Nw==}
+    engines: {node: '>=10'}
+
   node-abort-controller@3.1.1:
     resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
 
-  node-addon-api@7.1.0:
-    resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==}
-    engines: {node: ^16 || ^18 || >= 20}
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
   node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
@@ -4589,6 +4601,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -4658,6 +4675,9 @@ packages:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
 
+  sha1-uint8array@0.10.7:
+    resolution: {integrity: sha512-COJRCUOuTgEEPyhcRncHlf3Z2/Nik0PGZ60/tA9Ni2jlwYJ2g/WgP8TV19gbllmZDs/DGV5YklZxreyMHFX8ww==}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -6594,7 +6614,7 @@ snapshots:
   '@npmcli/fs@1.1.1':
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.6.2
+      semver: 7.6.3
     optional: true
 
   '@npmcli/move-file@1.1.2':
@@ -6736,7 +6756,7 @@ snapshots:
     optionalDependencies:
       prisma: 5.16.0
 
-  '@prisma/client@5.17.0(prisma@5.16.0)':
+  '@prisma/client@5.19.1(prisma@5.16.0)':
     optionalDependencies:
       prisma: 5.16.0
     optional: true
@@ -7230,7 +7250,7 @@ snapshots:
       '@types/node': 20.14.9
       '@types/send': 0.17.4
 
-  '@types/validator@13.12.0':
+  '@types/validator@13.12.1':
     optional: true
 
   '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)':
@@ -7413,7 +7433,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -8068,6 +8088,11 @@ snapshots:
     dependencies:
       ms: 2.1.2
 
+  debug@4.3.7:
+    dependencies:
+      ms: 2.1.3
+    optional: true
+
   decamelize@1.2.0: {}
 
   decimal.js@10.4.3: {}
@@ -8152,10 +8177,10 @@ snapshots:
     dependencies:
       esutils: 2.0.3
 
-  document-drive@1.0.0-alpha.88(document-model-libs@1.82.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4))(document-model@1.7.0)(encoding@0.1.13)(prisma@5.16.0):
+  document-drive@1.0.0-alpha.92(document-model-libs@1.84.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4))(document-model@1.8.0)(encoding@0.1.13)(prisma@5.16.0):
     dependencies:
-      document-model: 1.7.0
-      document-model-libs: 1.82.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4)
+      document-model: 1.8.0
+      document-model-libs: 1.84.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4)
       exponential-backoff: 3.1.1
       graphql: 16.9.0
       graphql-request: 6.1.0(encoding@0.1.13)(graphql@16.9.0)
@@ -8164,7 +8189,7 @@ snapshots:
       sanitize-filename: 1.6.3
       uuid: 9.0.1
     optionalDependencies:
-      '@prisma/client': 5.17.0(prisma@5.16.0)
+      '@prisma/client': 5.19.1(prisma@5.16.0)
       localforage: 1.10.0
       redis: 4.7.0
       sequelize: 6.37.3(sqlite3@5.1.7)
@@ -8183,7 +8208,7 @@ snapshots:
       - supports-color
       - tedious
 
-  document-model-libs@1.82.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4):
+  document-model-libs@1.84.0(encoding@0.1.13)(graphql@16.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vitest@0.32.4):
     dependencies:
       '@acaldas/graphql-codegen-typescript-validation-schema': 0.12.3(encoding@0.1.13)(graphql@16.9.0)
       '@graphql-codegen/core': 4.0.2(graphql@16.9.0)
@@ -8209,13 +8234,14 @@ snapshots:
       - supports-color
       - vitest
 
-  document-model@1.7.0:
+  document-model@1.8.0:
     dependencies:
       change-case: 5.4.4
       jszip: 3.10.1
       mime: 4.0.3
       mutative: 1.0.6
       safe-stable-stringify: 2.4.3
+      sha1-uint8array: 0.10.7
       uuid: 9.0.1
       zod: 3.23.8
 
@@ -8466,12 +8492,12 @@ snapshots:
   eslint-import-resolver-node@0.3.9:
     dependencies:
       debug: 3.2.7
-      is-core-module: 2.14.0
+      is-core-module: 2.15.1
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
+  eslint-module-utils@2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -8491,9 +8517,9 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
+      eslint-module-utils: 2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
       hasown: 2.0.2
-      is-core-module: 2.14.0
+      is-core-module: 2.15.1
       is-glob: 4.0.3
       minimatch: 3.1.2
       object.fromentries: 2.0.8
@@ -9154,7 +9180,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -9174,7 +9200,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -9310,7 +9336,7 @@ snapshots:
 
   is-callable@1.2.7: {}
 
-  is-core-module@2.14.0:
+  is-core-module@2.15.1:
     dependencies:
       hasown: 2.0.2
 
@@ -9888,9 +9914,14 @@ snapshots:
     dependencies:
       semver: 7.6.2
 
+  node-abi@3.67.0:
+    dependencies:
+      semver: 7.6.3
+    optional: true
+
   node-abort-controller@3.1.1: {}
 
-  node-addon-api@7.1.0:
+  node-addon-api@7.1.1:
     optional: true
 
   node-domexception@1.0.0: {}
@@ -9923,7 +9954,7 @@ snapshots:
       nopt: 5.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.6.2
+      semver: 7.6.3
       tar: 6.2.1
       which: 2.0.2
     transitivePeerDependencies:
@@ -10275,7 +10306,7 @@ snapshots:
       minimist: 1.2.8
       mkdirp-classic: 0.5.3
       napi-build-utils: 1.0.2
-      node-abi: 3.65.0
+      node-abi: 3.67.0
       pump: 3.0.0
       rc: 1.2.8
       simple-get: 4.0.1
@@ -10504,7 +10535,7 @@ snapshots:
 
   resolve@1.22.8:
     dependencies:
-      is-core-module: 2.14.0
+      is-core-module: 2.15.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -10616,6 +10647,9 @@ snapshots:
 
   semver@7.6.2: {}
 
+  semver@7.6.3:
+    optional: true
+
   send@0.18.0:
     dependencies:
       debug: 2.6.9
@@ -10646,8 +10680,8 @@ snapshots:
   sequelize@6.37.3(sqlite3@5.1.7):
     dependencies:
       '@types/debug': 4.1.12
-      '@types/validator': 13.12.0
-      debug: 4.3.5
+      '@types/validator': 13.12.1
+      debug: 4.3.7
       dottie: 2.0.6
       inflection: 1.13.4
       lodash: 4.17.21
@@ -10655,7 +10689,7 @@ snapshots:
       moment-timezone: 0.5.45
       pg-connection-string: 2.6.4
       retry-as-promised: 7.0.4
-      semver: 7.6.2
+      semver: 7.6.3
       sequelize-pool: 7.1.0
       toposort-class: 1.0.1
       uuid: 8.3.2
@@ -10703,6 +10737,8 @@ snapshots:
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
+  sha1-uint8array@0.10.7: {}
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
@@ -10767,7 +10803,7 @@ snapshots:
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -10819,7 +10855,7 @@ snapshots:
   sqlite3@5.1.7:
     dependencies:
       bindings: 1.5.0
-      node-addon-api: 7.1.0
+      node-addon-api: 7.1.1
       prebuild-install: 7.1.2
       tar: 6.2.1
     optionalDependencies:
diff --git a/api/src/graphql/server/generated/drive/nexus.ts b/api/src/graphql/server/generated/drive/nexus.ts
index b15eca66..a82f2b1d 100644
--- a/api/src/graphql/server/generated/drive/nexus.ts
+++ b/api/src/graphql/server/generated/drive/nexus.ts
@@ -140,6 +140,7 @@ export interface NexusGenScalars {
   ID: string
   Attachment: any
   Date: any
+  DateTime: any
 }
 
 export interface NexusGenObjects {
@@ -204,10 +205,10 @@ export interface NexusGenObjects {
     assetId: string; // ID!
     assetType: NexusGenEnums['AssetType']; // AssetType!
     counterPartyAccountId?: string | null; // ID
-    entryTime: NexusGenScalars['Date']; // Date!
+    entryTime: NexusGenScalars['DateTime']; // DateTime!
     id: string; // ID!
-    settlementTime?: NexusGenScalars['Date'] | null; // Date
-    tradeTime?: NexusGenScalars['Date'] | null; // Date
+    settlementTime?: NexusGenScalars['DateTime'] | null; // DateTime
+    tradeTime?: NexusGenScalars['DateTime'] | null; // DateTime
   }
   BudgetStatement: { // root type
     created: NexusGenScalars['Date']; // Date!
@@ -238,8 +239,8 @@ export interface NexusGenObjects {
     balance: number; // Float!
     currency: string; // String!
     id: string; // ID!
-    spv?: NexusGenRootTypes['Spv'] | null; // Spv
-    spvId?: string | null; // ID
+    spvId: string; // ID!
+    type: NexusGenEnums['AssetType']; // AssetType!
   }
   Challenge: { // root type
     hex: string; // String!
@@ -285,6 +286,8 @@ export interface NexusGenObjects {
     hash: string; // String!
     id?: string | null; // String
     index: number; // Int!
+    inputText: string; // String!
+    skip: number; // Int!
     timestamp: NexusGenScalars['Date']; // Date!
     type: string; // String!
   }
@@ -298,23 +301,20 @@ export interface NexusGenObjects {
   FixedIncome: { // root type
     CUSIP?: string | null; // String
     ISIN?: string | null; // String
-    assetProceeds?: number | null; // Float
+    assetProceeds: number; // Float!
     coupon?: number | null; // Float
-    currentValue?: number | null; // Float
-    fixedIncomeType?: NexusGenRootTypes['FixedIncomeType'] | null; // FixedIncomeType
-    fixedIncomeTypeId?: string | null; // ID
-    id?: string | null; // ID
-    maturity?: NexusGenScalars['Date'] | null; // Date
-    name?: string | null; // String
-    notional?: number | null; // Float
-    purchaseDate?: NexusGenScalars['Date'] | null; // Date
-    purchasePrice?: number | null; // Float
-    purchaseProceeds?: number | null; // Float
-    realizedSurplus?: number | null; // Float
-    salesProceeds?: number | null; // Float
-    spv?: NexusGenRootTypes['Spv'] | null; // Spv
-    spvId?: string | null; // ID
-    totalDiscount?: number | null; // Float
+    fixedIncomeTypeId: string; // ID!
+    id: string; // ID!
+    maturity?: NexusGenScalars['DateTime'] | null; // DateTime
+    name: string; // String!
+    notional: number; // Float!
+    purchaseDate: NexusGenScalars['DateTime']; // DateTime!
+    purchasePrice: number; // Float!
+    purchaseProceeds: number; // Float!
+    realizedSurplus: number; // Float!
+    salesProceeds: number; // Float!
+    spvId: string; // ID!
+    totalDiscount: number; // Float!
     type: NexusGenEnums['AssetType']; // AssetType!
   }
   FixedIncomeType: { // root type
@@ -332,7 +332,7 @@ export interface NexusGenObjects {
   GroupTransaction: { // root type
     cashBalanceChange: number; // Float!
     cashTransaction: NexusGenRootTypes['BaseTransaction']; // BaseTransaction!
-    entryTime: NexusGenScalars['Date']; // Date!
+    entryTime: NexusGenScalars['DateTime']; // DateTime!
     fees?: NexusGenRootTypes['TransactionFee'][] | null; // [TransactionFee!]
     fixedIncomeTransaction?: NexusGenRootTypes['BaseTransaction'] | null; // BaseTransaction
     id: string; // ID!
@@ -444,22 +444,13 @@ export interface NexusGenObjects {
     created: NexusGenScalars['Date']; // Date!
     documentType: string; // String!
     id: string; // String!
+    initialState: NexusGenRootTypes['RealWorldAssetsState']; // RealWorldAssetsState!
     lastModified: NexusGenScalars['Date']; // Date!
     name: string; // String!
     operations: NexusGenRootTypes['DefaultOperation'][]; // [DefaultOperation!]!
     revision: number; // Int!
     state: NexusGenRootTypes['RealWorldAssetsState']; // RealWorldAssetsState!
   }
-  RealWorldAssetsPortfolio: { // root type
-    accounts: NexusGenRootTypes['Account'][]; // [Account!]!
-    fixedIncomeTypes: NexusGenRootTypes['FixedIncomeType'][]; // [FixedIncomeType!]!
-    id: string; // ID!
-    portfolio: NexusGenRootTypes['Asset'][]; // [Asset!]!
-    principalLenderAccountId: string; // ID!
-    serviceProviderFeeTypes: NexusGenRootTypes['ServiceProviderFeeType'][]; // [ServiceProviderFeeType!]!
-    spvs: NexusGenRootTypes['Spv'][]; // [Spv!]!
-    transactions: NexusGenRootTypes['GroupTransaction'][]; // [GroupTransaction!]!
-  }
   RealWorldAssetsState: { // root type
     accounts: NexusGenRootTypes['Account'][]; // [Account!]!
     fixedIncomeTypes: NexusGenRootTypes['FixedIncomeType'][]; // [FixedIncomeType!]!
@@ -616,7 +607,6 @@ export interface NexusGenObjects {
 export interface NexusGenInterfaces {
   IDocument: NexusGenRootTypes['AccountSnapshot'] | NexusGenRootTypes['BudgetStatement'] | NexusGenRootTypes['DefaultDocument'] | NexusGenRootTypes['RealWorldAssets'] | NexusGenRootTypes['ScopeFramework'];
   IOperation: NexusGenRootTypes['DefaultOperation'];
-  IRealWorldAssetsState: NexusGenRootTypes['RealWorldAssetsPortfolio'] | NexusGenRootTypes['RealWorldAssetsState'];
   System: NexusGenRootTypes['SwitchboardDrive'] | NexusGenRootTypes['SwitchboardHost'];
 }
 
@@ -694,10 +684,10 @@ export interface NexusGenFieldTypes {
     assetId: string; // ID!
     assetType: NexusGenEnums['AssetType']; // AssetType!
     counterPartyAccountId: string | null; // ID
-    entryTime: NexusGenScalars['Date']; // Date!
+    entryTime: NexusGenScalars['DateTime']; // DateTime!
     id: string; // ID!
-    settlementTime: NexusGenScalars['Date'] | null; // Date
-    tradeTime: NexusGenScalars['Date'] | null; // Date
+    settlementTime: NexusGenScalars['DateTime'] | null; // DateTime
+    tradeTime: NexusGenScalars['DateTime'] | null; // DateTime
   }
   BudgetStatement: { // field return type
     created: NexusGenScalars['Date']; // Date!
@@ -728,8 +718,8 @@ export interface NexusGenFieldTypes {
     balance: number; // Float!
     currency: string; // String!
     id: string; // ID!
-    spv: NexusGenRootTypes['Spv'] | null; // Spv
-    spvId: string | null; // ID
+    spvId: string; // ID!
+    type: NexusGenEnums['AssetType']; // AssetType!
   }
   Challenge: { // field return type
     hex: string; // String!
@@ -775,6 +765,8 @@ export interface NexusGenFieldTypes {
     hash: string; // String!
     id: string | null; // String
     index: number; // Int!
+    inputText: string; // String!
+    skip: number; // Int!
     timestamp: NexusGenScalars['Date']; // Date!
     type: string; // String!
   }
@@ -788,23 +780,20 @@ export interface NexusGenFieldTypes {
   FixedIncome: { // field return type
     CUSIP: string | null; // String
     ISIN: string | null; // String
-    assetProceeds: number | null; // Float
+    assetProceeds: number; // Float!
     coupon: number | null; // Float
-    currentValue: number | null; // Float
-    fixedIncomeType: NexusGenRootTypes['FixedIncomeType'] | null; // FixedIncomeType
-    fixedIncomeTypeId: string | null; // ID
-    id: string | null; // ID
-    maturity: NexusGenScalars['Date'] | null; // Date
-    name: string | null; // String
-    notional: number | null; // Float
-    purchaseDate: NexusGenScalars['Date'] | null; // Date
-    purchasePrice: number | null; // Float
-    purchaseProceeds: number | null; // Float
-    realizedSurplus: number | null; // Float
-    salesProceeds: number | null; // Float
-    spv: NexusGenRootTypes['Spv'] | null; // Spv
-    spvId: string | null; // ID
-    totalDiscount: number | null; // Float
+    fixedIncomeTypeId: string; // ID!
+    id: string; // ID!
+    maturity: NexusGenScalars['DateTime'] | null; // DateTime
+    name: string; // String!
+    notional: number; // Float!
+    purchaseDate: NexusGenScalars['DateTime']; // DateTime!
+    purchasePrice: number; // Float!
+    purchaseProceeds: number; // Float!
+    realizedSurplus: number; // Float!
+    salesProceeds: number; // Float!
+    spvId: string; // ID!
+    totalDiscount: number; // Float!
     type: NexusGenEnums['AssetType']; // AssetType!
   }
   FixedIncomeType: { // field return type
@@ -822,7 +811,7 @@ export interface NexusGenFieldTypes {
   GroupTransaction: { // field return type
     cashBalanceChange: number; // Float!
     cashTransaction: NexusGenRootTypes['BaseTransaction']; // BaseTransaction!
-    entryTime: NexusGenScalars['Date']; // Date!
+    entryTime: NexusGenScalars['DateTime']; // DateTime!
     fees: NexusGenRootTypes['TransactionFee'][] | null; // [TransactionFee!]
     fixedIncomeTransaction: NexusGenRootTypes['BaseTransaction'] | null; // BaseTransaction
     id: string; // ID!
@@ -944,29 +933,20 @@ export interface NexusGenFieldTypes {
     document: NexusGenRootTypes['IDocument'] | null; // IDocument
     documents: Array<NexusGenRootTypes['IDocument'] | null> | null; // [IDocument]
     drive: NexusGenRootTypes['DocumentDriveState'] | null; // DocumentDriveState
-    rwaPortfolios: Array<NexusGenRootTypes['RealWorldAssetsPortfolio'] | null> | null; // [RealWorldAssetsPortfolio]
+    rwaPortfolios: Array<NexusGenRootTypes['RealWorldAssets'] | null> | null; // [RealWorldAssets]
     system: NexusGenRootTypes['SwitchboardDrive'] | null; // SwitchboardDrive
   }
   RealWorldAssets: { // field return type
     created: NexusGenScalars['Date']; // Date!
     documentType: string; // String!
     id: string; // String!
+    initialState: NexusGenRootTypes['RealWorldAssetsState']; // RealWorldAssetsState!
     lastModified: NexusGenScalars['Date']; // Date!
     name: string; // String!
     operations: NexusGenRootTypes['DefaultOperation'][]; // [DefaultOperation!]!
     revision: number; // Int!
     state: NexusGenRootTypes['RealWorldAssetsState']; // RealWorldAssetsState!
   }
-  RealWorldAssetsPortfolio: { // field return type
-    accounts: NexusGenRootTypes['Account'][]; // [Account!]!
-    fixedIncomeTypes: NexusGenRootTypes['FixedIncomeType'][]; // [FixedIncomeType!]!
-    id: string; // ID!
-    portfolio: NexusGenRootTypes['Asset'][]; // [Asset!]!
-    principalLenderAccountId: string; // ID!
-    serviceProviderFeeTypes: NexusGenRootTypes['ServiceProviderFeeType'][]; // [ServiceProviderFeeType!]!
-    spvs: NexusGenRootTypes['Spv'][]; // [Spv!]!
-    transactions: NexusGenRootTypes['GroupTransaction'][]; // [GroupTransaction!]!
-  }
   RealWorldAssetsState: { // field return type
     accounts: NexusGenRootTypes['Account'][]; // [Account!]!
     fixedIncomeTypes: NexusGenRootTypes['FixedIncomeType'][]; // [FixedIncomeType!]!
@@ -1138,18 +1118,11 @@ export interface NexusGenFieldTypes {
     hash: string; // String!
     id: string | null; // String
     index: number; // Int!
+    inputText: string; // String!
+    skip: number; // Int!
     timestamp: NexusGenScalars['Date']; // Date!
     type: string; // String!
   }
-  IRealWorldAssetsState: { // field return type
-    accounts: NexusGenRootTypes['Account'][]; // [Account!]!
-    fixedIncomeTypes: NexusGenRootTypes['FixedIncomeType'][]; // [FixedIncomeType!]!
-    portfolio: NexusGenRootTypes['Asset'][]; // [Asset!]!
-    principalLenderAccountId: string; // ID!
-    serviceProviderFeeTypes: NexusGenRootTypes['ServiceProviderFeeType'][]; // [ServiceProviderFeeType!]!
-    spvs: NexusGenRootTypes['Spv'][]; // [Spv!]!
-    transactions: NexusGenRootTypes['GroupTransaction'][]; // [GroupTransaction!]!
-  }
   System: { // field return type
     auth: NexusGenRootTypes['Auth'] | null; // Auth
   }
@@ -1220,10 +1193,10 @@ export interface NexusGenFieldTypeNames {
     assetId: 'ID'
     assetType: 'AssetType'
     counterPartyAccountId: 'ID'
-    entryTime: 'Date'
+    entryTime: 'DateTime'
     id: 'ID'
-    settlementTime: 'Date'
-    tradeTime: 'Date'
+    settlementTime: 'DateTime'
+    tradeTime: 'DateTime'
   }
   BudgetStatement: { // field return type name
     created: 'Date'
@@ -1254,8 +1227,8 @@ export interface NexusGenFieldTypeNames {
     balance: 'Float'
     currency: 'String'
     id: 'ID'
-    spv: 'Spv'
     spvId: 'ID'
+    type: 'AssetType'
   }
   Challenge: { // field return type name
     hex: 'String'
@@ -1301,6 +1274,8 @@ export interface NexusGenFieldTypeNames {
     hash: 'String'
     id: 'String'
     index: 'Int'
+    inputText: 'String'
+    skip: 'Int'
     timestamp: 'Date'
     type: 'String'
   }
@@ -1316,19 +1291,16 @@ export interface NexusGenFieldTypeNames {
     ISIN: 'String'
     assetProceeds: 'Float'
     coupon: 'Float'
-    currentValue: 'Float'
-    fixedIncomeType: 'FixedIncomeType'
     fixedIncomeTypeId: 'ID'
     id: 'ID'
-    maturity: 'Date'
+    maturity: 'DateTime'
     name: 'String'
     notional: 'Float'
-    purchaseDate: 'Date'
+    purchaseDate: 'DateTime'
     purchasePrice: 'Float'
     purchaseProceeds: 'Float'
     realizedSurplus: 'Float'
     salesProceeds: 'Float'
-    spv: 'Spv'
     spvId: 'ID'
     totalDiscount: 'Float'
     type: 'AssetType'
@@ -1348,7 +1320,7 @@ export interface NexusGenFieldTypeNames {
   GroupTransaction: { // field return type name
     cashBalanceChange: 'Float'
     cashTransaction: 'BaseTransaction'
-    entryTime: 'Date'
+    entryTime: 'DateTime'
     fees: 'TransactionFee'
     fixedIncomeTransaction: 'BaseTransaction'
     id: 'ID'
@@ -1470,29 +1442,20 @@ export interface NexusGenFieldTypeNames {
     document: 'IDocument'
     documents: 'IDocument'
     drive: 'DocumentDriveState'
-    rwaPortfolios: 'RealWorldAssetsPortfolio'
+    rwaPortfolios: 'RealWorldAssets'
     system: 'SwitchboardDrive'
   }
   RealWorldAssets: { // field return type name
     created: 'Date'
     documentType: 'String'
     id: 'String'
+    initialState: 'RealWorldAssetsState'
     lastModified: 'Date'
     name: 'String'
     operations: 'DefaultOperation'
     revision: 'Int'
     state: 'RealWorldAssetsState'
   }
-  RealWorldAssetsPortfolio: { // field return type name
-    accounts: 'Account'
-    fixedIncomeTypes: 'FixedIncomeType'
-    id: 'ID'
-    portfolio: 'Asset'
-    principalLenderAccountId: 'ID'
-    serviceProviderFeeTypes: 'ServiceProviderFeeType'
-    spvs: 'Spv'
-    transactions: 'GroupTransaction'
-  }
   RealWorldAssetsState: { // field return type name
     accounts: 'Account'
     fixedIncomeTypes: 'FixedIncomeType'
@@ -1664,29 +1627,17 @@ export interface NexusGenFieldTypeNames {
     hash: 'String'
     id: 'String'
     index: 'Int'
+    inputText: 'String'
+    skip: 'Int'
     timestamp: 'Date'
     type: 'String'
   }
-  IRealWorldAssetsState: { // field return type name
-    accounts: 'Account'
-    fixedIncomeTypes: 'FixedIncomeType'
-    portfolio: 'Asset'
-    principalLenderAccountId: 'ID'
-    serviceProviderFeeTypes: 'ServiceProviderFeeType'
-    spvs: 'Spv'
-    transactions: 'GroupTransaction'
-  }
   System: { // field return type name
     auth: 'Auth'
   }
 }
 
 export interface NexusGenArgTypes {
-  FixedIncome: {
-    currentValue: { // args
-      date?: NexusGenScalars['Date'] | null; // Date
-    }
-  }
   Mutation: {
     acknowledge: { // args
       listenerId: string; // String!
@@ -1739,7 +1690,6 @@ export interface NexusGenAbstractTypeMembers {
   ElementComponents: "ArticleComponent" | "CoreComponent" | "ScopeComponent" | "SectionComponent" | "TypeSpecificationComponent"
   IDocument: "AccountSnapshot" | "BudgetStatement" | "DefaultDocument" | "RealWorldAssets" | "ScopeFramework"
   IOperation: "DefaultOperation"
-  IRealWorldAssetsState: "RealWorldAssetsPortfolio" | "RealWorldAssetsState"
   System: "SwitchboardDrive" | "SwitchboardHost"
 }
 
@@ -1749,8 +1699,6 @@ export interface NexusGenTypeInterfaces {
   DefaultDocument: "IDocument"
   DefaultOperation: "IOperation"
   RealWorldAssets: "IDocument"
-  RealWorldAssetsPortfolio: "IRealWorldAssetsState"
-  RealWorldAssetsState: "IRealWorldAssetsState"
   ScopeFramework: "IDocument"
   SwitchboardDrive: "System"
   SwitchboardHost: "System"
@@ -1770,7 +1718,7 @@ export type NexusGenUnionNames = keyof NexusGenUnions;
 
 export type NexusGenObjectsUsingAbstractStrategyIsTypeOf = never;
 
-export type NexusGenAbstractsUsingStrategyResolveType = "Asset" | "ElementComponents" | "IDocument" | "IOperation" | "IRealWorldAssetsState" | "System";
+export type NexusGenAbstractsUsingStrategyResolveType = "Asset" | "ElementComponents" | "IDocument" | "IOperation" | "System";
 
 export type NexusGenFeaturesConfig = {
   abstractTypeStrategies: {
diff --git a/api/src/graphql/server/generated/drive/schema.graphql b/api/src/graphql/server/generated/drive/schema.graphql
index 64984bc0..47cd7c35 100644
--- a/api/src/graphql/server/generated/drive/schema.graphql
+++ b/api/src/graphql/server/generated/drive/schema.graphql
@@ -93,10 +93,10 @@ type BaseTransaction {
   assetId: ID!
   assetType: AssetType!
   counterPartyAccountId: ID
-  entryTime: Date!
+  entryTime: DateTime!
   id: ID!
-  settlementTime: Date
-  tradeTime: Date
+  settlementTime: DateTime
+  tradeTime: DateTime
 }
 
 type BudgetStatement implements IDocument {
@@ -138,8 +138,8 @@ type Cash {
   balance: Float!
   currency: String!
   id: ID!
-  spv: Spv
-  spvId: ID
+  spvId: ID!
+  type: AssetType!
 }
 
 type Challenge {
@@ -181,6 +181,8 @@ type CoreUnit {
 """Date custom scalar type"""
 scalar Date
 
+scalar DateTime
+
 type DefaultDocument implements IDocument {
   created: Date!
   documentType: String!
@@ -195,6 +197,8 @@ type DefaultOperation implements IOperation {
   hash: String!
   id: String
   index: Int!
+  inputText: String!
+  skip: Int!
   timestamp: Date!
   type: String!
 }
@@ -212,23 +216,20 @@ union ElementComponents = ArticleComponent | CoreComponent | ScopeComponent | Se
 type FixedIncome {
   CUSIP: String
   ISIN: String
-  assetProceeds: Float
+  assetProceeds: Float!
   coupon: Float
-  currentValue(date: Date): Float
-  fixedIncomeType: FixedIncomeType
-  fixedIncomeTypeId: ID
-  id: ID
-  maturity: Date
-  name: String
-  notional: Float
-  purchaseDate: Date
-  purchasePrice: Float
-  purchaseProceeds: Float
-  realizedSurplus: Float
-  salesProceeds: Float
-  spv: Spv
-  spvId: ID
-  totalDiscount: Float
+  fixedIncomeTypeId: ID!
+  id: ID!
+  maturity: DateTime
+  name: String!
+  notional: Float!
+  purchaseDate: DateTime!
+  purchasePrice: Float!
+  purchaseProceeds: Float!
+  realizedSurplus: Float!
+  salesProceeds: Float!
+  spvId: ID!
+  totalDiscount: Float!
   type: AssetType!
 }
 
@@ -250,7 +251,7 @@ type FtesForecast {
 type GroupTransaction {
   cashBalanceChange: Float!
   cashTransaction: BaseTransaction!
-  entryTime: Date!
+  entryTime: DateTime!
   fees: [TransactionFee!]
   fixedIncomeTransaction: BaseTransaction
   id: ID!
@@ -285,20 +286,12 @@ interface IOperation {
   hash: String!
   id: String
   index: Int!
+  inputText: String!
+  skip: Int!
   timestamp: Date!
   type: String!
 }
 
-interface IRealWorldAssetsState {
-  accounts: [Account!]!
-  fixedIncomeTypes: [FixedIncomeType!]!
-  portfolio: [Asset!]!
-  principalLenderAccountId: ID!
-  serviceProviderFeeTypes: [ServiceProviderFeeType!]!
-  spvs: [Spv!]!
-  transactions: [GroupTransaction!]!
-}
-
 input InputListenerFilter {
   branch: [String]
   documentId: [String]
@@ -485,7 +478,7 @@ type Query {
   document(id: String!): IDocument
   documents: [IDocument]
   drive: DocumentDriveState
-  rwaPortfolios(id: String): [RealWorldAssetsPortfolio]
+  rwaPortfolios(id: String): [RealWorldAssets]
   system: SwitchboardDrive
 }
 
@@ -493,6 +486,7 @@ type RealWorldAssets implements IDocument {
   created: Date!
   documentType: String!
   id: String!
+  initialState: RealWorldAssetsState!
   lastModified: Date!
   name: String!
   operations: [DefaultOperation!]!
@@ -500,18 +494,7 @@ type RealWorldAssets implements IDocument {
   state: RealWorldAssetsState!
 }
 
-type RealWorldAssetsPortfolio implements IRealWorldAssetsState {
-  accounts: [Account!]!
-  fixedIncomeTypes: [FixedIncomeType!]!
-  id: ID!
-  portfolio: [Asset!]!
-  principalLenderAccountId: ID!
-  serviceProviderFeeTypes: [ServiceProviderFeeType!]!
-  spvs: [Spv!]!
-  transactions: [GroupTransaction!]!
-}
-
-type RealWorldAssetsState implements IRealWorldAssetsState {
+type RealWorldAssetsState {
   accounts: [Account!]!
   fixedIncomeTypes: [FixedIncomeType!]!
   portfolio: [Asset!]!