diff --git a/deployment/config/indexer/docker.mainnet.env b/deployment/config/indexer/docker.mainnet.env
index a87f94b7..05558287 100644
--- a/deployment/config/indexer/docker.mainnet.env
+++ b/deployment/config/indexer/docker.mainnet.env
@@ -19,8 +19,6 @@ PGPASSFILE="$(realpath secrets/.pgpass)"
 # as this command will gracefully fallback to PGPASSFILE if no password is specified
 # However, some dev tools like pgtyped & zapatos don't support .pgpass files
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-# Needed for PgTyped
-PGURI=$DATABASE_URL
 
 CARDANO_NODE_VERSION=8.1.2
 CARDANO_NODE_EXPOSED_PORT=3001
diff --git a/deployment/config/indexer/docker.preprod.env b/deployment/config/indexer/docker.preprod.env
index b02ba9fb..4ce85382 100644
--- a/deployment/config/indexer/docker.preprod.env
+++ b/deployment/config/indexer/docker.preprod.env
@@ -19,8 +19,6 @@ PGPASSFILE="$(realpath secrets/.pgpass)"
 # as this command will gracefully fallback to PGPASSFILE if no password is specified
 # However, some dev tools like pgtyped & zapatos don't support .pgpass files
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-# Needed for PgTyped
-PGURI=$DATABASE_URL
 
 CARDANO_NODE_VERSION=8.1.2
 CARDANO_NODE_EXPOSED_PORT=3001
diff --git a/deployment/config/indexer/docker.preview.env b/deployment/config/indexer/docker.preview.env
index 80ae2a13..9e072019 100644
--- a/deployment/config/indexer/docker.preview.env
+++ b/deployment/config/indexer/docker.preview.env
@@ -19,8 +19,6 @@ PGPASSFILE="$(realpath secrets/.pgpass)"
 # as this command will gracefully fallback to PGPASSFILE if no password is specified
 # However, some dev tools like pgtyped & zapatos don't support .pgpass files
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-# Needed for PgTyped
-PGURI=$DATABASE_URL
 
 CARDANO_NODE_VERSION=8.1.2
 CARDANO_NODE_EXPOSED_PORT=3001
diff --git a/docs/bin/openapi.json b/docs/bin/openapi.json
index c76147f5..0b016801 100644
--- a/docs/bin/openapi.json
+++ b/docs/bin/openapi.json
@@ -443,8 +443,7 @@
                             "format": "double"
                         },
                         "txId": {
-                            "type": "string",
-                            "nullable": true
+                            "type": "string"
                         },
                         "pool": {
                             "allOf": [
@@ -874,18 +873,12 @@
                         },
                         "plutusDatum": {
                             "type": "string",
-                            "nullable": true,
                             "description": "Projected NFT datum: serialized state of the Projected NFT",
                             "example": "d8799fd8799f581c9040f057461d9adc09108fe5cb630077cf75c6e981d3ed91f6fb18f6ffd87980ff",
                             "pattern": "[0-9a-fA-F]+"
                         },
                         "status": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/components/schemas/ProjectedNftStatus"
-                                }
-                            ],
-                            "nullable": true,
+                            "$ref": "#/components/schemas/ProjectedNftStatus",
                             "description": "Projected NFT status: Lock / Unlocking / Claim / Invalid",
                             "example": "Lock"
                         },
@@ -929,7 +922,6 @@
                         },
                         "actionTxId": {
                             "type": "string",
-                            "nullable": true,
                             "description": "Transaction id of related Projected NFT event",
                             "example": "28eb069e3e8c13831d431e3b2e35f58525493ab2d77fde83184993e4aa7a0eda",
                             "pattern": "[0-9a-fA-F]{64}"
diff --git a/docs/docs/indexer/docker.md b/docs/docs/indexer/docker.md
index 1b26794b..d1a32623 100644
--- a/docs/docs/indexer/docker.md
+++ b/docs/docs/indexer/docker.md
@@ -62,8 +62,6 @@ PGPASSFILE="$(realpath secrets/.pgpass)"
 # as this command will gracefully fallback to PGPASSFILE if no password is specified
 # However, some dev tools like pgtyped & zapatos don't support .pgpass files
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-# Needed for PgTyped
-PGURI=$DATABASE_URL
 ```
 
 Please set `NETWORK`, `CONFIG_FILE` and postgres variables carefully. `CONFIG_FILE` should be located in `deployment/config/indexer` folder. You can use `CARP_CONFIG` env variable instead of `CONFIG_FILE` if you want to use just env variables for configuration.
diff --git a/docs/docs/indexer/run.md b/docs/docs/indexer/run.md
index 8e8c6242..30f0cb49 100644
--- a/docs/docs/indexer/run.md
+++ b/docs/docs/indexer/run.md
@@ -169,8 +169,6 @@ PGPASSFILE="$(realpath secrets/.pgpass)"
 # as this command will gracefully fallback to PGPASSFILE if no password is specified
 # However, some dev tools like pgtyped & zapatos don't support .pgpass files
 DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-# Needed for PgTyped
-PGURI=$DATABASE_URL
 ```
 
 Variables related to postgres are described above in `Setting up the database` section.
diff --git a/indexer/tasks/src/multiera/multiera_projected_nft.rs b/indexer/tasks/src/multiera/multiera_projected_nft.rs
index 32f07207..4f5b363e 100644
--- a/indexer/tasks/src/multiera/multiera_projected_nft.rs
+++ b/indexer/tasks/src/multiera/multiera_projected_nft.rs
@@ -88,7 +88,7 @@ impl TryFrom<i32> for ProjectedNftOperation {
             3 => Ok(ProjectedNftOperation::ParseError),
             4 => Ok(ProjectedNftOperation::NoDatum),
             5 => Ok(ProjectedNftOperation::NotInlineDatum),
-            _ => Err("can't parse projeced nft operation".to_string()),
+            _ => Err("can't parse projected nft operation".to_string()),
         }
     }
 }
@@ -565,7 +565,7 @@ impl AssetData {
 
 #[derive(Debug, Clone, Default)]
 struct ProjectedNftData {
-    pub previous_utxo_tx_hash: Vec<u8>,
+    pub previous_utxo_tx_hash: Vec<u8>, // warning: this isn't nullable, but can be an empty vector to represent null
     pub previous_utxo_tx_output_index: Option<i64>,
     pub address: Vec<u8>,
     pub plutus_data: Vec<u8>,
diff --git a/webserver/server/app/controllers/DelegationForPoolController.ts b/webserver/server/app/controllers/DelegationForPoolController.ts
index 3419dbcf..8a1074c2 100644
--- a/webserver/server/app/controllers/DelegationForPoolController.ts
+++ b/webserver/server/app/controllers/DelegationForPoolController.ts
@@ -55,9 +55,9 @@ export class DelegationForPoolController extends Controller {
       });
 
       return data.map(data => ({
-        credential: data.credential as string,
+        credential: data.credential,
         pool: data.pool,
-        txId: data.tx_id as string,
+        txId: data.tx_id,
         slot: data.slot,
       }));
     });
diff --git a/webserver/server/app/controllers/ProjectedNftRangeController.ts b/webserver/server/app/controllers/ProjectedNftRangeController.ts
index 11f77367..fe9a4681 100644
--- a/webserver/server/app/controllers/ProjectedNftRangeController.ts
+++ b/webserver/server/app/controllers/ProjectedNftRangeController.ts
@@ -76,7 +76,7 @@ export class ProjectedNftRangeController extends Controller {
                 policyId: data.policy_id,
                 assetName: data.asset_name,
                 amount: data.amount,
-                status: data.status as ProjectedNftStatus | null,
+                status: data.status as ProjectedNftStatus,
                 plutusDatum: data.plutus_datum,
                 actionSlot: data.action_slot,
                 forHowLong: data.for_how_long,
@@ -108,7 +108,7 @@ export class ProjectedNftRangeController extends Controller {
                 policyId: data.policy_id,
                 assetName: data.asset_name,
                 amount: data.amount,
-                status: data.status as ProjectedNftStatus | null,
+                status: data.status as ProjectedNftStatus,
                 plutusDatum: data.plutus_datum,
                 actionSlot: data.action_slot,
                 forHowLong: data.for_how_long,
diff --git a/webserver/server/app/models/address/sqlAddressUsed.queries.ts b/webserver/server/app/models/address/sqlAddressUsed.queries.ts
index 3629feb6..47ffc76a 100644
--- a/webserver/server/app/models/address/sqlAddressUsed.queries.ts
+++ b/webserver/server/app/models/address/sqlAddressUsed.queries.ts
@@ -1,13 +1,15 @@
 /** Types generated for queries found in "app/models/address/sqlAddressUsed.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlAddressUsed' parameters type */
 export interface ISqlAddressUsedParams {
-  addresses: BufferArray | null | void;
-  after_tx_id: string | null | void;
-  until_tx_id: string | null | void;
+  addresses?: BufferArray | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlAddressUsed' return type */
diff --git a/webserver/server/app/models/address/sqlCredentialUsed.queries.ts b/webserver/server/app/models/address/sqlCredentialUsed.queries.ts
index e5523ce1..732bf941 100644
--- a/webserver/server/app/models/address/sqlCredentialUsed.queries.ts
+++ b/webserver/server/app/models/address/sqlCredentialUsed.queries.ts
@@ -1,13 +1,15 @@
 /** Types generated for queries found in "app/models/address/sqlCredentialUsed.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlCredentialUsed' parameters type */
 export interface ISqlCredentialUsedParams {
-  after_tx_id: string | null | void;
-  credentials: BufferArray | null | void;
-  until_tx_id: string | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  credentials?: BufferArray | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlCredentialUsed' return type */
diff --git a/webserver/server/app/models/asset/assetUtxos.queries.ts b/webserver/server/app/models/asset/assetUtxos.queries.ts
index 6e521290..6ef27732 100644
--- a/webserver/server/app/models/asset/assetUtxos.queries.ts
+++ b/webserver/server/app/models/asset/assetUtxos.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/asset/assetUtxos.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'AssetUtxos' parameters type */
 export interface IAssetUtxosParams {
diff --git a/webserver/server/app/models/block/sqlBlockLatest.queries.ts b/webserver/server/app/models/block/sqlBlockLatest.queries.ts
index 7ca38d71..b072f9b9 100644
--- a/webserver/server/app/models/block/sqlBlockLatest.queries.ts
+++ b/webserver/server/app/models/block/sqlBlockLatest.queries.ts
@@ -1,9 +1,11 @@
 /** Types generated for queries found in "app/models/block/sqlBlockLatest.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
+
+export type NumberOrString = number | string;
 
 /** 'SqlBlockLatest' parameters type */
 export interface ISqlBlockLatestParams {
-  offset: string | null | void;
+  offset?: NumberOrString | null | void;
 }
 
 /** 'SqlBlockLatest' return type */
diff --git a/webserver/server/app/models/credentials/sqlCredentialAddresses.queries.ts b/webserver/server/app/models/credentials/sqlCredentialAddresses.queries.ts
index 82910fb8..effe447f 100644
--- a/webserver/server/app/models/credentials/sqlCredentialAddresses.queries.ts
+++ b/webserver/server/app/models/credentials/sqlCredentialAddresses.queries.ts
@@ -1,15 +1,17 @@
 /** Types generated for queries found in "app/models/credentials/sqlCredentialAddresses.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlCredentialAddresses' parameters type */
 export interface ISqlCredentialAddressesParams {
-  after_address: Buffer | null | void;
-  credentials: BufferArray | null | void;
-  double_limit: string | null | void;
-  limit: string | null | void;
-  until_tx_id: string | null | void;
+  after_address?: Buffer | null | void;
+  credentials?: BufferArray | null | void;
+  double_limit?: NumberOrString | null | void;
+  limit?: NumberOrString | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlCredentialAddresses' return type */
diff --git a/webserver/server/app/models/delegation/delegationForAddress.queries.ts b/webserver/server/app/models/delegation/delegationForAddress.queries.ts
index be551288..a14d5e4c 100644
--- a/webserver/server/app/models/delegation/delegationForAddress.queries.ts
+++ b/webserver/server/app/models/delegation/delegationForAddress.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/delegation/delegationForAddress.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlStakeDelegationForAddress' parameters type */
 export interface ISqlStakeDelegationForAddressParams {
@@ -9,8 +9,8 @@ export interface ISqlStakeDelegationForAddressParams {
 
 /** 'SqlStakeDelegationForAddress' return type */
 export interface ISqlStakeDelegationForAddressResult {
-  pool: string | null;
-  tx_id: string | null;
+  pool: string;
+  tx_id: string;
 }
 
 /** 'SqlStakeDelegationForAddress' query type */
@@ -19,12 +19,12 @@ export interface ISqlStakeDelegationForAddressQuery {
   result: ISqlStakeDelegationForAddressResult;
 }
 
-const sqlStakeDelegationForAddressIR: any = {"usedParamSet":{"credential":true,"slot":true},"params":[{"name":"credential","required":true,"transform":{"type":"scalar"},"locs":[{"a":371,"b":382}]},{"name":"slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":405,"b":410}]}],"statement":"SELECT encode(pool_credential, 'hex') as pool, encode(\"Transaction\".hash, 'hex') as tx_id\nFROM \"StakeDelegationCredentialRelation\"\nJOIN \"StakeCredential\" ON stake_credential = \"StakeCredential\".id\nJOIN \"Transaction\" ON \"Transaction\".id = \"StakeDelegationCredentialRelation\".tx_id\nJOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE \n\t\"StakeCredential\".credential = :credential! AND\n\t\"Block\".slot <= :slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) DESC\nLIMIT 1"};
+const sqlStakeDelegationForAddressIR: any = {"usedParamSet":{"credential":true,"slot":true},"params":[{"name":"credential","required":true,"transform":{"type":"scalar"},"locs":[{"a":377,"b":388}]},{"name":"slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":411,"b":416}]}],"statement":"SELECT encode(pool_credential, 'hex') as \"pool!\", encode(\"Transaction\".hash, 'hex') as \"tx_id!\"\nFROM \"StakeDelegationCredentialRelation\"\nJOIN \"StakeCredential\" ON stake_credential = \"StakeCredential\".id\nJOIN \"Transaction\" ON \"Transaction\".id = \"StakeDelegationCredentialRelation\".tx_id\nJOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE \n\t\"StakeCredential\".credential = :credential! AND\n\t\"Block\".slot <= :slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) DESC\nLIMIT 1"};
 
 /**
  * Query generated from SQL:
  * ```
- * SELECT encode(pool_credential, 'hex') as pool, encode("Transaction".hash, 'hex') as tx_id
+ * SELECT encode(pool_credential, 'hex') as "pool!", encode("Transaction".hash, 'hex') as "tx_id!"
  * FROM "StakeDelegationCredentialRelation"
  * JOIN "StakeCredential" ON stake_credential = "StakeCredential".id
  * JOIN "Transaction" ON "Transaction".id = "StakeDelegationCredentialRelation".tx_id
diff --git a/webserver/server/app/models/delegation/delegationForAddress.sql b/webserver/server/app/models/delegation/delegationForAddress.sql
index 3be67195..c2129529 100644
--- a/webserver/server/app/models/delegation/delegationForAddress.sql
+++ b/webserver/server/app/models/delegation/delegationForAddress.sql
@@ -1,5 +1,5 @@
 /* @name sqlStakeDelegationForAddress */
-SELECT encode(pool_credential, 'hex') as pool, encode("Transaction".hash, 'hex') as tx_id
+SELECT encode(pool_credential, 'hex') as "pool!", encode("Transaction".hash, 'hex') as "tx_id!"
 FROM "StakeDelegationCredentialRelation"
 JOIN "StakeCredential" ON stake_credential = "StakeCredential".id
 JOIN "Transaction" ON "Transaction".id = "StakeDelegationCredentialRelation".tx_id
diff --git a/webserver/server/app/models/delegation/delegationsForPool.queries.ts b/webserver/server/app/models/delegation/delegationsForPool.queries.ts
index 45e1d7c4..bbe2d7dc 100644
--- a/webserver/server/app/models/delegation/delegationsForPool.queries.ts
+++ b/webserver/server/app/models/delegation/delegationsForPool.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/delegation/delegationsForPool.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlStakeDelegationByPool' parameters type */
 export interface ISqlStakeDelegationByPoolParams {
@@ -10,10 +10,10 @@ export interface ISqlStakeDelegationByPoolParams {
 
 /** 'SqlStakeDelegationByPool' return type */
 export interface ISqlStakeDelegationByPoolResult {
-  credential: string | null;
+  credential: string;
   pool: string | null;
   slot: number;
-  tx_id: string | null;
+  tx_id: string;
 }
 
 /** 'SqlStakeDelegationByPool' query type */
@@ -22,16 +22,19 @@ export interface ISqlStakeDelegationByPoolQuery {
   result: ISqlStakeDelegationByPoolResult;
 }
 
-const sqlStakeDelegationByPoolIR: any = {"usedParamSet":{"pools":true,"min_slot":true,"max_slot":true},"params":[{"name":"pools","required":true,"transform":{"type":"array_spread"},"locs":[{"a":176,"b":182},{"a":590,"b":596},{"a":657,"b":663}]},{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":688,"b":697}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":720,"b":729}]}],"statement":"SELECT \n\tencode(credential, 'hex') as credential,\n\tencode(\"Transaction\".hash, 'hex') as tx_id,\n\t\"Block\".slot,\n\tCASE WHEN \"StakeDelegationCredentialRelation\".pool_credential IN :pools! THEN encode(\"StakeDelegationCredentialRelation\".pool_credential, 'hex') ELSE NULL END AS pool\nFROM \"StakeDelegationCredentialRelation\"\nJOIN \"StakeCredential\" ON stake_credential = \"StakeCredential\".id\nJOIN \"Transaction\" ON \"Transaction\".id = \"StakeDelegationCredentialRelation\".tx_id\nJOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE \n    (\n\t\t\"StakeDelegationCredentialRelation\".pool_credential IN :pools! OR\n\t \t\"StakeDelegationCredentialRelation\".previous_pool IN :pools!\n\t) AND\n\t\"Block\".slot > :min_slot! AND\n\t\"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
+const sqlStakeDelegationByPoolIR: any = {"usedParamSet":{"pools":true,"min_slot":true,"max_slot":true},"params":[{"name":"pools","required":true,"transform":{"type":"array_spread"},"locs":[{"a":182,"b":188},{"a":604,"b":610},{"a":671,"b":677}]},{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":702,"b":711}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":734,"b":743}]}],"statement":"SELECT \n\tencode(credential, 'hex') as \"credential!\",\n\tencode(\"Transaction\".hash, 'hex') as \"tx_id!\",\n\t\"Block\".slot,\n\tCASE WHEN \"StakeDelegationCredentialRelation\".pool_credential IN :pools! \n\t\tTHEN encode(\"StakeDelegationCredentialRelation\".pool_credential, 'hex') \n\t\tELSE NULL\n\t\tEND AS pool\nFROM \"StakeDelegationCredentialRelation\"\nJOIN \"StakeCredential\" ON stake_credential = \"StakeCredential\".id\nJOIN \"Transaction\" ON \"Transaction\".id = \"StakeDelegationCredentialRelation\".tx_id\nJOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE \n    (\n\t\t\"StakeDelegationCredentialRelation\".pool_credential IN :pools! OR\n\t \t\"StakeDelegationCredentialRelation\".previous_pool IN :pools!\n\t) AND\n\t\"Block\".slot > :min_slot! AND\n\t\"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
 
 /**
  * Query generated from SQL:
  * ```
  * SELECT 
- * 	encode(credential, 'hex') as credential,
- * 	encode("Transaction".hash, 'hex') as tx_id,
+ * 	encode(credential, 'hex') as "credential!",
+ * 	encode("Transaction".hash, 'hex') as "tx_id!",
  * 	"Block".slot,
- * 	CASE WHEN "StakeDelegationCredentialRelation".pool_credential IN :pools! THEN encode("StakeDelegationCredentialRelation".pool_credential, 'hex') ELSE NULL END AS pool
+ * 	CASE WHEN "StakeDelegationCredentialRelation".pool_credential IN :pools! 
+ * 		THEN encode("StakeDelegationCredentialRelation".pool_credential, 'hex') 
+ * 		ELSE NULL
+ * 		END AS pool
  * FROM "StakeDelegationCredentialRelation"
  * JOIN "StakeCredential" ON stake_credential = "StakeCredential".id
  * JOIN "Transaction" ON "Transaction".id = "StakeDelegationCredentialRelation".tx_id
diff --git a/webserver/server/app/models/delegation/delegationsForPool.sql b/webserver/server/app/models/delegation/delegationsForPool.sql
index 2e9379c1..0ddebaa8 100644
--- a/webserver/server/app/models/delegation/delegationsForPool.sql
+++ b/webserver/server/app/models/delegation/delegationsForPool.sql
@@ -3,10 +3,13 @@
 @param pools -> (...)
 */
 SELECT 
-	encode(credential, 'hex') as credential,
-	encode("Transaction".hash, 'hex') as tx_id,
+	encode(credential, 'hex') as "credential!",
+	encode("Transaction".hash, 'hex') as "tx_id!",
 	"Block".slot,
-	CASE WHEN "StakeDelegationCredentialRelation".pool_credential IN :pools! THEN encode("StakeDelegationCredentialRelation".pool_credential, 'hex') ELSE NULL END AS pool
+	CASE WHEN "StakeDelegationCredentialRelation".pool_credential IN :pools! 
+		THEN encode("StakeDelegationCredentialRelation".pool_credential, 'hex') 
+		ELSE NULL
+		END AS pool
 FROM "StakeDelegationCredentialRelation"
 JOIN "StakeCredential" ON stake_credential = "StakeCredential".id
 JOIN "Transaction" ON "Transaction".id = "StakeDelegationCredentialRelation".tx_id
diff --git a/webserver/server/app/models/dex/sqlDexLastPrice.queries.ts b/webserver/server/app/models/dex/sqlDexLastPrice.queries.ts
index f1a24f81..8edbe235 100644
--- a/webserver/server/app/models/dex/sqlDexLastPrice.queries.ts
+++ b/webserver/server/app/models/dex/sqlDexLastPrice.queries.ts
@@ -1,16 +1,18 @@
 /** Types generated for queries found in "app/models/dex/sqlDexLastPrice.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlDexLastPrice' parameters type */
 export interface ISqlDexLastPriceParams {
-  asset_name1: BufferArray | null | void;
-  asset_name2: BufferArray | null | void;
-  operation1: string | null | void;
-  operation2: string | null | void;
-  policy_id1: BufferArray | null | void;
-  policy_id2: BufferArray | null | void;
+  asset_name1?: BufferArray | null | void;
+  asset_name2?: BufferArray | null | void;
+  operation1?: NumberOrString | null | void;
+  operation2?: NumberOrString | null | void;
+  policy_id1?: BufferArray | null | void;
+  policy_id2?: BufferArray | null | void;
 }
 
 /** 'SqlDexLastPrice' return type */
diff --git a/webserver/server/app/models/dex/sqlDexMeanPrice.queries.ts b/webserver/server/app/models/dex/sqlDexMeanPrice.queries.ts
index 9d801055..570ef579 100644
--- a/webserver/server/app/models/dex/sqlDexMeanPrice.queries.ts
+++ b/webserver/server/app/models/dex/sqlDexMeanPrice.queries.ts
@@ -1,20 +1,22 @@
 /** Types generated for queries found in "app/models/dex/sqlDexMeanPrice.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
-export type stringArray = (string)[];
+export type NumberOrString = number | string;
+
+export type NumberOrStringArray = (NumberOrString)[];
 
 /** 'SqlDexMeanPrice' parameters type */
 export interface ISqlDexMeanPriceParams {
-  after_tx_id: string | null | void;
-  asset_name1: BufferArray | null | void;
-  asset_name2: BufferArray | null | void;
-  dexes: stringArray | null | void;
-  limit: string | null | void;
-  policy_id1: BufferArray | null | void;
-  policy_id2: BufferArray | null | void;
-  until_tx_id: string | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  asset_name1?: BufferArray | null | void;
+  asset_name2?: BufferArray | null | void;
+  dexes?: NumberOrStringArray | null | void;
+  limit?: NumberOrString | null | void;
+  policy_id1?: BufferArray | null | void;
+  policy_id2?: BufferArray | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlDexMeanPrice' return type */
diff --git a/webserver/server/app/models/dex/sqlDexSwap.queries.ts b/webserver/server/app/models/dex/sqlDexSwap.queries.ts
index 3ae3526f..9e45ffaa 100644
--- a/webserver/server/app/models/dex/sqlDexSwap.queries.ts
+++ b/webserver/server/app/models/dex/sqlDexSwap.queries.ts
@@ -1,20 +1,22 @@
 /** Types generated for queries found in "app/models/dex/sqlDexSwap.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
-export type stringArray = (string)[];
+export type NumberOrString = number | string;
+
+export type NumberOrStringArray = (NumberOrString)[];
 
 /** 'SqlDexSwap' parameters type */
 export interface ISqlDexSwapParams {
-  after_tx_id: string | null | void;
-  asset_name1: BufferArray | null | void;
-  asset_name2: BufferArray | null | void;
-  dexes: stringArray | null | void;
-  limit: string | null | void;
-  policy_id1: BufferArray | null | void;
-  policy_id2: BufferArray | null | void;
-  until_tx_id: string | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  asset_name1?: BufferArray | null | void;
+  asset_name2?: BufferArray | null | void;
+  dexes?: NumberOrStringArray | null | void;
+  limit?: NumberOrString | null | void;
+  policy_id1?: BufferArray | null | void;
+  policy_id2?: BufferArray | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlDexSwap' return type */
diff --git a/webserver/server/app/models/metadata/sqlMetadataNft.queries.ts b/webserver/server/app/models/metadata/sqlMetadataNft.queries.ts
index dd63d3b5..8c793fec 100644
--- a/webserver/server/app/models/metadata/sqlMetadataNft.queries.ts
+++ b/webserver/server/app/models/metadata/sqlMetadataNft.queries.ts
@@ -1,12 +1,12 @@
 /** Types generated for queries found in "app/models/metadata/sqlMetadataNft.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
 /** 'SqlMetadataNft' parameters type */
 export interface ISqlMetadataNftParams {
-  asset_name: BufferArray | null | void;
-  policy_id: BufferArray | null | void;
+  asset_name?: BufferArray | null | void;
+  policy_id?: BufferArray | null | void;
 }
 
 /** 'SqlMetadataNft' return type */
diff --git a/webserver/server/app/models/pagination/pageStartByHash.queries.ts b/webserver/server/app/models/pagination/pageStartByHash.queries.ts
index eac3dc98..9b2b0d12 100644
--- a/webserver/server/app/models/pagination/pageStartByHash.queries.ts
+++ b/webserver/server/app/models/pagination/pageStartByHash.queries.ts
@@ -1,10 +1,10 @@
 /** Types generated for queries found in "app/models/pagination/pageStartByHash.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'PageStartByHash' parameters type */
 export interface IPageStartByHashParams {
-  after_block: Buffer | null | void;
-  after_tx: Buffer | null | void;
+  after_block?: Buffer | null | void;
+  after_tx?: Buffer | null | void;
 }
 
 /** 'PageStartByHash' return type */
diff --git a/webserver/server/app/models/pagination/sqlBlockByHash.queries.ts b/webserver/server/app/models/pagination/sqlBlockByHash.queries.ts
index ead69258..47650b9f 100644
--- a/webserver/server/app/models/pagination/sqlBlockByHash.queries.ts
+++ b/webserver/server/app/models/pagination/sqlBlockByHash.queries.ts
@@ -1,9 +1,9 @@
 /** Types generated for queries found in "app/models/pagination/sqlBlockByHash.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlBlockByHash' parameters type */
 export interface ISqlBlockByHashParams {
-  until_block: Buffer | null | void;
+  until_block?: Buffer | null | void;
 }
 
 /** 'SqlBlockByHash' return type */
diff --git a/webserver/server/app/models/pagination/sqlTransactionBeforeBlock.queries.ts b/webserver/server/app/models/pagination/sqlTransactionBeforeBlock.queries.ts
index 5a33cb11..60f7884b 100644
--- a/webserver/server/app/models/pagination/sqlTransactionBeforeBlock.queries.ts
+++ b/webserver/server/app/models/pagination/sqlTransactionBeforeBlock.queries.ts
@@ -1,9 +1,9 @@
 /** Types generated for queries found in "app/models/pagination/sqlTransactionBeforeBlock.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlTransactionBeforeBlock' parameters type */
 export interface ISqlTransactionBeforeBlockParams {
-  until_block: Buffer | null | void;
+  until_block?: Buffer | null | void;
 }
 
 /** 'SqlTransactionBeforeBlock' return type */
diff --git a/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts b/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts
index 07cc2489..ca38b083 100644
--- a/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts
+++ b/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/projected_nft/projectedNftRange.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlProjectedNftRange' parameters type */
 export interface ISqlProjectedNftRangeParams {
@@ -11,16 +11,16 @@ export interface ISqlProjectedNftRangeParams {
 export interface ISqlProjectedNftRangeResult {
   action_output_index: number | null;
   action_slot: number;
-  action_tx_id: string | null;
+  action_tx_id: string;
   amount: string;
   asset_name: string;
   for_how_long: string | null;
   owner_address: string | null;
-  plutus_datum: string | null;
+  plutus_datum: string;
   policy_id: string;
   previous_tx_hash: string | null;
   previous_tx_output_index: string | null;
-  status: string | null;
+  status: string;
 }
 
 /** 'SqlProjectedNftRange' query type */
@@ -29,7 +29,7 @@ export interface ISqlProjectedNftRangeQuery {
   result: ISqlProjectedNftRangeResult;
 }
 
-const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":true},"params":[{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1219,"b":1228}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1254,"b":1263}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as owner_address,\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    CASE\n        WHEN \"TransactionOutput\".output_index = NULL THEN NULL\n        ELSE \"TransactionOutput\".output_index\n        END AS action_output_index,\n\n    encode(\"Transaction\".hash, 'hex') as action_tx_id,\n\n    \"ProjectedNFT\".policy_id as policy_id,\n    \"ProjectedNFT\".asset_name as asset_name,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS status,\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as plutus_datum,\n    \"ProjectedNFT\".for_how_long as for_how_long,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
+const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":true},"params":[{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1228,"b":1237}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1263,"b":1272}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as owner_address,\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    CASE\n        WHEN \"TransactionOutput\".output_index = NULL THEN NULL\n        ELSE \"TransactionOutput\".output_index\n        END AS action_output_index,\n\n    encode(\"Transaction\".hash, 'hex') as \"action_tx_id!\",\n\n    \"ProjectedNFT\".policy_id as policy_id,\n    \"ProjectedNFT\".asset_name as asset_name,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS \"status!\",\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as \"plutus_datum!\",\n    \"ProjectedNFT\".for_how_long as for_how_long,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
 
 /**
  * Query generated from SQL:
@@ -45,7 +45,7 @@ const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":
  *         ELSE "TransactionOutput".output_index
  *         END AS action_output_index,
  * 
- *     encode("Transaction".hash, 'hex') as action_tx_id,
+ *     encode("Transaction".hash, 'hex') as "action_tx_id!",
  * 
  *     "ProjectedNFT".policy_id as policy_id,
  *     "ProjectedNFT".asset_name as asset_name,
@@ -56,9 +56,9 @@ const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":
  *         WHEN "ProjectedNFT".operation = 1 THEN 'Unlocking'
  *         WHEN "ProjectedNFT".operation = 2 THEN 'Claim'
  *         ELSE 'Invalid'
- *         END AS status,
+ *         END AS "status!",
  * 
- *     encode("ProjectedNFT".plutus_datum, 'hex') as plutus_datum,
+ *     encode("ProjectedNFT".plutus_datum, 'hex') as "plutus_datum!",
  *     "ProjectedNFT".for_how_long as for_how_long,
  * 
  *     "Block".slot as action_slot
diff --git a/webserver/server/app/models/projected_nft/projectedNftRange.sql b/webserver/server/app/models/projected_nft/projectedNftRange.sql
index df00dc11..d8e96be4 100644
--- a/webserver/server/app/models/projected_nft/projectedNftRange.sql
+++ b/webserver/server/app/models/projected_nft/projectedNftRange.sql
@@ -12,7 +12,7 @@ SELECT
         ELSE "TransactionOutput".output_index
         END AS action_output_index,
 
-    encode("Transaction".hash, 'hex') as action_tx_id,
+    encode("Transaction".hash, 'hex') as "action_tx_id!",
 
     "ProjectedNFT".policy_id as policy_id,
     "ProjectedNFT".asset_name as asset_name,
@@ -23,9 +23,9 @@ SELECT
         WHEN "ProjectedNFT".operation = 1 THEN 'Unlocking'
         WHEN "ProjectedNFT".operation = 2 THEN 'Claim'
         ELSE 'Invalid'
-        END AS status,
+        END AS "status!",
 
-    encode("ProjectedNFT".plutus_datum, 'hex') as plutus_datum,
+    encode("ProjectedNFT".plutus_datum, 'hex') as "plutus_datum!",
     "ProjectedNFT".for_how_long as for_how_long,
 
     "Block".slot as action_slot
diff --git a/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.queries.ts b/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.queries.ts
index 15ed1558..3a438c8e 100644
--- a/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.queries.ts
+++ b/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/projected_nft/projectedNftRangeByAddress.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 /** 'SqlProjectedNftRangeByAddress' parameters type */
 export interface ISqlProjectedNftRangeByAddressParams {
@@ -12,16 +12,16 @@ export interface ISqlProjectedNftRangeByAddressParams {
 export interface ISqlProjectedNftRangeByAddressResult {
   action_output_index: number | null;
   action_slot: number;
-  action_tx_id: string | null;
+  action_tx_id: string;
   amount: string;
   asset_name: string;
   for_how_long: string | null;
-  owner_address: string | null;
-  plutus_datum: string | null;
+  owner_address: string;
+  plutus_datum: string;
   policy_id: string;
   previous_tx_hash: string | null;
   previous_tx_output_index: string | null;
-  status: string | null;
+  status: string;
 }
 
 /** 'SqlProjectedNftRangeByAddress' query type */
@@ -30,13 +30,13 @@ export interface ISqlProjectedNftRangeByAddressQuery {
   result: ISqlProjectedNftRangeByAddressResult;
 }
 
-const sqlProjectedNftRangeByAddressIR: any = {"usedParamSet":{"owner_address":true,"min_slot":true,"max_slot":true},"params":[{"name":"owner_address","required":true,"transform":{"type":"scalar"},"locs":[{"a":1250,"b":1264}]},{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1289,"b":1298}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1324,"b":1333}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as owner_address,\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    CASE\n        WHEN \"TransactionOutput\".output_index = NULL THEN NULL\n        ELSE \"TransactionOutput\".output_index\n        END AS action_output_index,\n\n    encode(\"Transaction\".hash, 'hex') as action_tx_id,\n\n    \"ProjectedNFT\".policy_id as policy_id,\n    \"ProjectedNFT\".asset_name as asset_name,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS status,\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as plutus_datum,\n    \"ProjectedNFT\".for_how_long as for_how_long,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        encode(\"ProjectedNFT\".owner_address, 'hex') = :owner_address!\n    AND \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
+const sqlProjectedNftRangeByAddressIR: any = {"usedParamSet":{"owner_address":true,"min_slot":true,"max_slot":true},"params":[{"name":"owner_address","required":true,"transform":{"type":"scalar"},"locs":[{"a":1262,"b":1276}]},{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1301,"b":1310}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1336,"b":1345}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as \"owner_address!\",\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    CASE\n        WHEN \"TransactionOutput\".output_index = NULL THEN NULL\n        ELSE \"TransactionOutput\".output_index\n        END AS action_output_index,\n\n    encode(\"Transaction\".hash, 'hex') as \"action_tx_id!\",\n\n    \"ProjectedNFT\".policy_id as policy_id,\n    \"ProjectedNFT\".asset_name as asset_name,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS \"status!\",\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as \"plutus_datum!\",\n    \"ProjectedNFT\".for_how_long as for_how_long,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        encode(\"ProjectedNFT\".owner_address, 'hex') = :owner_address!\n    AND \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
 
 /**
  * Query generated from SQL:
  * ```
  * SELECT
- *     encode("ProjectedNFT".owner_address, 'hex') as owner_address,
+ *     encode("ProjectedNFT".owner_address, 'hex') as "owner_address!",
  * 
  *     encode("ProjectedNFT".previous_utxo_tx_hash, 'hex') as previous_tx_hash,
  *     "ProjectedNFT".previous_utxo_tx_output_index as previous_tx_output_index,
@@ -46,7 +46,7 @@ const sqlProjectedNftRangeByAddressIR: any = {"usedParamSet":{"owner_address":tr
  *         ELSE "TransactionOutput".output_index
  *         END AS action_output_index,
  * 
- *     encode("Transaction".hash, 'hex') as action_tx_id,
+ *     encode("Transaction".hash, 'hex') as "action_tx_id!",
  * 
  *     "ProjectedNFT".policy_id as policy_id,
  *     "ProjectedNFT".asset_name as asset_name,
@@ -57,9 +57,9 @@ const sqlProjectedNftRangeByAddressIR: any = {"usedParamSet":{"owner_address":tr
  *         WHEN "ProjectedNFT".operation = 1 THEN 'Unlocking'
  *         WHEN "ProjectedNFT".operation = 2 THEN 'Claim'
  *         ELSE 'Invalid'
- *         END AS status,
+ *         END AS "status!",
  * 
- *     encode("ProjectedNFT".plutus_datum, 'hex') as plutus_datum,
+ *     encode("ProjectedNFT".plutus_datum, 'hex') as "plutus_datum!",
  *     "ProjectedNFT".for_how_long as for_how_long,
  * 
  *     "Block".slot as action_slot
diff --git a/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.sql b/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.sql
index 8aae388c..185533bf 100644
--- a/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.sql
+++ b/webserver/server/app/models/projected_nft/projectedNftRangeByAddress.sql
@@ -2,7 +2,7 @@
 @name sqlProjectedNftRangeByAddress
 */
 SELECT
-    encode("ProjectedNFT".owner_address, 'hex') as owner_address,
+    encode("ProjectedNFT".owner_address, 'hex') as "owner_address!",
 
     encode("ProjectedNFT".previous_utxo_tx_hash, 'hex') as previous_tx_hash,
     "ProjectedNFT".previous_utxo_tx_output_index as previous_tx_output_index,
@@ -12,7 +12,7 @@ SELECT
         ELSE "TransactionOutput".output_index
         END AS action_output_index,
 
-    encode("Transaction".hash, 'hex') as action_tx_id,
+    encode("Transaction".hash, 'hex') as "action_tx_id!",
 
     "ProjectedNFT".policy_id as policy_id,
     "ProjectedNFT".asset_name as asset_name,
@@ -23,9 +23,9 @@ SELECT
         WHEN "ProjectedNFT".operation = 1 THEN 'Unlocking'
         WHEN "ProjectedNFT".operation = 2 THEN 'Claim'
         ELSE 'Invalid'
-        END AS status,
+        END AS "status!",
 
-    encode("ProjectedNFT".plutus_datum, 'hex') as plutus_datum,
+    encode("ProjectedNFT".plutus_datum, 'hex') as "plutus_datum!",
     "ProjectedNFT".for_how_long as for_how_long,
 
     "Block".slot as action_slot
diff --git a/webserver/server/app/models/transaction/sqlHistoryForAddresses.queries.ts b/webserver/server/app/models/transaction/sqlHistoryForAddresses.queries.ts
index d556a904..10c81309 100644
--- a/webserver/server/app/models/transaction/sqlHistoryForAddresses.queries.ts
+++ b/webserver/server/app/models/transaction/sqlHistoryForAddresses.queries.ts
@@ -1,14 +1,16 @@
 /** Types generated for queries found in "app/models/transaction/sqlHistoryForAddresses.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlHistoryForAddresses' parameters type */
 export interface ISqlHistoryForAddressesParams {
-  addresses: BufferArray | null | void;
-  after_tx_id: string | null | void;
-  limit: string | null | void;
-  until_tx_id: string | null | void;
+  addresses?: BufferArray | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  limit?: NumberOrString | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlHistoryForAddresses' return type */
diff --git a/webserver/server/app/models/transaction/sqlHistoryForCredentials.queries.ts b/webserver/server/app/models/transaction/sqlHistoryForCredentials.queries.ts
index 9b282505..e66b4f15 100644
--- a/webserver/server/app/models/transaction/sqlHistoryForCredentials.queries.ts
+++ b/webserver/server/app/models/transaction/sqlHistoryForCredentials.queries.ts
@@ -1,15 +1,17 @@
 /** Types generated for queries found in "app/models/transaction/sqlHistoryForCredentials.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
+export type NumberOrString = number | string;
+
 /** 'SqlHistoryForCredentials' parameters type */
 export interface ISqlHistoryForCredentialsParams {
-  after_tx_id: string | null | void;
-  credentials: BufferArray | null | void;
-  limit: string | null | void;
-  relation: number | null | void;
-  until_tx_id: string | null | void;
+  after_tx_id?: NumberOrString | null | void;
+  credentials?: BufferArray | null | void;
+  limit?: NumberOrString | null | void;
+  relation?: number | null | void;
+  until_tx_id?: NumberOrString | null | void;
 }
 
 /** 'SqlHistoryForCredentials' return type */
diff --git a/webserver/server/app/models/transaction/sqlTransactionOutput.queries.ts b/webserver/server/app/models/transaction/sqlTransactionOutput.queries.ts
index 9db7248e..188de612 100644
--- a/webserver/server/app/models/transaction/sqlTransactionOutput.queries.ts
+++ b/webserver/server/app/models/transaction/sqlTransactionOutput.queries.ts
@@ -1,5 +1,5 @@
 /** Types generated for queries found in "app/models/transaction/sqlTransactionOutput.sql" */
-import { PreparedQuery } from '@pgtyped/query';
+import { PreparedQuery } from '@pgtyped/runtime';
 
 export type BufferArray = (Buffer)[];
 
@@ -7,8 +7,8 @@ export type numberArray = (number)[];
 
 /** 'SqlTransactionOutput' parameters type */
 export interface ISqlTransactionOutputParams {
-  output_index: numberArray | null | void;
-  tx_hash: BufferArray | null | void;
+  output_index?: numberArray | null | void;
+  tx_hash?: BufferArray | null | void;
 }
 
 /** 'SqlTransactionOutput' return type */
diff --git a/webserver/server/package.json b/webserver/server/package.json
index d22e6104..35b24aef 100644
--- a/webserver/server/package.json
+++ b/webserver/server/package.json
@@ -27,8 +27,8 @@
   "dependencies": {
     "@dcspark/cardano-multiplatform-lib-nodejs": "3.0.1",
     "@dcspark/cip5-js": "^1.0.0",
-    "@pgtyped/cli": "1.0.2",
-    "@pgtyped/query": "1.0.1",
+    "@pgtyped/cli": "2.3.0",
+    "@pgtyped/runtime": "2.3.0",
     "assert-never": "^1.2.1",
     "bech32": "2.0.0",
     "body-parser": "1.20.0",
diff --git a/webserver/server/yarn.lock b/webserver/server/yarn.lock
index 4cebb2d6..337170ba 100644
--- a/webserver/server/yarn.lock
+++ b/webserver/server/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@assemblyscript/loader@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
+  integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
+
 "@babel/code-frame@^7.0.0":
   version "7.16.7"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
@@ -79,6 +84,18 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
@@ -118,67 +135,75 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@pgtyped/cli@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@pgtyped/cli/-/cli-1.0.2.tgz#dcd62621f7e2d106ab9b0fa16f6b44dad052de48"
-  integrity sha512-sowYnlr9gS3NKdr6+45ZZ7uV8VArwDhhYLVrlnh1mq/PXCxfoHY8Cfy++rMNAHyjoA2etZfyMkqwPVOWyvI8Rw==
+"@pgtyped/cli@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@pgtyped/cli/-/cli-2.3.0.tgz#1daf826bef23f4c8dd84bc9558bb49089ee08db3"
+  integrity sha512-mSCx3BQW4IkfMyAOdCJZSYo2+G6rRaP05TkIMCLxTl+qiAyDyPiTwnYHCfcLV9ZHvloZ03UEUMLyOySapq5eyw==
   dependencies:
-    "@pgtyped/query" "^1.0.1"
-    "@types/nunjucks" "^3.1.3"
+    "@pgtyped/parser" "^2.3.0"
+    "@pgtyped/query" "^2.3.0"
+    "@pgtyped/wire" "^2.3.0"
     camel-case "^4.1.1"
     chalk "^4.0.0"
     chokidar "^3.3.1"
     debug "^4.1.1"
     fp-ts "^2.5.3"
-    fs-extra "^10.0.0"
-    glob "^8.0.0"
-    io-ts "^2.1.2"
-    io-ts-reporters "^1.0.0"
-    jest-worker "^26.3.0"
-    nunjucks "3.2.3"
+    fs-extra "^11.0.0"
+    glob "^10.3.7"
+    io-ts "^2.2.20"
+    io-ts-reporters "^2.0.1"
+    nunjucks "3.2.4"
     pascal-case "^3.1.1"
+    piscina "^4.0.0"
+    tinypool "^0.8.0"
     ts-parse-database-url "^1.0.3"
     yargs "^17.0.1"
 
-"@pgtyped/query@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@pgtyped/query/-/query-1.0.1.tgz"
-  integrity sha512-bxlfkqeNY/wDBsDmOnB7KgZbYD6HYU0Kz+HurKIfgcv9gs1JDq53KKdkoUxx0Gpi6YlsFEIP9HAc1823pzjLCw==
+"@pgtyped/parser@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@pgtyped/parser/-/parser-2.3.0.tgz#9f6e8d7d52c85f266114f38c90b54b2a6691fffc"
+  integrity sha512-KJ/rXbHnq0aRdyVo4RjIivXJMnOJjaxmk060uAqLVzgOVy2xF2lZ2GAykH1JSCRpRbpikUOtb4QE7dkbownB6g==
   dependencies:
-    "@pgtyped/wire" "^1.0.1"
-    "@types/chalk" "^2.2.0"
-    "@types/debug" "^4.1.4"
     antlr4ts "0.5.0-alpha.4"
     chalk "^4.1.0"
     debug "^4.1.1"
 
-"@pgtyped/query@^1.0.1":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@pgtyped/query/-/query-1.1.0.tgz#409e8d90b6ad3041a46902b2454a3322c6245450"
-  integrity sha512-SneurkGfuJmh4I7rROyFipkEd8P0A/zAv9zQ08B2fweX5Em4uOklNpyQ3qVyCNdjoA5PRd9M5Hj5ZwnKVca2xQ==
+"@pgtyped/query@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@pgtyped/query/-/query-2.3.0.tgz#c6b86f4173d7e8c172866d27b146ec667d84c842"
+  integrity sha512-Ko+JqkeU+bNlQK1PiL/+KitNj4fBNIvgJPBeRJGbNyRidTNuMSBFnd+DLjnhWP8bEu8e0b+mm9nECcmbbBNrpA==
   dependencies:
-    "@pgtyped/wire" "^1.1.0"
-    "@types/chalk" "^2.2.0"
-    "@types/debug" "^4.1.4"
-    antlr4ts "0.5.0-alpha.4"
+    "@pgtyped/runtime" "^2.3.0"
+    "@pgtyped/wire" "^2.3.0"
     chalk "^4.1.0"
     debug "^4.1.1"
 
-"@pgtyped/wire@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@pgtyped/wire/-/wire-1.0.1.tgz"
-  integrity sha512-QsZ9sqI71/nziWj41tL3x+Wi3z70SNg9ZFQ/WBswEtw7ThOLMIZ8sRFUP7i/Ukj59Hh3kBlnpHfzaVOy+47Ynw==
+"@pgtyped/runtime@2.3.0", "@pgtyped/runtime@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@pgtyped/runtime/-/runtime-2.3.0.tgz#b74af5ed3b47df487bd582fc3d6ea243b0a49ded"
+  integrity sha512-B8RMUeX+zsaXfKOuR3w3Vku5YLSQ8rw+YUYc2IyAFzlQJZpAQDkkAVM0abgGNQE8bOK1wuE+nHJawWuVy+I8bA==
   dependencies:
-    "@types/debug" "^4.1.4"
+    "@pgtyped/parser" "^2.3.0"
+    chalk "^4.1.0"
     debug "^4.1.1"
 
-"@pgtyped/wire@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@pgtyped/wire/-/wire-1.1.0.tgz#0248378ed77bd0b293fd91028c4e80ad3ddad8d4"
-  integrity sha512-jLnWtd5Xt4Ro1aQyERR+0i3zuJHXCMsU5pFX+ZZ7Q9oGoDdA7ItwkHt7nLLf9n72W+Eybc+CFGoncaxEIJqo9g==
+"@pgtyped/wire@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@pgtyped/wire/-/wire-2.3.0.tgz#f5c05dddcc09a2206cd7183bf17dee5be341d3a6"
+  integrity sha512-bUJXVeSphcZvk8nSyIz42oZhthQK/zvDWC6JPgLZ3zjTknOGTFLIyLJomTpbfy0CHdEpNMEeF64hh4rU1uQyiA==
   dependencies:
     debug "^4.1.1"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@scarf/scarf@^1.1.1":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.3.0.tgz#f8c75560d0dace4452dee1e31995e6396e61f3ee"
+  integrity sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew==
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz"
@@ -238,13 +263,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/chalk@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz"
-  integrity sha512-1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw==
-  dependencies:
-    chalk "*"
-
 "@types/connect@*":
   version "3.4.35"
   resolved "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
@@ -259,13 +277,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/debug@^4.1.4":
-  version "4.1.7"
-  resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"
-  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
-  dependencies:
-    "@types/ms" "*"
-
 "@types/eslint-plugin-prettier@3.1.0":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@types/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz"
@@ -356,11 +367,6 @@
   resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/ms@*":
-  version "0.7.31"
-  resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"
-  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
-
 "@types/node@*", "@types/node@17.0.23":
   version "17.0.23"
   resolved "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"
@@ -371,11 +377,6 @@
   resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/nunjucks@^3.1.3":
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/@types/nunjucks/-/nunjucks-3.2.5.tgz#88c820c9052bc19fefc11dfe5be76b5eaeada53d"
-  integrity sha512-P9EakWGTqHpziLO9FMRm98LrVnPoipXGR/iAVF55xYa9SKQq7Brob/JTxGESwkhoNkL7fFvROdUOWNwTceELfw==
-
 "@types/pg@8.6.5":
   version "8.6.5"
   resolved "https://registry.npmjs.org/@types/pg/-/pg-8.6.5.tgz"
@@ -556,6 +557,11 @@ ansi-regex@^5.0.1:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
@@ -570,6 +576,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 antlr4ts@0.5.0-alpha.4:
   version "0.5.0-alpha.4"
   resolved "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz"
@@ -661,6 +672,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.2.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 bech32@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz"
@@ -756,11 +772,6 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-chalk@*:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"
-  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
-
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -900,9 +911,9 @@ create-require@^1.1.0:
   resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -1001,6 +1012,11 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
@@ -1011,6 +1027,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
@@ -1456,6 +1477,14 @@ flatted@^3.1.0:
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
@@ -1471,10 +1500,10 @@ fresh@0.5.2:
   resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-extra@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+fs-extra@^11.0.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -1545,6 +1574,17 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
+glob@^10.3.7:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
 glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
@@ -1557,17 +1597,6 @@ glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 globals@^13.15.0:
   version "13.17.0"
   resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"
@@ -1655,6 +1684,20 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hdr-histogram-js@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
+  integrity sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==
+  dependencies:
+    "@assemblyscript/loader" "^0.10.1"
+    base64-js "^1.2.0"
+    pako "^1.0.3"
+
+hdr-histogram-percentiles-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c"
+  integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
@@ -1740,15 +1783,17 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-io-ts-reporters@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/io-ts-reporters/-/io-ts-reporters-1.2.2.tgz#4d3219777ea5219c7d8f6ffac01fd68e72426dd1"
-  integrity sha512-igASwWWkDY757OutNcM6zTtdJf/eTZYkoe2ymsX2qpm5bKZLo74FJYjsCtMQOEdY7dRHLLEulCyFQwdN69GBCg==
+io-ts-reporters@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/io-ts-reporters/-/io-ts-reporters-2.0.1.tgz#0154545aefd115f0f175a41743ed7327d19b1c34"
+  integrity sha512-RVpLstYBsmTGgCW9wJ5KVyN/eRnRUDp87Flt4D1O3aJ7oAnd8csq8aXuu7ZeNK8qEDKmjUl9oUuzfwikaNAMKQ==
+  dependencies:
+    "@scarf/scarf" "^1.1.1"
 
-io-ts@^2.1.2:
-  version "2.2.20"
-  resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.20.tgz#be42b75f6668a2c44f706f72ee6e4c906777c7f5"
-  integrity sha512-Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA==
+io-ts@^2.2.20:
+  version "2.2.21"
+  resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.21.tgz#4ef754176f7082a1099d04c7d5c4ea53267c530a"
+  integrity sha512-zz2Z69v9ZIC3mMLYWIeoUcwWD6f+O7yP92FMVVaXEOSZH1jnVBmET/urd/uoarD1WGBY4rCj8TAyMPzsGNzMFQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -1927,14 +1972,14 @@ iterate-value@^1.0.2:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
-jest-worker@^26.3.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
   dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
 
 js-sdsl@^4.1.4:
   version "4.1.4"
@@ -2068,6 +2113,11 @@ lru-cache@^7.4.0:
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz"
   integrity sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==
 
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
+  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
@@ -2111,11 +2161,6 @@ merge-descriptors@1.0.1:
   resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
@@ -2168,10 +2213,10 @@ minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+minimatch@^9.0.1:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -2189,6 +2234,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 mongodb-uri@^0.9.7:
   version "0.9.7"
   resolved "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz"
@@ -2224,6 +2274,14 @@ neo-async@^2.6.0:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+nice-napi@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b"
+  integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==
+  dependencies:
+    node-addon-api "^3.0.0"
+    node-gyp-build "^4.2.2"
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"
@@ -2232,6 +2290,16 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
+node-addon-api@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
+node-gyp-build@^4.2.2:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.1.tgz#cd7d2eb48e594874053150a9418ac85af83ca8f7"
+  integrity sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==
+
 nodemon@2.0.20:
   version "2.0.20"
   resolved "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz"
@@ -2280,10 +2348,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-nunjucks@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.3.tgz#1b33615247290e94e28263b5d855ece765648a31"
-  integrity sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==
+nunjucks@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.4.tgz#f0878eef528ce7b0aa35d67cc6898635fd74649e"
+  integrity sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==
   dependencies:
     a-sync-waterfall "^1.0.0"
     asap "^2.0.3"
@@ -2415,6 +2483,11 @@ packet-reader@1.0.0:
   resolved "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"
   integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
 
+pako@^1.0.3:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
@@ -2470,6 +2543,14 @@ path-parse@^1.0.7:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
@@ -2561,6 +2642,16 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+piscina@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.2.1.tgz#efb7f009d3a961e02ae08f1909bd24b5423e77fa"
+  integrity sha512-LShp0+lrO+WIzB9LXO+ZmO4zGHxtTJNZhEO56H9SSu+JPaUQb6oLcTCzWi5IL2DS8/vIkCE88ElahuSSw4TAkA==
+  dependencies:
+    hdr-histogram-js "^2.0.1"
+    hdr-histogram-percentiles-obj "^3.0.0"
+  optionalDependencies:
+    nice-napi "^1.0.2"
+
 plur@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz"
@@ -2868,6 +2959,11 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 simple-update-notifier@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"
@@ -2931,6 +3027,15 @@ statuses@2.0.1:
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -2940,6 +3045,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"
@@ -2956,6 +3070,13 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -2963,6 +3084,13 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
@@ -3031,6 +3159,11 @@ text-table@^0.2.0:
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+tinypool@^0.8.0:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.1.tgz#b6c4e4972ede3e3e5cda74a3da1679303d386b03"
+  integrity sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
@@ -3286,6 +3419,15 @@ wordwrap@^1.0.0:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
@@ -3304,6 +3446,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
diff --git a/webserver/shared/models/DelegationForPool.ts b/webserver/shared/models/DelegationForPool.ts
index 37209e58..c551a1aa 100644
--- a/webserver/shared/models/DelegationForPool.ts
+++ b/webserver/shared/models/DelegationForPool.ts
@@ -9,6 +9,6 @@ export type DelegationForPoolRequest = {
 export type DelegationForPoolResponse = {
     credential: Address;
     pool: PoolHex | null,
-    txId: string | null;
+    txId: string;
     slot: number;
 }[];
\ No newline at end of file
diff --git a/webserver/shared/models/ProjectedNftRange.ts b/webserver/shared/models/ProjectedNftRange.ts
index e14f365b..36abb5f5 100644
--- a/webserver/shared/models/ProjectedNftRange.ts
+++ b/webserver/shared/models/ProjectedNftRange.ts
@@ -48,7 +48,7 @@ export type ProjectedNftRangeResponse = {
      * @pattern [0-9a-fA-F]{64}
      * @example "28eb069e3e8c13831d431e3b2e35f58525493ab2d77fde83184993e4aa7a0eda"
      */
-    actionTxId: string | null,
+    actionTxId: string,
 
     /**
      * Output index of related Projected NFT event. Null if it is claim event (No new UTxO is created).
@@ -97,14 +97,14 @@ export type ProjectedNftRangeResponse = {
      *
      * @example "Lock"
      */
-    status: ProjectedNftStatus | null,
+    status: ProjectedNftStatus,
     /**
      * Projected NFT datum: serialized state of the Projected NFT
      *
      * @pattern [0-9a-fA-F]+
      * @example "d8799fd8799f581c9040f057461d9adc09108fe5cb630077cf75c6e981d3ed91f6fb18f6ffd87980ff"
      */
-    plutusDatum: string | null,
+    plutusDatum: string,
     /**
      * UNIX timestamp till which the funds can't be claimed in the Unlocking state.
      * If the status is not Unlocking this is always null.