diff --git a/package.json b/package.json
index f39ff4f..29a8ecc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.76-rc102",
+  "version": "0.20.76-rc103",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index 9f8f9e0..68f5f90 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -66,20 +66,18 @@ export async function generateSwapCalldataWithUnit({
   }
   const wethAddress = safeGet(unit.contracts, "WETH");
   const curveRegistryAddress = safeGet(unit.contracts, "curveRegistry");
-  const { assetToAddress, swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(
+  const { swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(
     unit.blockchainService.getInfo
   )();
 
   const arrayLikePathCopy = cloneDeep(arrayLikePath);
   let path = SafeArray.from(arrayLikePathCopy);
 
-  path = SafeArray.from(arrayLikePathCopy).map((swapInfo) => {
-    swapInfo.assetIn = assetToAddress[swapInfo.assetIn] ?? swapInfo.assetIn
-    swapInfo.assetOut = assetToAddress[swapInfo.assetOut] ?? swapInfo.assetOut
-    swapInfo.assetIn = swapInfo.assetIn.toLowerCase()
-    swapInfo.assetOut = swapInfo.assetOut.toLowerCase()
-    return swapInfo;
-  });
+  path = SafeArray.from(arrayLikePathCopy).map((swapInfo) => ({
+    ...swapInfo,
+    assetIn: swapInfo.assetAddressIn.toLowerCase(),
+    assetOut: swapInfo.assetAddressOut.toLowerCase(),
+  }));
 
   return await generateSwapCalldata({
     amount,
diff --git a/src/services/Aggregator/ws/index.ts b/src/services/Aggregator/ws/index.ts
index 69d214c..0583261 100644
--- a/src/services/Aggregator/ws/index.ts
+++ b/src/services/Aggregator/ws/index.ts
@@ -506,6 +506,8 @@ class AggregatorWS {
               assetIn: path.ai,
               assetOut: path.ao,
               factory: path.f,
+              assetAddressIn: path.aai,
+              assetAddressOut: path.aao,
             })),
             poolOptimal: json.po,
             ...(json.oi) && {
diff --git a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts
index 3c8a5d4..ba32789 100644
--- a/src/services/Aggregator/ws/schemas/swapInfoSchema.ts
+++ b/src/services/Aggregator/ws/schemas/swapInfoSchema.ts
@@ -40,6 +40,8 @@ const swapInfoSchemaBase = baseMessageSchema.extend({
     ai: z.string().toUpperCase(), // asset in
     ao: z.string().toUpperCase(), // asset out
     f: factorySchema, // factory
+    aai: z.string(), // asset address in
+    aao: z.string(), // asset address out
   })),
   usd: z.object({ // USD info of this swap, nullable
     aa: z.number().optional(), // available amount in, USD
diff --git a/src/types.ts b/src/types.ts
index 5828296..a4fd6d6 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -176,6 +176,8 @@ export type SingleSwap = {
   assetIn: string
   assetOut: string
   factory: Factory
+  assetAddressIn: string
+  assetAddressOut: string
 }
 
 export type SwapInfoBase = {