diff --git a/.speakeasy/workflow.lock b/.speakeasy/workflow.lock
index d6820e3f..1b931471 100644
--- a/.speakeasy/workflow.lock
+++ b/.speakeasy/workflow.lock
@@ -1,21 +1,21 @@
-speakeasyVersion: 1.615.2
+speakeasyVersion: 1.634.2
 sources:
     chainkit-source:
         sourceNamespace: avalanche-sdk-chainkit-typescript
-        sourceRevisionDigest: sha256:cfe370ddd4ba0a6e5a340c0b2d68cedb640d48b60864a473cdaaf79791556ba4
-        sourceBlobDigest: sha256:5190eecf888dbdc22a9ed99701a3e3e49dc60b8891a330aabc78799b081131ef
+        sourceRevisionDigest: sha256:59ac504c0511850d2633bfc83cee76f200bb0fca87e8f01cbb6f175da8d57661
+        sourceBlobDigest: sha256:944c2b40205a220b3babc11cb5ec0f888d5c0486e991b02768496e6306bc9f7a
         tags:
             - latest
-            - speakeasy-sdk-regen-1757788697
+            - speakeasy-sdk-regen-1759257679
             - 1.0.0
 targets:
     chainkit-sdk:
         source: chainkit-source
         sourceNamespace: avalanche-sdk-chainkit-typescript
-        sourceRevisionDigest: sha256:cfe370ddd4ba0a6e5a340c0b2d68cedb640d48b60864a473cdaaf79791556ba4
-        sourceBlobDigest: sha256:5190eecf888dbdc22a9ed99701a3e3e49dc60b8891a330aabc78799b081131ef
+        sourceRevisionDigest: sha256:59ac504c0511850d2633bfc83cee76f200bb0fca87e8f01cbb6f175da8d57661
+        sourceBlobDigest: sha256:944c2b40205a220b3babc11cb5ec0f888d5c0486e991b02768496e6306bc9f7a
         codeSamplesNamespace: avalanche-sdk-chainkit-typescript-code-samples
-        codeSamplesRevisionDigest: sha256:73b8822b1ace940bedd01c7efbf7590e228ae09358295c207bab303eba939a23
+        codeSamplesRevisionDigest: sha256:74707066b1a60fd6f21f9d4940b6105300655b87912a373dc24e9638acc82b9d
 workflow:
     workflowVersion: 1.0.0
     speakeasyVersion: latest
diff --git a/chainkit/.speakeasy/gen.lock b/chainkit/.speakeasy/gen.lock
index 81a9109a..98ab467e 100644
--- a/chainkit/.speakeasy/gen.lock
+++ b/chainkit/.speakeasy/gen.lock
@@ -1,12 +1,12 @@
 lockVersion: 2.0.0
 id: 125b8491-d8a2-4e4f-ad7e-83badf249c68
 management:
-  docChecksum: 479a52111fec3db2812074b39b435d3f
+  docChecksum: 3386adb8fc02033c5c7a66a83e459def
   docVersion: 1.0.0
-  speakeasyVersion: 1.615.2
-  generationVersion: 2.698.4
-  releaseVersion: 0.3.0-alpha.2
-  configChecksum: 3133161de03981e4684a6e6d384f6441
+  speakeasyVersion: 1.634.2
+  generationVersion: 2.721.3
+  releaseVersion: 0.3.0-alpha.3
+  configChecksum: ef9b3a4b4a3677200c1fb51438254e60
   repoURL: https://github.com/ava-labs/avalanche-sdk-typescript.git
   repoSubDirectory: chainkit
   installationURL: https://gitpkg.now.sh/ava-labs/avalanche-sdk-typescript/chainkit
@@ -15,7 +15,7 @@ features:
   typescript:
     additionalDependencies: 0.1.0
     constsAndDefaults: 0.1.12
-    core: 3.21.22
+    core: 3.21.26
     defaultEnabledRetries: 0.1.0
     deprecations: 2.81.1
     enumUnions: 0.1.0
@@ -36,7 +36,7 @@ features:
     responseFormat: 0.2.3
     retries: 2.83.0
     sdkHooks: 0.3.0
-    unions: 2.85.11
+    unions: 2.86.0
     webhooks: 1.5.0
 generatedFiles:
   - .gitattributes
@@ -6170,9 +6170,4 @@ examples:
           application/json: {"message": "<value>", "statusCode": 503, "error": "Service Unavailable"}
 examplesVersion: 1.0.2
 generatedTests: {}
-releaseNotes: |
-  ## Typescript SDK Changes Detected:
-  * `avalanche.metrics.chains.getIcmMetrics()`: **Added**
-  * `avalanche.metrics.chains.getIcmRollingWindowMetrics()`: **Added**
-  * `avalanche.avaxSupply.get()`: **Added**
-  * `avalanche.metrics.chains.getTeleporterMetrics()`: **Deleted** **Breaking** :warning:
+releaseNotes: "## Typescript SDK Changes Detected:\n* `avalanche.metrics.chains.getMetrics()`: \n  *  `request.metric` **Changed**\n* `avalanche.metrics.chains.getRollingWindowMetrics()`: \n  *  `request.metric` **Changed**\n* `avalanche.metrics.chains.getIcmMetrics()`: \n  *  `request.metric` **Changed**\n* `avalanche.metrics.chains.getIcmRollingWindowMetrics()`: \n  *  `request.metric` **Changed**\n"
diff --git a/chainkit/.speakeasy/gen.yaml b/chainkit/.speakeasy/gen.yaml
index a6589a0c..730cca98 100644
--- a/chainkit/.speakeasy/gen.yaml
+++ b/chainkit/.speakeasy/gen.yaml
@@ -22,7 +22,8 @@ generation:
     generateNewTests: false
     skipResponseBodyAssertions: false
 typescript:
-  version: 0.3.0-alpha.2
+  version: 0.3.0-alpha.3
+  acceptHeaderEnum: true
   additionalDependencies:
     dependencies:
       json-canonicalize: ^1.0.6
@@ -56,6 +57,7 @@ typescript:
   jsonpath: rfc9535
   maxMethodParams: 0
   methodArguments: require-security-and-request
+  modelPropertyCasing: camel
   moduleFormat: dual
   outputModelSuffix: output
   packageName: '@avalanche-sdk/chainkit'
diff --git a/chainkit/README.md b/chainkit/README.md
index e58e2c3d..570d13b6 100644
--- a/chainkit/README.md
+++ b/chainkit/README.md
@@ -65,10 +65,7 @@ bun add @avalanche-sdk/chainkit
 ### Yarn
 
 ```bash
-yarn add @avalanche-sdk/chainkit zod
-
-# Note that Yarn does not install peer dependencies automatically. You will need
-# to install zod as shown above.
+yarn add @avalanche-sdk/chainkit
 ```
 
 > [!NOTE]
@@ -879,7 +876,7 @@ httpClient.addHook("requestError", (error, request) => {
   console.groupEnd();
 });
 
-const sdk = new Avalanche({ httpClient });
+const sdk = new Avalanche({ httpClient: httpClient });
 ```
 <!-- End Custom HTTP Client [http-client] -->
 
diff --git a/chainkit/RELEASES.md b/chainkit/RELEASES.md
index 06c36cfb..7e797f17 100644
--- a/chainkit/RELEASES.md
+++ b/chainkit/RELEASES.md
@@ -40,4 +40,14 @@ Based on:
 ### Generated
 - [typescript v0.3.0-alpha.2] chainkit
 ### Releases
-- [NPM v0.3.0-alpha.2] https://www.npmjs.com/package/@avalanche-sdk/chainkit/v/0.3.0-alpha.2 - chainkit
\ No newline at end of file
+- [NPM v0.3.0-alpha.2] https://www.npmjs.com/package/@avalanche-sdk/chainkit/v/0.3.0-alpha.2 - chainkit
+
+## 2025-10-05 18:39:42
+### Changes
+Based on:
+- OpenAPI Doc  
+- Speakeasy CLI 1.634.2 (2.721.3) https://github.com/speakeasy-api/speakeasy
+### Generated
+- [typescript v0.3.0-alpha.3] chainkit
+### Releases
+- [NPM v0.3.0-alpha.3] https://www.npmjs.com/package/@avalanche-sdk/chainkit/v/0.3.0-alpha.3 - chainkit
\ No newline at end of file
diff --git a/chainkit/docs/models/components/chainmetric.md b/chainkit/docs/models/components/chainmetric.md
index def626cc..c95c7e5d 100644
--- a/chainkit/docs/models/components/chainmetric.md
+++ b/chainkit/docs/models/components/chainmetric.md
@@ -11,5 +11,5 @@ let value: ChainMetric = "activeAddresses";
 ## Values
 
 ```typescript
-"activeAddresses" | "activeSenders" | "cumulativeTxCount" | "cumulativeAddresses" | "cumulativeContracts" | "cumulativeDeployers" | "gasUsed" | "txCount" | "avgGps" | "maxGps" | "avgTps" | "maxTps" | "avgGasPrice" | "maxGasPrice" | "feesPaid"
+"activeAddresses" | "activeSenders" | "cumulativeTxCount" | "cumulativeAddresses" | "cumulativeContracts" | "cumulativeDeployers" | "contracts" | "deployers" | "gasUsed" | "txCount" | "avgGps" | "maxGps" | "avgTps" | "maxTps" | "avgGasPrice" | "maxGasPrice" | "feesPaid"
 ```
\ No newline at end of file
diff --git a/chainkit/docs/models/components/chainrollingwindowmetric.md b/chainkit/docs/models/components/chainrollingwindowmetric.md
index 7a3034f8..f90b3c68 100644
--- a/chainkit/docs/models/components/chainrollingwindowmetric.md
+++ b/chainkit/docs/models/components/chainrollingwindowmetric.md
@@ -11,5 +11,5 @@ let value: ChainRollingWindowMetric = "txCount";
 ## Values
 
 ```typescript
-"gasUsed" | "txCount" | "avgGps" | "maxGps" | "avgTps" | "maxTps" | "avgGasPrice" | "maxGasPrice" | "feesPaid"
+"gasUsed" | "txCount" | "avgGps" | "maxGps" | "avgTps" | "maxTps" | "avgGasPrice" | "maxGasPrice" | "feesPaid" | "contracts" | "deployers"
 ```
\ No newline at end of file
diff --git a/chainkit/docs/models/components/contract.md b/chainkit/docs/models/components/contract.md
index efd6a4e8..646e2e27 100644
--- a/chainkit/docs/models/components/contract.md
+++ b/chainkit/docs/models/components/contract.md
@@ -3,37 +3,37 @@
 
 ## Supported Types
 
-### `components.Erc20Contract`
+### `components.Erc721Contract`
 
 ```typescript
-const value: components.Erc20Contract = {
+const value: components.Erc721Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-20",
+  ercType: "ERC-721",
   symbol: "WAVAX",
-  decimals: 18,
 };
 ```
 
-### `components.Erc721Contract`
+### `components.Erc1155Contract`
 
 ```typescript
-const value: components.Erc721Contract = {
+const value: components.Erc1155Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-721",
+  ercType: "ERC-1155",
   symbol: "WAVAX",
 };
 ```
 
-### `components.Erc1155Contract`
+### `components.Erc20Contract`
 
 ```typescript
-const value: components.Erc1155Contract = {
+const value: components.Erc20Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-1155",
+  ercType: "ERC-20",
   symbol: "WAVAX",
+  decimals: 18,
 };
 ```
 
diff --git a/chainkit/docs/models/components/icmmetric.md b/chainkit/docs/models/components/icmmetric.md
index ecea3c26..928b14c5 100644
--- a/chainkit/docs/models/components/icmmetric.md
+++ b/chainkit/docs/models/components/icmmetric.md
@@ -11,5 +11,5 @@ let value: ICMMetric = "ICMSrcDestMsgCount";
 ## Values
 
 ```typescript
-"ICMSrcDestMsgCount" | "ICMSrcAggMsgCount" | "ICMDestAggMsgCount" | "ICMNetworkMsgCount"
+"ICMSrcDestMsgCount" | "ICMSrcAggMsgCount" | "ICMSrcMsgCount" | "ICMDestAggMsgCount" | "ICMDestMsgCount" | "ICMNetworkAggMsgCount" | "ICMNetworkMsgCount"
 ```
\ No newline at end of file
diff --git a/chainkit/docs/models/components/icmrollingwindowmetric.md b/chainkit/docs/models/components/icmrollingwindowmetric.md
index 8d94b7eb..7122b51c 100644
--- a/chainkit/docs/models/components/icmrollingwindowmetric.md
+++ b/chainkit/docs/models/components/icmrollingwindowmetric.md
@@ -11,5 +11,5 @@ let value: ICMRollingWindowMetric = "ICMSrcRollingWindowMsgCount";
 ## Values
 
 ```typescript
-"ICMSrcRollingWindowMsgCount" | "ICMDestRollingWindowMsgCount" | "ICMSrcDestRollingWindowMsgCount" | "ICMNetworkRollingWindowMsgCount"
+"ICMSrcRollingWindowMsgCount" | "ICMDestRollingWindowMsgCount" | "ICMSrcDestRollingWindowMsgCount" | "ICMNetworkRollingWindowMsgCount" | "ICMSrcRollingWindowAggMsgCount" | "ICMDestRollingWindowAggMsgCount" | "ICMNetworkRollingWindowAggMsgCount"
 ```
\ No newline at end of file
diff --git a/chainkit/docs/models/components/listicmmessagesresponsemessage.md b/chainkit/docs/models/components/listicmmessagesresponsemessage.md
index a3b31c6b..af41e97f 100644
--- a/chainkit/docs/models/components/listicmmessagesresponsemessage.md
+++ b/chainkit/docs/models/components/listicmmessagesresponsemessage.md
@@ -3,10 +3,10 @@
 
 ## Supported Types
 
-### `components.DeliveredIcmMessage`
+### `components.PendingIcmMessage`
 
 ```typescript
-const value: components.DeliveredIcmMessage = {
+const value: components.PendingIcmMessage = {
   messageId: "<id>",
   icmContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -16,9 +16,9 @@ const value: components.DeliveredIcmMessage = {
   messageNonce: "<value>",
   from: "<value>",
   to: "<value>",
-  messageExecuted: true,
+  messageExecuted: false,
   receipts: [],
-  receiptDelivered: true,
+  receiptDelivered: false,
   rewardDetails: {
     address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
     name: "Wrapped AVAX",
@@ -38,21 +38,14 @@ const value: components.DeliveredIcmMessage = {
     timestamp: 6459.73,
     gasSpent: "<value>",
   },
-  destinationTransaction: {
-    txHash: "<value>",
-    timestamp: 8250.11,
-    gasSpent: "<value>",
-    rewardRedeemer: "<value>",
-    delivererAddress: "<value>",
-  },
-  status: "delivered",
+  status: "pending",
 };
 ```
 
-### `components.PendingIcmMessage`
+### `components.DeliveredIcmMessage`
 
 ```typescript
-const value: components.PendingIcmMessage = {
+const value: components.DeliveredIcmMessage = {
   messageId: "<id>",
   icmContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -62,9 +55,9 @@ const value: components.PendingIcmMessage = {
   messageNonce: "<value>",
   from: "<value>",
   to: "<value>",
-  messageExecuted: false,
+  messageExecuted: true,
   receipts: [],
-  receiptDelivered: false,
+  receiptDelivered: true,
   rewardDetails: {
     address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
     name: "Wrapped AVAX",
@@ -84,7 +77,14 @@ const value: components.PendingIcmMessage = {
     timestamp: 6459.73,
     gasSpent: "<value>",
   },
-  status: "pending",
+  destinationTransaction: {
+    txHash: "<value>",
+    timestamp: 8250.11,
+    gasSpent: "<value>",
+    rewardRedeemer: "<value>",
+    delivererAddress: "<value>",
+  },
+  status: "delivered",
 };
 ```
 
diff --git a/chainkit/docs/models/components/listteleportermessagesresponsemessage.md b/chainkit/docs/models/components/listteleportermessagesresponsemessage.md
index b4ae0f2a..4a094612 100644
--- a/chainkit/docs/models/components/listteleportermessagesresponsemessage.md
+++ b/chainkit/docs/models/components/listteleportermessagesresponsemessage.md
@@ -3,10 +3,10 @@
 
 ## Supported Types
 
-### `components.DeliveredTeleporterMessage`
+### `components.PendingTeleporterMessage`
 
 ```typescript
-const value: components.DeliveredTeleporterMessage = {
+const value: components.PendingTeleporterMessage = {
   messageId: "<id>",
   teleporterContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -38,21 +38,14 @@ const value: components.DeliveredTeleporterMessage = {
     timestamp: 1403.23,
     gasSpent: "<value>",
   },
-  destinationTransaction: {
-    txHash: "<value>",
-    timestamp: 4770.43,
-    gasSpent: "<value>",
-    rewardRedeemer: "<value>",
-    delivererAddress: "<value>",
-  },
-  status: "delivered",
+  status: "pending",
 };
 ```
 
-### `components.PendingTeleporterMessage`
+### `components.DeliveredTeleporterMessage`
 
 ```typescript
-const value: components.PendingTeleporterMessage = {
+const value: components.DeliveredTeleporterMessage = {
   messageId: "<id>",
   teleporterContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -84,7 +77,14 @@ const value: components.PendingTeleporterMessage = {
     timestamp: 1403.23,
     gasSpent: "<value>",
   },
-  status: "pending",
+  destinationTransaction: {
+    txHash: "<value>",
+    timestamp: 4770.43,
+    gasSpent: "<value>",
+    rewardRedeemer: "<value>",
+    delivererAddress: "<value>",
+  },
+  status: "delivered",
 };
 ```
 
diff --git a/chainkit/docs/models/components/validator.md b/chainkit/docs/models/components/validator.md
index 554224df..36994455 100644
--- a/chainkit/docs/models/components/validator.md
+++ b/chainkit/docs/models/components/validator.md
@@ -31,6 +31,20 @@ const value: components.ActiveValidatorDetails = {
 };
 ```
 
+### `components.PendingValidatorDetails`
+
+```typescript
+const value: components.PendingValidatorDetails = {
+  txHash: "<value>",
+  nodeId: "<id>",
+  subnetId: "<id>",
+  amountStaked: "<value>",
+  startTimestamp: 9843.29,
+  endTimestamp: 5112.58,
+  validationStatus: "pending",
+};
+```
+
 ### `components.CompletedValidatorDetails`
 
 ```typescript
@@ -66,17 +80,3 @@ const value: components.RemovedValidatorDetails = {
 };
 ```
 
-### `components.PendingValidatorDetails`
-
-```typescript
-const value: components.PendingValidatorDetails = {
-  txHash: "<value>",
-  nodeId: "<id>",
-  subnetId: "<id>",
-  amountStaked: "<value>",
-  startTimestamp: 9843.29,
-  endTimestamp: 5112.58,
-  validationStatus: "pending",
-};
-```
-
diff --git a/chainkit/docs/models/operations/getcontractmetadataresponse.md b/chainkit/docs/models/operations/getcontractmetadataresponse.md
index c41ce055..e4fdbf1d 100644
--- a/chainkit/docs/models/operations/getcontractmetadataresponse.md
+++ b/chainkit/docs/models/operations/getcontractmetadataresponse.md
@@ -5,37 +5,37 @@ Successful response
 
 ## Supported Types
 
-### `components.Erc20Contract`
+### `components.Erc721Contract`
 
 ```typescript
-const value: components.Erc20Contract = {
+const value: components.Erc721Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-20",
+  ercType: "ERC-721",
   symbol: "WAVAX",
-  decimals: 18,
 };
 ```
 
-### `components.Erc721Contract`
+### `components.Erc1155Contract`
 
 ```typescript
-const value: components.Erc721Contract = {
+const value: components.Erc1155Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-721",
+  ercType: "ERC-1155",
   symbol: "WAVAX",
 };
 ```
 
-### `components.Erc1155Contract`
+### `components.Erc20Contract`
 
 ```typescript
-const value: components.Erc1155Contract = {
+const value: components.Erc20Contract = {
   name: "Wrapped AVAX",
   address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
-  ercType: "ERC-1155",
+  ercType: "ERC-20",
   symbol: "WAVAX",
+  decimals: 18,
 };
 ```
 
diff --git a/chainkit/docs/models/operations/geticmmessageresponse.md b/chainkit/docs/models/operations/geticmmessageresponse.md
index 25cb8526..de5bed55 100644
--- a/chainkit/docs/models/operations/geticmmessageresponse.md
+++ b/chainkit/docs/models/operations/geticmmessageresponse.md
@@ -5,10 +5,10 @@ Successful response
 
 ## Supported Types
 
-### `components.DeliveredIcmMessage`
+### `components.PendingIcmMessage`
 
 ```typescript
-const value: components.DeliveredIcmMessage = {
+const value: components.PendingIcmMessage = {
   messageId: "<id>",
   icmContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -18,9 +18,9 @@ const value: components.DeliveredIcmMessage = {
   messageNonce: "<value>",
   from: "<value>",
   to: "<value>",
-  messageExecuted: true,
+  messageExecuted: false,
   receipts: [],
-  receiptDelivered: true,
+  receiptDelivered: false,
   rewardDetails: {
     address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
     name: "Wrapped AVAX",
@@ -40,21 +40,14 @@ const value: components.DeliveredIcmMessage = {
     timestamp: 6459.73,
     gasSpent: "<value>",
   },
-  destinationTransaction: {
-    txHash: "<value>",
-    timestamp: 8250.11,
-    gasSpent: "<value>",
-    rewardRedeemer: "<value>",
-    delivererAddress: "<value>",
-  },
-  status: "delivered",
+  status: "pending",
 };
 ```
 
-### `components.PendingIcmMessage`
+### `components.DeliveredIcmMessage`
 
 ```typescript
-const value: components.PendingIcmMessage = {
+const value: components.DeliveredIcmMessage = {
   messageId: "<id>",
   icmContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -64,9 +57,9 @@ const value: components.PendingIcmMessage = {
   messageNonce: "<value>",
   from: "<value>",
   to: "<value>",
-  messageExecuted: false,
+  messageExecuted: true,
   receipts: [],
-  receiptDelivered: false,
+  receiptDelivered: true,
   rewardDetails: {
     address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
     name: "Wrapped AVAX",
@@ -86,7 +79,14 @@ const value: components.PendingIcmMessage = {
     timestamp: 6459.73,
     gasSpent: "<value>",
   },
-  status: "pending",
+  destinationTransaction: {
+    txHash: "<value>",
+    timestamp: 8250.11,
+    gasSpent: "<value>",
+    rewardRedeemer: "<value>",
+    delivererAddress: "<value>",
+  },
+  status: "delivered",
 };
 ```
 
diff --git a/chainkit/docs/models/operations/getteleportermessageresponse.md b/chainkit/docs/models/operations/getteleportermessageresponse.md
index 11831b4e..d796f8fe 100644
--- a/chainkit/docs/models/operations/getteleportermessageresponse.md
+++ b/chainkit/docs/models/operations/getteleportermessageresponse.md
@@ -5,10 +5,10 @@ Successful response
 
 ## Supported Types
 
-### `components.DeliveredTeleporterMessage`
+### `components.PendingTeleporterMessage`
 
 ```typescript
-const value: components.DeliveredTeleporterMessage = {
+const value: components.PendingTeleporterMessage = {
   messageId: "<id>",
   teleporterContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -40,21 +40,14 @@ const value: components.DeliveredTeleporterMessage = {
     timestamp: 1403.23,
     gasSpent: "<value>",
   },
-  destinationTransaction: {
-    txHash: "<value>",
-    timestamp: 4770.43,
-    gasSpent: "<value>",
-    rewardRedeemer: "<value>",
-    delivererAddress: "<value>",
-  },
-  status: "delivered",
+  status: "pending",
 };
 ```
 
-### `components.PendingTeleporterMessage`
+### `components.DeliveredTeleporterMessage`
 
 ```typescript
-const value: components.PendingTeleporterMessage = {
+const value: components.DeliveredTeleporterMessage = {
   messageId: "<id>",
   teleporterContractAddress: "<value>",
   sourceBlockchainId: "<id>",
@@ -86,7 +79,14 @@ const value: components.PendingTeleporterMessage = {
     timestamp: 1403.23,
     gasSpent: "<value>",
   },
-  status: "pending",
+  destinationTransaction: {
+    txHash: "<value>",
+    timestamp: 4770.43,
+    gasSpent: "<value>",
+    rewardRedeemer: "<value>",
+    delivererAddress: "<value>",
+  },
+  status: "delivered",
 };
 ```
 
diff --git a/chainkit/docs/sdks/metricschains/README.md b/chainkit/docs/sdks/metricschains/README.md
index ecf747d0..504bd93d 100644
--- a/chainkit/docs/sdks/metricschains/README.md
+++ b/chainkit/docs/sdks/metricschains/README.md
@@ -195,6 +195,10 @@ All metrics are updated several times every hour. Each metric data point has a `
 
 <ins>cumulativeDeployers</ins>: The cumulative count of unique contract deployers from genesis up until 24 hours after the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
 
+<ins>contracts</ins>: The count of contracts created within the requested timeInterval starting at the timestamp. Contracts are counted by looking for the CREATE, CREATE2, and CREATE3 call types in all transaction traces (aka internal transactions). Only `timeInterval=day` supported.
+
+<ins>deployers</ins>: The count of unique deployers within the requested timeInterval starting at the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
+
 <ins>gasUsed</ins>: The amount of gas used by transactions within the requested timeInterval starting at the timestamp.
 
 <ins>txCount</ins>: The amount of transactions within the requested timeInterval starting at the timestamp.
@@ -393,11 +397,17 @@ Interchain Message (ICM) metrics are available for all Avalanche L1s on _Mainnet
 
 <ins>ICMSrcDestMsgCount</ins>: The number of ICM messages sent from the source blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+<ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to each destination blockchain within the requested timeInterval starting at the timestamp.
+
+<ins>ICMSrcAggMsgCount</ins>: The number of ICM messages sent from the source blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
+
+<ins>ICMDestMsgCount</ins>: The number of ICM messages received from each blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMDestMsgCount</ins>: The number of ICM messages received from any blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+<ins>ICMDestAggMsgCount</ins>: The number of ICM messages received from any blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+<ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain on the provided network.
+
+<ins>ICMNetworkAggMsgCount</ins>: The number of ICM messages sent on the  provided network.
 
 ### Example Usage
 
@@ -485,17 +495,23 @@ run();
 
 ## getICMRollingWindowMetrics
 
-Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId. Rolling window metrics are available for the last hour, day, month, year, and all time. You can also request metrics grouped by mainnet or testnet.
+Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId or by network. Rolling window metrics are available for the last hour, day, month,  90 days,year, and all time.
 
 ### Metrics
 
 <ins>ICMSrcDestRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to the destination blockchain within the last hour, day, month, year, and all time.
 
-<ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+<ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMSrcRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from the source blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMDestRollingWindowAggMsgCount</ins>: The number of ICM  messages received from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
 
-<ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to the destination blockchain within the last hour, day, month, year, and all time.
+<ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
 
-<ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+<ins>ICMNetworkRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
 
 ### Example Usage
 
diff --git a/chainkit/examples/package-lock.json b/chainkit/examples/package-lock.json
index 06e2ea82..a7953c0c 100644
--- a/chainkit/examples/package-lock.json
+++ b/chainkit/examples/package-lock.json
@@ -18,7 +18,7 @@
     },
     "..": {
       "name": "@avalanche-sdk/chainkit",
-      "version": "0.3.0-alpha.2",
+      "version": "0.3.0-alpha.3",
       "license": "BSD-3-Clause",
       "dependencies": {
         "json-canonicalize": "^1.0.6",
diff --git a/chainkit/package-lock.json b/chainkit/package-lock.json
index bfd4074e..45f6ae93 100644
--- a/chainkit/package-lock.json
+++ b/chainkit/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@avalanche-sdk/chainkit",
-  "version": "0.3.0-alpha.2",
+  "version": "0.3.0-alpha.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@avalanche-sdk/chainkit",
-      "version": "0.3.0-alpha.2",
+      "version": "0.3.0-alpha.3",
       "license": "BSD-3-Clause",
       "dependencies": {
         "json-canonicalize": "^1.0.6",
diff --git a/chainkit/package.json b/chainkit/package.json
index 35387a3c..cceba638 100644
--- a/chainkit/package.json
+++ b/chainkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@avalanche-sdk/chainkit",
-  "version": "0.3.0-alpha.2",
+  "version": "0.3.0-alpha.3",
   "author": "Sayan Kar",
   "license": "BSD-3-Clause",
   "type": "module",
diff --git a/chainkit/src/funcs/metricsChainsGetICMMetrics.ts b/chainkit/src/funcs/metricsChainsGetICMMetrics.ts
index 53c536d5..ae7c155d 100644
--- a/chainkit/src/funcs/metricsChainsGetICMMetrics.ts
+++ b/chainkit/src/funcs/metricsChainsGetICMMetrics.ts
@@ -37,11 +37,17 @@ import { Result } from "../types/fp.js";
  *
  * <ins>ICMSrcDestMsgCount</ins>: The number of ICM messages sent from the source blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
  *
- * <ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+ * <ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to each destination blockchain within the requested timeInterval starting at the timestamp.
  *
- * <ins>ICMDestMsgCount</ins>: The number of ICM messages received from any blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+ * <ins>ICMSrcAggMsgCount</ins>: The number of ICM messages sent from the source blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
  *
- * <ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+ * <ins>ICMDestMsgCount</ins>: The number of ICM messages received from each blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+ *
+ * <ins>ICMDestAggMsgCount</ins>: The number of ICM messages received from any blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
+ *
+ * <ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain on the provided network.
+ *
+ * <ins>ICMNetworkAggMsgCount</ins>: The number of ICM messages sent on the  provided network.
  */
 export function metricsChainsGetICMMetrics(
   client: AvalancheCore,
diff --git a/chainkit/src/funcs/metricsChainsGetICMRollingWindowMetrics.ts b/chainkit/src/funcs/metricsChainsGetICMRollingWindowMetrics.ts
index bc18f64c..e3782f23 100644
--- a/chainkit/src/funcs/metricsChainsGetICMRollingWindowMetrics.ts
+++ b/chainkit/src/funcs/metricsChainsGetICMRollingWindowMetrics.ts
@@ -31,17 +31,23 @@ import { Result } from "../types/fp.js";
  * Get Interchain Message (ICM) rolling window metrics
  *
  * @remarks
- * Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId. Rolling window metrics are available for the last hour, day, month, year, and all time. You can also request metrics grouped by mainnet or testnet.
+ * Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId or by network. Rolling window metrics are available for the last hour, day, month,  90 days,year, and all time.
  *
  * ### Metrics
  *
  * <ins>ICMSrcDestRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to the destination blockchain within the last hour, day, month, year, and all time.
  *
- * <ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+ * <ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
  *
- * <ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to the destination blockchain within the last hour, day, month, year, and all time.
+ * <ins>ICMSrcRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from the source blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
  *
- * <ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+ * <ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+ *
+ * <ins>ICMDestRollingWindowAggMsgCount</ins>: The number of ICM  messages received from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
+ *
+ * <ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+ *
+ * <ins>ICMNetworkRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
  */
 export function metricsChainsGetICMRollingWindowMetrics(
   client: AvalancheCore,
diff --git a/chainkit/src/funcs/metricsChainsGetMetrics.ts b/chainkit/src/funcs/metricsChainsGetMetrics.ts
index 9c3fd500..cef3d1bf 100644
--- a/chainkit/src/funcs/metricsChainsGetMetrics.ts
+++ b/chainkit/src/funcs/metricsChainsGetMetrics.ts
@@ -55,6 +55,10 @@ import {
  *
  * <ins>cumulativeDeployers</ins>: The cumulative count of unique contract deployers from genesis up until 24 hours after the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
  *
+ * <ins>contracts</ins>: The count of contracts created within the requested timeInterval starting at the timestamp. Contracts are counted by looking for the CREATE, CREATE2, and CREATE3 call types in all transaction traces (aka internal transactions). Only `timeInterval=day` supported.
+ *
+ * <ins>deployers</ins>: The count of unique deployers within the requested timeInterval starting at the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
+ *
  * <ins>gasUsed</ins>: The amount of gas used by transactions within the requested timeInterval starting at the timestamp.
  *
  * <ins>txCount</ins>: The amount of transactions within the requested timeInterval starting at the timestamp.
diff --git a/chainkit/src/lib/config.ts b/chainkit/src/lib/config.ts
index ed336fd6..f6576550 100644
--- a/chainkit/src/lib/config.ts
+++ b/chainkit/src/lib/config.ts
@@ -72,8 +72,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.3.0-alpha.2",
-  genVersion: "2.698.4",
+  sdkVersion: "0.3.0-alpha.3",
+  genVersion: "2.721.3",
   userAgent:
-    "speakeasy-sdk/typescript 0.3.0-alpha.2 2.698.4 1.0.0 @avalanche-sdk/chainkit",
+    "speakeasy-sdk/typescript 0.3.0-alpha.3 2.721.3 1.0.0 @avalanche-sdk/chainkit",
 } as const;
diff --git a/chainkit/src/lib/url.ts b/chainkit/src/lib/url.ts
index 6bc6356e..f3a8de6c 100644
--- a/chainkit/src/lib/url.ts
+++ b/chainkit/src/lib/url.ts
@@ -10,7 +10,7 @@ export function pathToFunc(
   pathPattern: string,
   options?: { charEncoding?: "percent" | "none" },
 ): (params?: Params) => string {
-  const paramRE = /\{([a-zA-Z0-9_]+?)\}/g;
+  const paramRE = /\{([a-zA-Z0-9_][a-zA-Z0-9_-]*?)\}/g;
 
   return function buildURLPath(params: Record<string, unknown> = {}): string {
     return pathPattern.replace(paramRE, function (_, placeholder) {
diff --git a/chainkit/src/mcp-server/mcp-server.ts b/chainkit/src/mcp-server/mcp-server.ts
index 26435900..0ac33741 100644
--- a/chainkit/src/mcp-server/mcp-server.ts
+++ b/chainkit/src/mcp-server/mcp-server.ts
@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.3.0-alpha.2",
+    currentVersion: "0.3.0-alpha.3",
   },
 });
 
diff --git a/chainkit/src/mcp-server/server.ts b/chainkit/src/mcp-server/server.ts
index 838b27b9..63282496 100644
--- a/chainkit/src/mcp-server/server.ts
+++ b/chainkit/src/mcp-server/server.ts
@@ -124,7 +124,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "Avalanche",
-    version: "0.3.0-alpha.2",
+    version: "0.3.0-alpha.3",
   });
 
   const client = new AvalancheCore({
diff --git a/chainkit/src/mcp-server/tools/metricsChainsGetICMMetrics.ts b/chainkit/src/mcp-server/tools/metricsChainsGetICMMetrics.ts
index 1dfb987f..dafe292a 100644
--- a/chainkit/src/mcp-server/tools/metricsChainsGetICMMetrics.ts
+++ b/chainkit/src/mcp-server/tools/metricsChainsGetICMMetrics.ts
@@ -20,11 +20,17 @@ Interchain Message (ICM) metrics are available for all Avalanche L1s on _Mainnet
 
 <ins>ICMSrcDestMsgCount</ins>: The number of ICM messages sent from the source blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+<ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to each destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMDestMsgCount</ins>: The number of ICM messages received from any blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+<ins>ICMSrcAggMsgCount</ins>: The number of ICM messages sent from the source blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
 
-<ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.`,
+<ins>ICMDestMsgCount</ins>: The number of ICM messages received from each blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+
+<ins>ICMDestAggMsgCount</ins>: The number of ICM messages received from any blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
+
+<ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain on the provided network.
+
+<ins>ICMNetworkAggMsgCount</ins>: The number of ICM messages sent on the  provided network.`,
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await metricsChainsGetICMMetrics(
diff --git a/chainkit/src/mcp-server/tools/metricsChainsGetICMRollingWindowMetrics.ts b/chainkit/src/mcp-server/tools/metricsChainsGetICMRollingWindowMetrics.ts
index 347cf997..690b4c9c 100644
--- a/chainkit/src/mcp-server/tools/metricsChainsGetICMRollingWindowMetrics.ts
+++ b/chainkit/src/mcp-server/tools/metricsChainsGetICMRollingWindowMetrics.ts
@@ -16,17 +16,23 @@ export const tool$metricsChainsGetICMRollingWindowMetrics: ToolDefinition<
   name: "metrics-chains-get-ICM-rolling-window-metrics",
   description: `Get Interchain Message (ICM) rolling window metrics
 
-Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId. Rolling window metrics are available for the last hour, day, month, year, and all time. You can also request metrics grouped by mainnet or testnet.
+Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId or by network. Rolling window metrics are available for the last hour, day, month,  90 days,year, and all time.
 
 ### Metrics
 
 <ins>ICMSrcDestRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to the destination blockchain within the last hour, day, month, year, and all time.
 
-<ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+<ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
 
-<ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to the destination blockchain within the last hour, day, month, year, and all time.
+<ins>ICMSrcRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from the source blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
 
-<ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to any destination blockchain within the last hour, day, month, year, and all time.`,
+<ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMDestRollingWindowAggMsgCount</ins>: The number of ICM  messages received from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+
+<ins>ICMNetworkRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.`,
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await metricsChainsGetICMRollingWindowMetrics(
diff --git a/chainkit/src/mcp-server/tools/metricsChainsGetMetrics.ts b/chainkit/src/mcp-server/tools/metricsChainsGetMetrics.ts
index 21013e98..a1a582ee 100644
--- a/chainkit/src/mcp-server/tools/metricsChainsGetMetrics.ts
+++ b/chainkit/src/mcp-server/tools/metricsChainsGetMetrics.ts
@@ -32,6 +32,10 @@ All metrics are updated several times every hour. Each metric data point has a \
 
 <ins>cumulativeDeployers</ins>: The cumulative count of unique contract deployers from genesis up until 24 hours after the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only \`timeInterval=day\` supported.
 
+<ins>contracts</ins>: The count of contracts created within the requested timeInterval starting at the timestamp. Contracts are counted by looking for the CREATE, CREATE2, and CREATE3 call types in all transaction traces (aka internal transactions). Only \`timeInterval=day\` supported.
+
+<ins>deployers</ins>: The count of unique deployers within the requested timeInterval starting at the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only \`timeInterval=day\` supported.
+
 <ins>gasUsed</ins>: The amount of gas used by transactions within the requested timeInterval starting at the timestamp.
 
 <ins>txCount</ins>: The amount of transactions within the requested timeInterval starting at the timestamp.
diff --git a/chainkit/src/models/components/chainmetric.ts b/chainkit/src/models/components/chainmetric.ts
index 7a105c60..546abf42 100644
--- a/chainkit/src/models/components/chainmetric.ts
+++ b/chainkit/src/models/components/chainmetric.ts
@@ -12,6 +12,8 @@ export const ChainMetric = {
   CumulativeAddresses: "cumulativeAddresses",
   CumulativeContracts: "cumulativeContracts",
   CumulativeDeployers: "cumulativeDeployers",
+  Contracts: "contracts",
+  Deployers: "deployers",
   GasUsed: "gasUsed",
   TxCount: "txCount",
   AvgGps: "avgGps",
diff --git a/chainkit/src/models/components/chainrollingwindowmetric.ts b/chainkit/src/models/components/chainrollingwindowmetric.ts
index f5bf3a1b..16b0b12b 100644
--- a/chainkit/src/models/components/chainrollingwindowmetric.ts
+++ b/chainkit/src/models/components/chainrollingwindowmetric.ts
@@ -15,6 +15,8 @@ export const ChainRollingWindowMetric = {
   AvgGasPrice: "avgGasPrice",
   MaxGasPrice: "maxGasPrice",
   FeesPaid: "feesPaid",
+  Contracts: "contracts",
+  Deployers: "deployers",
 } as const;
 export type ChainRollingWindowMetric = ClosedEnum<
   typeof ChainRollingWindowMetric
diff --git a/chainkit/src/models/components/icmmetric.ts b/chainkit/src/models/components/icmmetric.ts
index c38e1831..2f11f9dd 100644
--- a/chainkit/src/models/components/icmmetric.ts
+++ b/chainkit/src/models/components/icmmetric.ts
@@ -8,7 +8,10 @@ import { ClosedEnum } from "../../types/enums.js";
 export const ICMMetric = {
   ICMSrcDestMsgCount: "ICMSrcDestMsgCount",
   ICMSrcAggMsgCount: "ICMSrcAggMsgCount",
+  ICMSrcMsgCount: "ICMSrcMsgCount",
   ICMDestAggMsgCount: "ICMDestAggMsgCount",
+  ICMDestMsgCount: "ICMDestMsgCount",
+  ICMNetworkAggMsgCount: "ICMNetworkAggMsgCount",
   ICMNetworkMsgCount: "ICMNetworkMsgCount",
 } as const;
 export type ICMMetric = ClosedEnum<typeof ICMMetric>;
diff --git a/chainkit/src/models/components/icmrollingwindowmetric.ts b/chainkit/src/models/components/icmrollingwindowmetric.ts
index 5134834a..fa4159a8 100644
--- a/chainkit/src/models/components/icmrollingwindowmetric.ts
+++ b/chainkit/src/models/components/icmrollingwindowmetric.ts
@@ -10,6 +10,9 @@ export const ICMRollingWindowMetric = {
   ICMDestRollingWindowMsgCount: "ICMDestRollingWindowMsgCount",
   ICMSrcDestRollingWindowMsgCount: "ICMSrcDestRollingWindowMsgCount",
   ICMNetworkRollingWindowMsgCount: "ICMNetworkRollingWindowMsgCount",
+  ICMSrcRollingWindowAggMsgCount: "ICMSrcRollingWindowAggMsgCount",
+  ICMDestRollingWindowAggMsgCount: "ICMDestRollingWindowAggMsgCount",
+  ICMNetworkRollingWindowAggMsgCount: "ICMNetworkRollingWindowAggMsgCount",
 } as const;
 export type ICMRollingWindowMetric = ClosedEnum<typeof ICMRollingWindowMetric>;
 
diff --git a/chainkit/src/models/errors/index.ts b/chainkit/src/models/errors/index.ts
index a7ea0acc..ef5b2d96 100644
--- a/chainkit/src/models/errors/index.ts
+++ b/chainkit/src/models/errors/index.ts
@@ -3,6 +3,7 @@
  */
 
 export * from "./avalancheapierror.js";
+export * from "./avalancheerror.js";
 export * from "./badgatewayerror.js";
 export * from "./badrequesterror.js";
 export * from "./forbiddenerror.js";
diff --git a/chainkit/src/sdk/metricschains.ts b/chainkit/src/sdk/metricschains.ts
index 1649e2ed..b05b18f0 100644
--- a/chainkit/src/sdk/metricschains.ts
+++ b/chainkit/src/sdk/metricschains.ts
@@ -74,6 +74,10 @@ export class MetricsChains extends ClientSDK {
    *
    * <ins>cumulativeDeployers</ins>: The cumulative count of unique contract deployers from genesis up until 24 hours after the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
    *
+   * <ins>contracts</ins>: The count of contracts created within the requested timeInterval starting at the timestamp. Contracts are counted by looking for the CREATE, CREATE2, and CREATE3 call types in all transaction traces (aka internal transactions). Only `timeInterval=day` supported.
+   *
+   * <ins>deployers</ins>: The count of unique deployers within the requested timeInterval starting at the timestamp. Deployers counted are those that appear in the “from” field of transaction traces with the CREATE, CREATE2, and CREATE3 call types. Only `timeInterval=day` supported.
+   *
    * <ins>gasUsed</ins>: The amount of gas used by transactions within the requested timeInterval starting at the timestamp.
    *
    * <ins>txCount</ins>: The amount of transactions within the requested timeInterval starting at the timestamp.
@@ -132,11 +136,17 @@ export class MetricsChains extends ClientSDK {
    *
    * <ins>ICMSrcDestMsgCount</ins>: The number of ICM messages sent from the source blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
    *
-   * <ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+   * <ins>ICMSrcMsgCount</ins>: The number of ICM messages sent from the source blockchain to each destination blockchain within the requested timeInterval starting at the timestamp.
+   *
+   * <ins>ICMSrcAggMsgCount</ins>: The number of ICM messages sent from the source blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
+   *
+   * <ins>ICMDestMsgCount</ins>: The number of ICM messages received from each blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
    *
-   * <ins>ICMDestMsgCount</ins>: The number of ICM messages received from any blockchain to the destination blockchain within the requested timeInterval starting at the timestamp.
+   * <ins>ICMDestAggMsgCount</ins>: The number of ICM messages received from any blockchain to all destination blockchain within the requested timeInterval starting at the timestamp.
    *
-   * <ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain to any destination blockchain within the requested timeInterval starting at the timestamp.
+   * <ins>ICMNetworkMsgCount</ins>: The number of ICM messages sent from any blockchain on the provided network.
+   *
+   * <ins>ICMNetworkAggMsgCount</ins>: The number of ICM messages sent on the  provided network.
    */
   async getICMMetrics(
     request: operations.GetICMMetricsByChainRequest,
@@ -153,17 +163,23 @@ export class MetricsChains extends ClientSDK {
    * Get Interchain Message (ICM) rolling window metrics
    *
    * @remarks
-   * Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId. Rolling window metrics are available for the last hour, day, month, year, and all time. You can also request metrics grouped by mainnet or testnet.
+   * Interchain Message (ICM) rolling window metrics are available for all  Avalanche L1s on _Mainnet_ and _Fuji_ (testnet). You can request metrics  by source and/or destination blockchainId or by network. Rolling window metrics are available for the last hour, day, month,  90 days,year, and all time.
    *
    * ### Metrics
    *
    * <ins>ICMSrcDestRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to the destination blockchain within the last hour, day, month, year, and all time.
    *
-   * <ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+   * <ins>ICMSrcRollingWindowMsgCount</ins>: The number of ICM  messages sent from the source blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+   *
+   * <ins>ICMSrcRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from the source blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
+   *
+   * <ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
+   *
+   * <ins>ICMDestRollingWindowAggMsgCount</ins>: The number of ICM  messages received from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
    *
-   * <ins>ICMDestRollingWindowMsgCount</ins>: The number of ICM  messages received from any blockchain to the destination blockchain within the last hour, day, month, year, and all time.
+   * <ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to each destination blockchain within the last hour, day, month, 90 days, year, and all time.
    *
-   * <ins>ICMNetworkRollingWindowMsgCount</ins>: The number of ICM  messages sent from any blockchain to any destination blockchain within the last hour, day, month, year, and all time.
+   * <ins>ICMNetworkRollingWindowAggMsgCount</ins>: The number of ICM  messages sent from any blockchain to all destination blockchain within the last hour, day, month, 90 days, year, and all time.
    */
   async getICMRollingWindowMetrics(
     request: operations.GetICMRollingWindowMetricsByChainRequest,