diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
index 7b702283..35b0b2e2 100644
--- a/scripts/configs/pools/arbitrum.ts
+++ b/scripts/configs/pools/arbitrum.ts
@@ -7,6 +7,7 @@ export const arbitrumProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0xADf86b537eF08591c2777E144322E8b0Ca7E82a7',
+    RISK_STEWARD: '0x9EEa1Ba822d204077e9f90a92D30432417184587',
     FREEZING_STEWARD: '0xe59470B3BE3293534603487E00A44C72f2CD466d',
     DEBT_SWAP_ADAPTER: '0x9E8e9D6b0D24216F59043db68BDda1620892f549',
     L2_ENCODER: '0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC',
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
index 85640bc5..69084b2a 100644
--- a/scripts/configs/pools/avalanche.ts
+++ b/scripts/configs/pools/avalanche.ts
@@ -55,6 +55,7 @@ export const avalancheProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5',
+    RISK_STEWARD: '0x5d7e9a32E0c3db609089186bEBC4B9d8Eb86ad2c',
     FREEZING_STEWARD: '0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99',
     DEBT_SWAP_ADAPTER: '0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4',
     CONFIG_ENGINE: '0x5fF5c392C5D397926364789E22f74043f7E42f2b',
diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
index 2aff425f..818a3f8d 100644
--- a/scripts/configs/pools/base.ts
+++ b/scripts/configs/pools/base.ts
@@ -7,6 +7,7 @@ export const baseProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6',
+    RISK_STEWARD: '0x963C0b3dFF5C35b171CcC11DAC006a605E42BeD2',
     FREEZING_STEWARD: '0x4A4c73d563395ad827511F70097d4Ef82E653805',
     DEBT_SWAP_ADAPTER: '0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731',
     WITHDRAW_SWAP_ADAPTER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
diff --git a/scripts/configs/pools/bnb.ts b/scripts/configs/pools/bnb.ts
index 971967fe..e3d29391 100644
--- a/scripts/configs/pools/bnb.ts
+++ b/scripts/configs/pools/bnb.ts
@@ -7,6 +7,7 @@ export const bnbProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0x971F1C94b139AdEdedA729DA636e2B0C433Ff595',
+    RISK_STEWARD: '0x45918bB1D3F73904a30Ffc3eD11CdB1c05eBF726',
     FREEZING_STEWARD: '0x83f15Bc50d1A212576B202f80489502a7cc10412',
     DEBT_SWAP_ADAPTER: '0xAe13e4DA0952f0B8fE04E21df53716fCF799a923',
     CONFIG_ENGINE: '0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b',
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
index c5946036..3707f656 100644
--- a/scripts/configs/pools/ethereum.ts
+++ b/scripts/configs/pools/ethereum.ts
@@ -66,6 +66,7 @@ export const mainnetProtoV3Pool: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778',
+    RISK_STEWARD: '0xF3911922bd054Bf6f4d6A02B8ADAC444921B0c51',
     FREEZING_STEWARD: '0x2eE68ACb6A1319de1b49DC139894644E424fefD6',
     DEBT_SWAP_ADAPTER: '0x8761e0370f94f68Db8EaA731f4fC581f6AD0Bd68',
     DELEGATION_AWARE_A_TOKEN_IMPL_REV_1: '0x21714092D90c7265F52fdfDae068EC11a23C6248',
@@ -99,6 +100,7 @@ export const lidoEthereumMainnetProtoV3Pool: PoolConfig = {
     WETH_GATEWAY: '0x702B6770A81f75964cA5D479F369eFB31dfa7C32',
     CONFIG_ENGINE: '0xC80f057d40Fc7f0A01ad4a634f35520Df8079707',
     CAPS_PLUS_RISK_STEWARD: '0x3843b29118fFC18d5d12EE079d0324E1bF115e69',
+    RISK_STEWARD: '0x45C4f8b32927eFFdf1dA3cA42498504947dd4d0D',
     // STATIC_A_TOKEN_FACTORY: '',
     // FREEZING_STEWARD: '',
     // RATES_FACTORY: '',
diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
index 8e2d622b..6932c8a0 100644
--- a/scripts/configs/pools/gnosis.ts
+++ b/scripts/configs/pools/gnosis.ts
@@ -13,6 +13,7 @@ export const gnosisProtoV3: PoolConfig = {
     WALLET_BALANCE_PROVIDER: '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D',
     WETH_GATEWAY: '0xfE76366A986B72c3f2923e05E6ba07b7de5401e4',
     CAPS_PLUS_RISK_STEWARD: '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658',
+    RISK_STEWARD: '0x0b9cA640284cf2636577703f785D5aEEc466BC56',
     FREEZING_STEWARD: '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5',
     STATIC_A_TOKEN_FACTORY: '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6',
   },
diff --git a/scripts/configs/pools/metis.ts b/scripts/configs/pools/metis.ts
index 8dd022cb..81b69488 100644
--- a/scripts/configs/pools/metis.ts
+++ b/scripts/configs/pools/metis.ts
@@ -7,6 +7,7 @@ export const metisProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731',
+    RISK_STEWARD: '0xF73F2634b43344d86921DA3391d4EF0d5675Dd63',
     FREEZING_STEWARD: '0x2C77153fF4a1e83A8d8D750735FB101ECB55949f',
     L2_ENCODER: '0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9',
     CONFIG_ENGINE: '0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957',
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
index e93cfe75..1a720909 100644
--- a/scripts/configs/pools/optimism.ts
+++ b/scripts/configs/pools/optimism.ts
@@ -7,6 +7,7 @@ export const optimismProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0x5E76E98E0963EcDC6A065d1435F84065b7523f39',
+    RISK_STEWARD: '0x9062F78b631f33D24Ed058cBc116A653452ea82A',
     FREEZING_STEWARD: '0x3829943c53F2d00e20B58475aF19716724bF90Ba',
     DEBT_SWAP_ADAPTER: '0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC',
     L2_ENCODER: '0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC',
diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
index 7fce2c6e..423f99eb 100644
--- a/scripts/configs/pools/polygon.ts
+++ b/scripts/configs/pools/polygon.ts
@@ -26,6 +26,7 @@ export const polygonProtoV3: PoolConfig = {
   POOL_ADDRESSES_PROVIDER: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
   additionalAddresses: {
     CAPS_PLUS_RISK_STEWARD: '0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f',
+    RISK_STEWARD: '0xfF33BEcB9ECFE4328D4f9C37bE0F07b2CFe976E3',
     FREEZING_STEWARD: '0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB',
     DEBT_SWAP_ADAPTER: '0xb58Fd91558fa213D97Ac94C97F831c7289278084',
     CONFIG_ENGINE: '0xAF0C901489790c35D9cef02CFA11123009E81e2a',
diff --git a/scripts/configs/pools/scroll.ts b/scripts/configs/pools/scroll.ts
index 54c48f03..969a06b7 100644
--- a/scripts/configs/pools/scroll.ts
+++ b/scripts/configs/pools/scroll.ts
@@ -22,6 +22,7 @@ export const scrollProtoV3: PoolConfig = {
   additionalAddresses: {
     L2_ENCODER: '0x8714E5ED2d8edD4E88eFf66637C3FE8eCf2B8C40',
     CAPS_PLUS_RISK_STEWARD: '0xc4dca550ef04fd0f8abd4c384575fb8a8123054e',
+    RISK_STEWARD: '0x5E27B8EfDe76814795a07c8a378FcdF09715850b',
     FREEZING_STEWARD: '0xc68d0c511076283075bd5cc9aa61e43673135f37',
     CONFIG_ENGINE: '0x8543A1c3f8D4Cb0D7363047bec613b6b54740B1d',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xFBedc64AeE24921cb43004312B9eF367a4162b57',
diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts
index 1223e095..b7477957 100644
--- a/scripts/configs/types.ts
+++ b/scripts/configs/types.ts
@@ -60,6 +60,7 @@ export interface PoolConfig {
     STATIC_A_TOKEN_FACTORY?: Hex;
     STATIC_A_TOKEN_ORACLE?: Hex;
     CAPS_PLUS_RISK_STEWARD?: Hex;
+    RISK_STEWARD?: Hex;
     FREEZING_STEWARD?: Hex;
     UI_GHO_DATA_PROVIDER?: Hex;
     RATES_FACTORY?: Hex;
diff --git a/src/AaveGovernanceV2.sol b/src/AaveGovernanceV2.sol
index b5993e23..e8a77ba0 100644
--- a/src/AaveGovernanceV2.sol
+++ b/src/AaveGovernanceV2.sol
@@ -21,7 +21,7 @@ library AaveGovernanceV2 {
   // https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
   address internal constant ARBITRUM_BRIDGE_EXECUTOR = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
 
-  // https://explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
+  // https://andromeda-explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
   address internal constant METIS_BRIDGE_EXECUTOR = 0x8EC77963068474a45016938Deb95E603Ca82a029;
 
   // https://basescan.org/address/0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45
diff --git a/src/AaveV2Avalanche.sol b/src/AaveV2Avalanche.sol
index 502e197f..829ca928 100644
--- a/src/AaveV2Avalanche.sol
+++ b/src/AaveV2Avalanche.sol
@@ -6,242 +6,242 @@ import {ILendingPoolAddressesProvider, ILendingPool, ILendingPoolConfigurator, I
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV2Avalanche {
-  // https://snowtrace.io/address/0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f
+  // https://snowscan.xyz/address/0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f
   ILendingPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     ILendingPoolAddressesProvider(0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f);
 
-  // https://snowtrace.io/address/0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C
+  // https://snowscan.xyz/address/0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C
   ILendingPool internal constant POOL = ILendingPool(0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C);
 
-  // https://snowtrace.io/address/0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029
+  // https://snowscan.xyz/address/0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029
   address internal constant POOL_IMPL = 0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029;
 
-  // https://snowtrace.io/address/0x230B618aD4C475393A7239aE03630042281BD86e
+  // https://snowscan.xyz/address/0x230B618aD4C475393A7239aE03630042281BD86e
   ILendingPoolConfigurator internal constant POOL_CONFIGURATOR =
     ILendingPoolConfigurator(0x230B618aD4C475393A7239aE03630042281BD86e);
 
-  // https://snowtrace.io/address/0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E
+  // https://snowscan.xyz/address/0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E
   address internal constant POOL_CONFIGURATOR_IMPL = 0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E;
 
-  // https://snowtrace.io/address/0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89
+  // https://snowscan.xyz/address/0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89
   IAaveOracle internal constant ORACLE = IAaveOracle(0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89);
 
-  // https://snowtrace.io/address/0xc34254642B504484465F38Cb1CC396d45a9c7c80
+  // https://snowscan.xyz/address/0xc34254642B504484465F38Cb1CC396d45a9c7c80
   ILendingRateOracle internal constant LENDING_RATE_ORACLE =
     ILendingRateOracle(0xc34254642B504484465F38Cb1CC396d45a9c7c80);
 
-  // https://snowtrace.io/address/0x65285E9dfab318f57051ab2b139ccCf232945451
+  // https://snowscan.xyz/address/0x65285E9dfab318f57051ab2b139ccCf232945451
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x65285E9dfab318f57051ab2b139ccCf232945451);
 
-  // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+  // https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
   address internal constant POOL_ADMIN = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
-  // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
+  // https://snowscan.xyz/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
   address internal constant EMERGENCY_ADMIN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
 
-  // https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
+  // https://snowscan.xyz/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
   ICollector internal constant COLLECTOR = ICollector(0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0);
 
-  // https://snowtrace.io/address/0x01D83Fe6A10D2f2B7AF17034343746188272cAc9
+  // https://snowscan.xyz/address/0x01D83Fe6A10D2f2B7AF17034343746188272cAc9
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0x01D83Fe6A10D2f2B7AF17034343746188272cAc9;
 
-  // https://snowtrace.io/address/0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26
+  // https://snowscan.xyz/address/0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26
   address internal constant EMISSION_MANAGER = 0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26;
 
-  // https://snowtrace.io/address/0x69A45013F047A65422deFdD0C43f09530D7025c0
+  // https://snowscan.xyz/address/0x69A45013F047A65422deFdD0C43f09530D7025c0
   address internal constant LENDING_POOL_COLLATERAL_MANAGER =
     0x69A45013F047A65422deFdD0C43f09530D7025c0;
 
-  // https://snowtrace.io/address/0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73
+  // https://snowscan.xyz/address/0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73
   address internal constant DEBT_SWAP_ADAPTER = 0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73;
 
-  // https://snowtrace.io/address/0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c
+  // https://snowscan.xyz/address/0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c
   address internal constant CONFIG_ENGINE = 0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c;
 
-  // https://snowtrace.io/address/0xf50a080aC535e531EC33cC05b227E910De2fb1fA
+  // https://snowscan.xyz/address/0xf50a080aC535e531EC33cC05b227E910De2fb1fA
   address internal constant MIGRATION_HELPER = 0xf50a080aC535e531EC33cC05b227E910De2fb1fA;
 
-  // https://snowtrace.io/address/0x4235E22d9C3f28DCDA82b58276cb6370B01265C2
+  // https://snowscan.xyz/address/0x4235E22d9C3f28DCDA82b58276cb6370B01265C2
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x4235E22d9C3f28DCDA82b58276cb6370B01265C2;
 
-  // https://snowtrace.io/address/0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8
+  // https://snowscan.xyz/address/0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8
   address internal constant PROOF_OF_RESERVE = 0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8;
 
-  // https://snowtrace.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
+  // https://snowscan.xyz/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
   address internal constant PROOF_OF_RESERVE_AGGREGATOR =
     0x80f2c02224a2E548FC67c0bF705eBFA825dd5439;
 
-  // https://snowtrace.io/address/0x6e66E50870A93691C1b953788A3219e01fDdeDD7
+  // https://snowscan.xyz/address/0x6e66E50870A93691C1b953788A3219e01fDdeDD7
   address internal constant RATES_FACTORY = 0x6e66E50870A93691C1b953788A3219e01fDdeDD7;
 
-  // https://snowtrace.io/address/0x935b362EE3E1f342cc48118C528AAbee5118F6e6
+  // https://snowscan.xyz/address/0x935b362EE3E1f342cc48118C528AAbee5118F6e6
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x935b362EE3E1f342cc48118C528AAbee5118F6e6;
 
-  // https://snowtrace.io/address/0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5
+  // https://snowscan.xyz/address/0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5;
 
-  // https://snowtrace.io/address/0x11979886A6dBAE27D7a72c49fCF3F23240D647bF
+  // https://snowscan.xyz/address/0x11979886A6dBAE27D7a72c49fCF3F23240D647bF
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x11979886A6dBAE27D7a72c49fCF3F23240D647bF;
 
-  // https://snowtrace.io/address/0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A
+  // https://snowscan.xyz/address/0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A
   address internal constant UI_POOL_DATA_PROVIDER = 0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A;
 
-  // https://snowtrace.io/address/0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6
+  // https://snowscan.xyz/address/0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6
   address internal constant WALLET_BALANCE_PROVIDER = 0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6;
 
-  // https://snowtrace.io/address/0x68c815cB8C8390bc3F2CE99265044dEC9D350C49
+  // https://snowscan.xyz/address/0x68c815cB8C8390bc3F2CE99265044dEC9D350C49
   address internal constant WETH_GATEWAY = 0x68c815cB8C8390bc3F2CE99265044dEC9D350C49;
 }
 
 library AaveV2AvalancheAssets {
-  // https://snowtrace.io/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
+  // https://snowscan.xyz/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
   address internal constant WETHe_UNDERLYING = 0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB;
 
   uint8 internal constant WETHe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x53f7c5869a859F0AeC3D334ee8B4Cf01E3492f21
+  // https://snowscan.xyz/address/0x53f7c5869a859F0AeC3D334ee8B4Cf01E3492f21
   address internal constant WETHe_A_TOKEN = 0x53f7c5869a859F0AeC3D334ee8B4Cf01E3492f21;
 
-  // https://snowtrace.io/address/0x4e575CacB37bc1b5afEc68a0462c4165A5268983
+  // https://snowscan.xyz/address/0x4e575CacB37bc1b5afEc68a0462c4165A5268983
   address internal constant WETHe_V_TOKEN = 0x4e575CacB37bc1b5afEc68a0462c4165A5268983;
 
-  // https://snowtrace.io/address/0x60F6A45006323B97d97cB0a42ac39e2b757ADA63
+  // https://snowscan.xyz/address/0x60F6A45006323B97d97cB0a42ac39e2b757ADA63
   address internal constant WETHe_S_TOKEN = 0x60F6A45006323B97d97cB0a42ac39e2b757ADA63;
 
-  // https://snowtrace.io/address/0x976B3D034E162d8bD72D6b9C989d545b839003b0
+  // https://snowscan.xyz/address/0x976B3D034E162d8bD72D6b9C989d545b839003b0
   address internal constant WETHe_ORACLE = 0x976B3D034E162d8bD72D6b9C989d545b839003b0;
 
-  // https://snowtrace.io/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
+  // https://snowscan.xyz/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
   address internal constant WETHe_INTEREST_RATE_STRATEGY =
     0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647;
 
-  // https://snowtrace.io/address/0xd586E7F844cEa2F87f50152665BCbc2C279D8d70
+  // https://snowscan.xyz/address/0xd586E7F844cEa2F87f50152665BCbc2C279D8d70
   address internal constant DAIe_UNDERLYING = 0xd586E7F844cEa2F87f50152665BCbc2C279D8d70;
 
   uint8 internal constant DAIe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x47AFa96Cdc9fAb46904A55a6ad4bf6660B53c38a
+  // https://snowscan.xyz/address/0x47AFa96Cdc9fAb46904A55a6ad4bf6660B53c38a
   address internal constant DAIe_A_TOKEN = 0x47AFa96Cdc9fAb46904A55a6ad4bf6660B53c38a;
 
-  // https://snowtrace.io/address/0x1852DC24d1a8956a0B356AA18eDe954c7a0Ca5ae
+  // https://snowscan.xyz/address/0x1852DC24d1a8956a0B356AA18eDe954c7a0Ca5ae
   address internal constant DAIe_V_TOKEN = 0x1852DC24d1a8956a0B356AA18eDe954c7a0Ca5ae;
 
-  // https://snowtrace.io/address/0x3676E4EE689D527dDb89812B63fAD0B7501772B3
+  // https://snowscan.xyz/address/0x3676E4EE689D527dDb89812B63fAD0B7501772B3
   address internal constant DAIe_S_TOKEN = 0x3676E4EE689D527dDb89812B63fAD0B7501772B3;
 
-  // https://snowtrace.io/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
+  // https://snowscan.xyz/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
   address internal constant DAIe_ORACLE = 0xf82da795727633aFA9BB0f1B08A87c0F6A38723f;
 
-  // https://snowtrace.io/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
+  // https://snowscan.xyz/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
     0xd814D29bBd27b97d58255632C498c34b25DC72bD;
 
-  // https://snowtrace.io/address/0xc7198437980c041c805A1EDcbA50c1Ce5db95118
+  // https://snowscan.xyz/address/0xc7198437980c041c805A1EDcbA50c1Ce5db95118
   address internal constant USDTe_UNDERLYING = 0xc7198437980c041c805A1EDcbA50c1Ce5db95118;
 
   uint8 internal constant USDTe_DECIMALS = 6;
 
-  // https://snowtrace.io/address/0x532E6537FEA298397212F09A61e03311686f548e
+  // https://snowscan.xyz/address/0x532E6537FEA298397212F09A61e03311686f548e
   address internal constant USDTe_A_TOKEN = 0x532E6537FEA298397212F09A61e03311686f548e;
 
-  // https://snowtrace.io/address/0xfc1AdA7A288d6fCe0d29CcfAAa57Bc9114bb2DbE
+  // https://snowscan.xyz/address/0xfc1AdA7A288d6fCe0d29CcfAAa57Bc9114bb2DbE
   address internal constant USDTe_V_TOKEN = 0xfc1AdA7A288d6fCe0d29CcfAAa57Bc9114bb2DbE;
 
-  // https://snowtrace.io/address/0x9c7B81A867499B7387ed05017a13d4172a0c17bF
+  // https://snowscan.xyz/address/0x9c7B81A867499B7387ed05017a13d4172a0c17bF
   address internal constant USDTe_S_TOKEN = 0x9c7B81A867499B7387ed05017a13d4172a0c17bF;
 
-  // https://snowtrace.io/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
+  // https://snowscan.xyz/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
   address internal constant USDTe_ORACLE = 0x39185f2236A6022b682e8BB93C040d125DA093CF;
 
-  // https://snowtrace.io/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
+  // https://snowscan.xyz/address/0xd814D29bBd27b97d58255632C498c34b25DC72bD
   address internal constant USDTe_INTEREST_RATE_STRATEGY =
     0xd814D29bBd27b97d58255632C498c34b25DC72bD;
 
-  // https://snowtrace.io/address/0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664
+  // https://snowscan.xyz/address/0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664
   address internal constant USDCe_UNDERLYING = 0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664;
 
   uint8 internal constant USDCe_DECIMALS = 6;
 
-  // https://snowtrace.io/address/0x46A51127C3ce23fb7AB1DE06226147F446e4a857
+  // https://snowscan.xyz/address/0x46A51127C3ce23fb7AB1DE06226147F446e4a857
   address internal constant USDCe_A_TOKEN = 0x46A51127C3ce23fb7AB1DE06226147F446e4a857;
 
-  // https://snowtrace.io/address/0x848c080d2700CBE1B894a3374AD5E887E5cCb89c
+  // https://snowscan.xyz/address/0x848c080d2700CBE1B894a3374AD5E887E5cCb89c
   address internal constant USDCe_V_TOKEN = 0x848c080d2700CBE1B894a3374AD5E887E5cCb89c;
 
-  // https://snowtrace.io/address/0x5B14679135dbE8B02015ec3Ca4924a12E4C6C85a
+  // https://snowscan.xyz/address/0x5B14679135dbE8B02015ec3Ca4924a12E4C6C85a
   address internal constant USDCe_S_TOKEN = 0x5B14679135dbE8B02015ec3Ca4924a12E4C6C85a;
 
-  // https://snowtrace.io/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
+  // https://snowscan.xyz/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
   address internal constant USDCe_ORACLE = 0xD8277249e871BE9A402fa286C2C5ec16046dC512;
 
-  // https://snowtrace.io/address/0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716
+  // https://snowscan.xyz/address/0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716
   address internal constant USDCe_INTEREST_RATE_STRATEGY =
     0x6b410D0d53Efc7d4cAF23b9df2F38558998A1716;
 
-  // https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
+  // https://snowscan.xyz/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
   address internal constant AAVEe_UNDERLYING = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;
 
   uint8 internal constant AAVEe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0xD45B7c061016102f9FA220502908f2c0f1add1D7
+  // https://snowscan.xyz/address/0xD45B7c061016102f9FA220502908f2c0f1add1D7
   address internal constant AAVEe_A_TOKEN = 0xD45B7c061016102f9FA220502908f2c0f1add1D7;
 
-  // https://snowtrace.io/address/0x8352E3fd18B8d84D3c8a1b538d788899073c7A8E
+  // https://snowscan.xyz/address/0x8352E3fd18B8d84D3c8a1b538d788899073c7A8E
   address internal constant AAVEe_V_TOKEN = 0x8352E3fd18B8d84D3c8a1b538d788899073c7A8E;
 
-  // https://snowtrace.io/address/0x66904E4F3f44e3925D22ceca401b6F2DA085c98f
+  // https://snowscan.xyz/address/0x66904E4F3f44e3925D22ceca401b6F2DA085c98f
   address internal constant AAVEe_S_TOKEN = 0x66904E4F3f44e3925D22ceca401b6F2DA085c98f;
 
-  // https://snowtrace.io/address/0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED
+  // https://snowscan.xyz/address/0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED
   address internal constant AAVEe_ORACLE = 0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED;
 
-  // https://snowtrace.io/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
+  // https://snowscan.xyz/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
   address internal constant AAVEe_INTEREST_RATE_STRATEGY =
     0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647;
 
-  // https://snowtrace.io/address/0x50b7545627a5162F82A992c33b87aDc75187B218
+  // https://snowscan.xyz/address/0x50b7545627a5162F82A992c33b87aDc75187B218
   address internal constant WBTCe_UNDERLYING = 0x50b7545627a5162F82A992c33b87aDc75187B218;
 
   uint8 internal constant WBTCe_DECIMALS = 8;
 
-  // https://snowtrace.io/address/0x686bEF2417b6Dc32C50a3cBfbCC3bb60E1e9a15D
+  // https://snowscan.xyz/address/0x686bEF2417b6Dc32C50a3cBfbCC3bb60E1e9a15D
   address internal constant WBTCe_A_TOKEN = 0x686bEF2417b6Dc32C50a3cBfbCC3bb60E1e9a15D;
 
-  // https://snowtrace.io/address/0x2dc0E35eC3Ab070B8a175C829e23650Ee604a9eB
+  // https://snowscan.xyz/address/0x2dc0E35eC3Ab070B8a175C829e23650Ee604a9eB
   address internal constant WBTCe_V_TOKEN = 0x2dc0E35eC3Ab070B8a175C829e23650Ee604a9eB;
 
-  // https://snowtrace.io/address/0x3484408989985d68C9700dc1CFDFeAe6d2f658CF
+  // https://snowscan.xyz/address/0x3484408989985d68C9700dc1CFDFeAe6d2f658CF
   address internal constant WBTCe_S_TOKEN = 0x3484408989985d68C9700dc1CFDFeAe6d2f658CF;
 
-  // https://snowtrace.io/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
+  // https://snowscan.xyz/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
   address internal constant WBTCe_ORACLE = 0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743;
 
-  // https://snowtrace.io/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
+  // https://snowscan.xyz/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
   address internal constant WBTCe_INTEREST_RATE_STRATEGY =
     0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647;
 
-  // https://snowtrace.io/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
+  // https://snowscan.xyz/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
   address internal constant WAVAX_UNDERLYING = 0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7;
 
   uint8 internal constant WAVAX_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0xDFE521292EcE2A4f44242efBcD66Bc594CA9714B
+  // https://snowscan.xyz/address/0xDFE521292EcE2A4f44242efBcD66Bc594CA9714B
   address internal constant WAVAX_A_TOKEN = 0xDFE521292EcE2A4f44242efBcD66Bc594CA9714B;
 
-  // https://snowtrace.io/address/0x66A0FE52Fb629a6cB4D10B8580AFDffE888F5Fd4
+  // https://snowscan.xyz/address/0x66A0FE52Fb629a6cB4D10B8580AFDffE888F5Fd4
   address internal constant WAVAX_V_TOKEN = 0x66A0FE52Fb629a6cB4D10B8580AFDffE888F5Fd4;
 
-  // https://snowtrace.io/address/0x2920CD5b8A160b2Addb00Ec5d5f4112255d4ae75
+  // https://snowscan.xyz/address/0x2920CD5b8A160b2Addb00Ec5d5f4112255d4ae75
   address internal constant WAVAX_S_TOKEN = 0x2920CD5b8A160b2Addb00Ec5d5f4112255d4ae75;
 
-  // https://snowtrace.io/address/0x0A77230d17318075983913bC2145DB16C7366156
+  // https://snowscan.xyz/address/0x0A77230d17318075983913bC2145DB16C7366156
   address internal constant WAVAX_ORACLE = 0x0A77230d17318075983913bC2145DB16C7366156;
 
-  // https://snowtrace.io/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
+  // https://snowscan.xyz/address/0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0x6724e923E4bb58fCdF7CEe7A5E7bBb47b99C2647;
 }
diff --git a/src/AaveV2Fuji.sol b/src/AaveV2Fuji.sol
index 5bd7ae67..2048ca62 100644
--- a/src/AaveV2Fuji.sol
+++ b/src/AaveV2Fuji.sol
@@ -6,156 +6,156 @@ import {ILendingPoolAddressesProvider, ILendingPool, ILendingPoolConfigurator, I
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV2Fuji {
-  // https://testnet.snowtrace.io/address/0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f
+  // https://testnet.snowscan.xyz/address/0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f
   ILendingPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     ILendingPoolAddressesProvider(0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f);
 
-  // https://testnet.snowtrace.io/address/0x76cc67FF2CC77821A70ED14321111Ce381C2594D
+  // https://testnet.snowscan.xyz/address/0x76cc67FF2CC77821A70ED14321111Ce381C2594D
   ILendingPool internal constant POOL = ILendingPool(0x76cc67FF2CC77821A70ED14321111Ce381C2594D);
 
-  // https://testnet.snowtrace.io/address/0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1
+  // https://testnet.snowscan.xyz/address/0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1
   address internal constant POOL_IMPL = 0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1;
 
-  // https://testnet.snowtrace.io/address/0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3
+  // https://testnet.snowscan.xyz/address/0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3
   ILendingPoolConfigurator internal constant POOL_CONFIGURATOR =
     ILendingPoolConfigurator(0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3);
 
-  // https://testnet.snowtrace.io/address/0x4f350F6D1688ca1eae4811e182569130a8B6CCaf
+  // https://testnet.snowscan.xyz/address/0x4f350F6D1688ca1eae4811e182569130a8B6CCaf
   address internal constant POOL_CONFIGURATOR_IMPL = 0x4f350F6D1688ca1eae4811e182569130a8B6CCaf;
 
-  // https://testnet.snowtrace.io/address/0xfa4f5B081632c4709667D467F817C09d9008A46A
+  // https://testnet.snowscan.xyz/address/0xfa4f5B081632c4709667D467F817C09d9008A46A
   IAaveOracle internal constant ORACLE = IAaveOracle(0xfa4f5B081632c4709667D467F817C09d9008A46A);
 
-  // https://testnet.snowtrace.io/address/0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8
+  // https://testnet.snowscan.xyz/address/0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8
   ILendingRateOracle internal constant LENDING_RATE_ORACLE =
     ILendingRateOracle(0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8);
 
-  // https://testnet.snowtrace.io/address/0x0668EDE013c1c475724523409b8B6bE633469585
+  // https://testnet.snowscan.xyz/address/0x0668EDE013c1c475724523409b8B6bE633469585
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x0668EDE013c1c475724523409b8B6bE633469585);
 
-  // https://testnet.snowtrace.io/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
+  // https://testnet.snowscan.xyz/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
   address internal constant POOL_ADMIN = 0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e;
 
-  // https://testnet.snowtrace.io/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
+  // https://testnet.snowscan.xyz/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
   address internal constant EMERGENCY_ADMIN = 0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e;
 
-  // https://testnet.snowtrace.io/address/0xB45F5C501A22288dfdb897e5f73E189597e09288
+  // https://testnet.snowscan.xyz/address/0xB45F5C501A22288dfdb897e5f73E189597e09288
   ICollector internal constant COLLECTOR = ICollector(0xB45F5C501A22288dfdb897e5f73E189597e09288);
 
-  // https://testnet.snowtrace.io/address/0xa1EF206fb9a8D8186157FC817fCddcC47727ED55
+  // https://testnet.snowscan.xyz/address/0xa1EF206fb9a8D8186157FC817fCddcC47727ED55
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0xa1EF206fb9a8D8186157FC817fCddcC47727ED55;
 
-  // https://testnet.snowtrace.io/address/0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2
+  // https://testnet.snowscan.xyz/address/0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2
   address internal constant EMISSION_MANAGER = 0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2;
 
-  // https://testnet.snowtrace.io/address/0x007bbD6A554E27EcdA1D10b40974eb7478799EcB
+  // https://testnet.snowscan.xyz/address/0x007bbD6A554E27EcdA1D10b40974eb7478799EcB
   address internal constant LENDING_POOL_COLLATERAL_MANAGER =
     0x007bbD6A554E27EcdA1D10b40974eb7478799EcB;
 
-  // https://testnet.snowtrace.io/address/0x90E5BAc5A98fff59617080848959f44eACB4Cd7B
+  // https://testnet.snowscan.xyz/address/0x90E5BAc5A98fff59617080848959f44eACB4Cd7B
   address internal constant FAUCET = 0x90E5BAc5A98fff59617080848959f44eACB4Cd7B;
 
-  // https://testnet.snowtrace.io/address/0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF
+  // https://testnet.snowscan.xyz/address/0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF;
 
-  // https://testnet.snowtrace.io/address/0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b
+  // https://testnet.snowscan.xyz/address/0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b;
 
-  // https://testnet.snowtrace.io/address/0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45
+  // https://testnet.snowscan.xyz/address/0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45
   address internal constant UI_POOL_DATA_PROVIDER = 0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45;
 
-  // https://testnet.snowtrace.io/address/0x3f5A507B33260a3869878B31FB90F04F451d28e3
+  // https://testnet.snowscan.xyz/address/0x3f5A507B33260a3869878B31FB90F04F451d28e3
   address internal constant WALLET_BALANCE_PROVIDER = 0x3f5A507B33260a3869878B31FB90F04F451d28e3;
 
-  // https://testnet.snowtrace.io/address/0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335
+  // https://testnet.snowscan.xyz/address/0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335
   address internal constant WETH_GATEWAY = 0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335;
 }
 
 library AaveV2FujiAssets {
-  // https://testnet.snowtrace.io/address/0x9668f5f55f2712Dd2dfa316256609b516292D554
+  // https://testnet.snowscan.xyz/address/0x9668f5f55f2712Dd2dfa316256609b516292D554
   address internal constant WETH_UNDERLYING = 0x9668f5f55f2712Dd2dfa316256609b516292D554;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0x2B2927e26b433D92fC598EE79Fa351d6591B8F95
+  // https://testnet.snowscan.xyz/address/0x2B2927e26b433D92fC598EE79Fa351d6591B8F95
   address internal constant WETH_A_TOKEN = 0x2B2927e26b433D92fC598EE79Fa351d6591B8F95;
 
-  // https://testnet.snowtrace.io/address/0xB61CC359E2133b8618cc0319F359F8CA1d3d2b33
+  // https://testnet.snowscan.xyz/address/0xB61CC359E2133b8618cc0319F359F8CA1d3d2b33
   address internal constant WETH_V_TOKEN = 0xB61CC359E2133b8618cc0319F359F8CA1d3d2b33;
 
-  // https://testnet.snowtrace.io/address/0x056AaAc3aAf49d00C4fA10bCf9661D2371427ECB
+  // https://testnet.snowscan.xyz/address/0x056AaAc3aAf49d00C4fA10bCf9661D2371427ECB
   address internal constant WETH_S_TOKEN = 0x056AaAc3aAf49d00C4fA10bCf9661D2371427ECB;
 
-  // https://testnet.snowtrace.io/address/0x86d67c3D38D2bCeE722E601025C25a575021c6EA
+  // https://testnet.snowscan.xyz/address/0x86d67c3D38D2bCeE722E601025C25a575021c6EA
   address internal constant WETH_ORACLE = 0x86d67c3D38D2bCeE722E601025C25a575021c6EA;
 
-  // https://testnet.snowtrace.io/address/0x79bA34079AA04E5d5b25C29df03A3736a8eC7817
+  // https://testnet.snowscan.xyz/address/0x79bA34079AA04E5d5b25C29df03A3736a8eC7817
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x79bA34079AA04E5d5b25C29df03A3736a8eC7817;
 
-  // https://testnet.snowtrace.io/address/0x02823f9B469960Bb3b1de0B3746D4b95B7E35543
+  // https://testnet.snowscan.xyz/address/0x02823f9B469960Bb3b1de0B3746D4b95B7E35543
   address internal constant USDT_UNDERLYING = 0x02823f9B469960Bb3b1de0B3746D4b95B7E35543;
 
   uint8 internal constant USDT_DECIMALS = 6;
 
-  // https://testnet.snowtrace.io/address/0x5f049c41aF3856cBc171F61FB04D58C1e7445f5F
+  // https://testnet.snowscan.xyz/address/0x5f049c41aF3856cBc171F61FB04D58C1e7445f5F
   address internal constant USDT_A_TOKEN = 0x5f049c41aF3856cBc171F61FB04D58C1e7445f5F;
 
-  // https://testnet.snowtrace.io/address/0x6422A7C91A48dD211BF6BdE1Db14d7734f9cbD69
+  // https://testnet.snowscan.xyz/address/0x6422A7C91A48dD211BF6BdE1Db14d7734f9cbD69
   address internal constant USDT_V_TOKEN = 0x6422A7C91A48dD211BF6BdE1Db14d7734f9cbD69;
 
-  // https://testnet.snowtrace.io/address/0x8c5a8eB9dd4e029c1A5B9e740086eB6Cf4Ba7F13
+  // https://testnet.snowscan.xyz/address/0x8c5a8eB9dd4e029c1A5B9e740086eB6Cf4Ba7F13
   address internal constant USDT_S_TOKEN = 0x8c5a8eB9dd4e029c1A5B9e740086eB6Cf4Ba7F13;
 
-  // https://testnet.snowtrace.io/address/0x7898AcCC83587C3C55116c5230C17a6Cd9C71bad
+  // https://testnet.snowscan.xyz/address/0x7898AcCC83587C3C55116c5230C17a6Cd9C71bad
   address internal constant USDT_ORACLE = 0x7898AcCC83587C3C55116c5230C17a6Cd9C71bad;
 
-  // https://testnet.snowtrace.io/address/0xC49F727470A367f29Bf4F55B53b4531a26E61E05
+  // https://testnet.snowscan.xyz/address/0xC49F727470A367f29Bf4F55B53b4531a26E61E05
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0xC49F727470A367f29Bf4F55B53b4531a26E61E05;
 
-  // https://testnet.snowtrace.io/address/0x9C1DCacB57ADa1E9e2D3a8280B7cfC7EB936186F
+  // https://testnet.snowscan.xyz/address/0x9C1DCacB57ADa1E9e2D3a8280B7cfC7EB936186F
   address internal constant WBTC_UNDERLYING = 0x9C1DCacB57ADa1E9e2D3a8280B7cfC7EB936186F;
 
   uint8 internal constant WBTC_DECIMALS = 8;
 
-  // https://testnet.snowtrace.io/address/0xD5B516FDbfb7264676Fd4901B9dD3F707db68733
+  // https://testnet.snowscan.xyz/address/0xD5B516FDbfb7264676Fd4901B9dD3F707db68733
   address internal constant WBTC_A_TOKEN = 0xD5B516FDbfb7264676Fd4901B9dD3F707db68733;
 
-  // https://testnet.snowtrace.io/address/0xbd0601970fE5b35649Fb92f292cde21f0f52eAE9
+  // https://testnet.snowscan.xyz/address/0xbd0601970fE5b35649Fb92f292cde21f0f52eAE9
   address internal constant WBTC_V_TOKEN = 0xbd0601970fE5b35649Fb92f292cde21f0f52eAE9;
 
-  // https://testnet.snowtrace.io/address/0x38A9d8f89Cf87FD4C50dd7B019b9af30c2540512
+  // https://testnet.snowscan.xyz/address/0x38A9d8f89Cf87FD4C50dd7B019b9af30c2540512
   address internal constant WBTC_S_TOKEN = 0x38A9d8f89Cf87FD4C50dd7B019b9af30c2540512;
 
-  // https://testnet.snowtrace.io/address/0x31CF013A08c6Ac228C94551d535d5BAfE19c602a
+  // https://testnet.snowscan.xyz/address/0x31CF013A08c6Ac228C94551d535d5BAfE19c602a
   address internal constant WBTC_ORACLE = 0x31CF013A08c6Ac228C94551d535d5BAfE19c602a;
 
-  // https://testnet.snowtrace.io/address/0xC58e46e20B11192Ecb90a8735362e3b633960bf5
+  // https://testnet.snowscan.xyz/address/0xC58e46e20B11192Ecb90a8735362e3b633960bf5
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0xC58e46e20B11192Ecb90a8735362e3b633960bf5;
 
-  // https://testnet.snowtrace.io/address/0xd00ae08403B9bbb9124bB305C09058E32C39A48c
+  // https://testnet.snowscan.xyz/address/0xd00ae08403B9bbb9124bB305C09058E32C39A48c
   address internal constant WAVAX_UNDERLYING = 0xd00ae08403B9bbb9124bB305C09058E32C39A48c;
 
   uint8 internal constant WAVAX_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0xf8C78Ba24DD965487f4472dfb280c46800a0c9B6
+  // https://testnet.snowscan.xyz/address/0xf8C78Ba24DD965487f4472dfb280c46800a0c9B6
   address internal constant WAVAX_A_TOKEN = 0xf8C78Ba24DD965487f4472dfb280c46800a0c9B6;
 
-  // https://testnet.snowtrace.io/address/0x333f38B8E76077539Cde1d50Fb5dE0AC6F7E6837
+  // https://testnet.snowscan.xyz/address/0x333f38B8E76077539Cde1d50Fb5dE0AC6F7E6837
   address internal constant WAVAX_V_TOKEN = 0x333f38B8E76077539Cde1d50Fb5dE0AC6F7E6837;
 
-  // https://testnet.snowtrace.io/address/0xE1c2E4E85d34CAed5c29447135c3ADfaD30364f1
+  // https://testnet.snowscan.xyz/address/0xE1c2E4E85d34CAed5c29447135c3ADfaD30364f1
   address internal constant WAVAX_S_TOKEN = 0xE1c2E4E85d34CAed5c29447135c3ADfaD30364f1;
 
-  // https://testnet.snowtrace.io/address/0x5498BB86BC934c8D34FDA08E81D444153d0D06aD
+  // https://testnet.snowscan.xyz/address/0x5498BB86BC934c8D34FDA08E81D444153d0D06aD
   address internal constant WAVAX_ORACLE = 0x5498BB86BC934c8D34FDA08E81D444153d0D06aD;
 
-  // https://testnet.snowtrace.io/address/0xd720420A83FefC64aE9Ff776e5B36621D0989AB7
+  // https://testnet.snowscan.xyz/address/0xd720420A83FefC64aE9Ff776e5B36621D0989AB7
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0xd720420A83FefC64aE9Ff776e5B36621D0989AB7;
 }
diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
index fe3c94bf..6d79bd36 100644
--- a/src/AaveV3Arbitrum.sol
+++ b/src/AaveV3Arbitrum.sol
@@ -64,6 +64,9 @@ library AaveV3Arbitrum {
   // https://arbiscan.io/address/0xADf86b537eF08591c2777E144322E8b0Ca7E82a7
   address internal constant CAPS_PLUS_RISK_STEWARD = 0xADf86b537eF08591c2777E144322E8b0Ca7E82a7;
 
+  // https://arbiscan.io/address/0x9EEa1Ba822d204077e9f90a92D30432417184587
+  address internal constant RISK_STEWARD = 0x9EEa1Ba822d204077e9f90a92D30432417184587;
+
   // https://arbiscan.io/address/0xe59470B3BE3293534603487E00A44C72f2CD466d
   address internal constant FREEZING_STEWARD = 0xe59470B3BE3293534603487E00A44C72f2CD466d;
 
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 00ad116d..fa3c07e7 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -6,393 +6,396 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Avalanche {
-  // https://snowtrace.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
+  // https://snowscan.xyz/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb);
 
-  // https://snowtrace.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
+  // https://snowscan.xyz/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
   IPool internal constant POOL = IPool(0x794a61358D6845594F94dc1DB02A252b5b4814aD);
 
-  // https://snowtrace.io/address/0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477
+  // https://snowscan.xyz/address/0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477
   address internal constant POOL_IMPL = 0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477;
 
-  // https://snowtrace.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
+  // https://snowscan.xyz/address/0x8145eddDf43f50276641b55bd3AD95944510021E
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x8145eddDf43f50276641b55bd3AD95944510021E);
 
-  // https://snowtrace.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
+  // https://snowscan.xyz/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
   address internal constant POOL_CONFIGURATOR_IMPL = 0x419226e0Ad27f3B2019123f7246a364622b018e5;
 
-  // https://snowtrace.io/address/0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C
+  // https://snowscan.xyz/address/0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C
   IAaveOracle internal constant ORACLE = IAaveOracle(0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C);
 
-  // https://snowtrace.io/address/0x7deEB8aCE4220643D8edeC871a23807E4d006eE5
+  // https://snowscan.xyz/address/0x7deEB8aCE4220643D8edeC871a23807E4d006eE5
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0x7deEB8aCE4220643D8edeC871a23807E4d006eE5);
 
-  // https://snowtrace.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
+  // https://snowscan.xyz/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+  // https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
   address internal constant ACL_ADMIN = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
-  // https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
+  // https://snowscan.xyz/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
   ICollector internal constant COLLECTOR = ICollector(0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0);
 
-  // https://snowtrace.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
+  // https://snowscan.xyz/address/0x929EC64c34a17401F460460D4B9390518E5B473e
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0x929EC64c34a17401F460460D4B9390518E5B473e;
 
-  // https://snowtrace.io/address/0x1E81af09001aD208BDa68FF022544dB2102A752d
+  // https://snowscan.xyz/address/0x1E81af09001aD208BDa68FF022544dB2102A752d
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_2 = 0x1E81af09001aD208BDa68FF022544dB2102A752d;
 
-  // https://snowtrace.io/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
+  // https://snowscan.xyz/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_2 =
     0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24;
 
-  // https://snowtrace.io/address/0xccf12894957E637Bd69693B12F3ba12b539C2D11
+  // https://snowscan.xyz/address/0xccf12894957E637Bd69693B12F3ba12b539C2D11
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_3 =
     0xccf12894957E637Bd69693B12F3ba12b539C2D11;
 
-  // https://snowtrace.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
+  // https://snowscan.xyz/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
   address internal constant EMISSION_MANAGER = 0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73;
 
-  // https://snowtrace.io/address/0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5
+  // https://snowscan.xyz/address/0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5
   address internal constant CAPS_PLUS_RISK_STEWARD = 0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5;
 
-  // https://snowtrace.io/address/0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99
+  // https://snowscan.xyz/address/0x5d7e9a32E0c3db609089186bEBC4B9d8Eb86ad2c
+  address internal constant RISK_STEWARD = 0x5d7e9a32E0c3db609089186bEBC4B9d8Eb86ad2c;
+
+  // https://snowscan.xyz/address/0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99
   address internal constant FREEZING_STEWARD = 0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99;
 
-  // https://snowtrace.io/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
+  // https://snowscan.xyz/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
   address internal constant DEBT_SWAP_ADAPTER = 0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4;
 
-  // https://snowtrace.io/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
+  // https://snowscan.xyz/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
   address internal constant CONFIG_ENGINE = 0x5fF5c392C5D397926364789E22f74043f7E42f2b;
 
-  // https://snowtrace.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
+  // https://snowscan.xyz/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x770ef9f4fe897e59daCc474EF11238303F9552b6;
 
-  // https://snowtrace.io/address/0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc
+  // https://snowscan.xyz/address/0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc
   address internal constant PROOF_OF_RESERVE = 0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc;
 
-  // https://snowtrace.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
+  // https://snowscan.xyz/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
   address internal constant PROOF_OF_RESERVE_AGGREGATOR =
     0x80f2c02224a2E548FC67c0bF705eBFA825dd5439;
 
-  // https://snowtrace.io/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
+  // https://snowscan.xyz/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9;
 
-  // https://snowtrace.io/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
+  // https://snowscan.xyz/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
   address internal constant STATIC_A_TOKEN_FACTORY = 0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19;
 
-  // https://snowtrace.io/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
+  // https://snowscan.xyz/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A;
 
-  // https://snowtrace.io/address/0x265d414f80b0fca9505710e6F16dB4b67555D365
+  // https://snowscan.xyz/address/0x265d414f80b0fca9505710e6F16dB4b67555D365
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x265d414f80b0fca9505710e6F16dB4b67555D365;
 
-  // https://snowtrace.io/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
+  // https://snowscan.xyz/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
   address internal constant UI_POOL_DATA_PROVIDER = 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9;
 
-  // https://snowtrace.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
+  // https://snowscan.xyz/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://snowtrace.io/address/0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0
+  // https://snowscan.xyz/address/0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0
   address internal constant WETH_GATEWAY = 0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0;
 
-  // https://snowtrace.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
+  // https://snowscan.xyz/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
 }
 
 library AaveV3AvalancheAssets {
-  // https://snowtrace.io/address/0xd586E7F844cEa2F87f50152665BCbc2C279D8d70
+  // https://snowscan.xyz/address/0xd586E7F844cEa2F87f50152665BCbc2C279D8d70
   address internal constant DAIe_UNDERLYING = 0xd586E7F844cEa2F87f50152665BCbc2C279D8d70;
 
   uint8 internal constant DAIe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE
+  // https://snowscan.xyz/address/0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE
   address internal constant DAIe_A_TOKEN = 0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE;
 
-  // https://snowtrace.io/address/0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC
+  // https://snowscan.xyz/address/0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC
   address internal constant DAIe_V_TOKEN = 0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC;
 
-  // https://snowtrace.io/address/0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B
+  // https://snowscan.xyz/address/0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B
   address internal constant DAIe_S_TOKEN = 0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B;
 
-  // https://snowtrace.io/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
+  // https://snowscan.xyz/address/0xf82da795727633aFA9BB0f1B08A87c0F6A38723f
   address internal constant DAIe_ORACLE = 0xf82da795727633aFA9BB0f1B08A87c0F6A38723f;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888
+  // https://snowscan.xyz/address/0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888
   address internal constant DAIe_STATA_TOKEN = 0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888;
 
-  // https://snowtrace.io/address/0x5947BB275c521040051D82396192181b413227A3
+  // https://snowscan.xyz/address/0x5947BB275c521040051D82396192181b413227A3
   address internal constant LINKe_UNDERLYING = 0x5947BB275c521040051D82396192181b413227A3;
 
   uint8 internal constant LINKe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530
+  // https://snowscan.xyz/address/0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530
   address internal constant LINKe_A_TOKEN = 0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530;
 
-  // https://snowtrace.io/address/0x953A573793604aF8d41F306FEb8274190dB4aE0e
+  // https://snowscan.xyz/address/0x953A573793604aF8d41F306FEb8274190dB4aE0e
   address internal constant LINKe_V_TOKEN = 0x953A573793604aF8d41F306FEb8274190dB4aE0e;
 
-  // https://snowtrace.io/address/0x89D976629b7055ff1ca02b927BA3e020F22A44e4
+  // https://snowscan.xyz/address/0x89D976629b7055ff1ca02b927BA3e020F22A44e4
   address internal constant LINKe_S_TOKEN = 0x89D976629b7055ff1ca02b927BA3e020F22A44e4;
 
-  // https://snowtrace.io/address/0x49ccd9ca821EfEab2b98c60dC60F518E765EDe9a
+  // https://snowscan.xyz/address/0x49ccd9ca821EfEab2b98c60dC60F518E765EDe9a
   address internal constant LINKe_ORACLE = 0x49ccd9ca821EfEab2b98c60dC60F518E765EDe9a;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant LINKe_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x8B773Ab77Dff01985D438961dBCE58382a70cA52
+  // https://snowscan.xyz/address/0x8B773Ab77Dff01985D438961dBCE58382a70cA52
   address internal constant LINKe_STATA_TOKEN = 0x8B773Ab77Dff01985D438961dBCE58382a70cA52;
 
-  // https://snowtrace.io/address/0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E
+  // https://snowscan.xyz/address/0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E
   address internal constant USDC_UNDERLYING = 0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E;
 
   uint8 internal constant USDC_DECIMALS = 6;
 
-  // https://snowtrace.io/address/0x625E7708f30cA75bfd92586e17077590C60eb4cD
+  // https://snowscan.xyz/address/0x625E7708f30cA75bfd92586e17077590C60eb4cD
   address internal constant USDC_A_TOKEN = 0x625E7708f30cA75bfd92586e17077590C60eb4cD;
 
-  // https://snowtrace.io/address/0xFCCf3cAbbe80101232d343252614b6A3eE81C989
+  // https://snowscan.xyz/address/0xFCCf3cAbbe80101232d343252614b6A3eE81C989
   address internal constant USDC_V_TOKEN = 0xFCCf3cAbbe80101232d343252614b6A3eE81C989;
 
-  // https://snowtrace.io/address/0x307ffe186F84a3bc2613D1eA417A5737D69A7007
+  // https://snowscan.xyz/address/0x307ffe186F84a3bc2613D1eA417A5737D69A7007
   address internal constant USDC_S_TOKEN = 0x307ffe186F84a3bc2613D1eA417A5737D69A7007;
 
-  // https://snowtrace.io/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
+  // https://snowscan.xyz/address/0xD8277249e871BE9A402fa286C2C5ec16046dC512
   address internal constant USDC_ORACLE = 0xD8277249e871BE9A402fa286C2C5ec16046dC512;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4
+  // https://snowscan.xyz/address/0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4
   address internal constant USDC_STATA_TOKEN = 0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4;
 
-  // https://snowtrace.io/address/0x50b7545627a5162F82A992c33b87aDc75187B218
+  // https://snowscan.xyz/address/0x50b7545627a5162F82A992c33b87aDc75187B218
   address internal constant WBTCe_UNDERLYING = 0x50b7545627a5162F82A992c33b87aDc75187B218;
 
   uint8 internal constant WBTCe_DECIMALS = 8;
 
-  // https://snowtrace.io/address/0x078f358208685046a11C85e8ad32895DED33A249
+  // https://snowscan.xyz/address/0x078f358208685046a11C85e8ad32895DED33A249
   address internal constant WBTCe_A_TOKEN = 0x078f358208685046a11C85e8ad32895DED33A249;
 
-  // https://snowtrace.io/address/0x92b42c66840C7AD907b4BF74879FF3eF7c529473
+  // https://snowscan.xyz/address/0x92b42c66840C7AD907b4BF74879FF3eF7c529473
   address internal constant WBTCe_V_TOKEN = 0x92b42c66840C7AD907b4BF74879FF3eF7c529473;
 
-  // https://snowtrace.io/address/0x633b207Dd676331c413D4C013a6294B0FE47cD0e
+  // https://snowscan.xyz/address/0x633b207Dd676331c413D4C013a6294B0FE47cD0e
   address internal constant WBTCe_S_TOKEN = 0x633b207Dd676331c413D4C013a6294B0FE47cD0e;
 
-  // https://snowtrace.io/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
+  // https://snowscan.xyz/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
   address internal constant WBTCe_ORACLE = 0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant WBTCe_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE
+  // https://snowscan.xyz/address/0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE
   address internal constant WBTCe_STATA_TOKEN = 0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE;
 
-  // https://snowtrace.io/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
+  // https://snowscan.xyz/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
   address internal constant WETHe_UNDERLYING = 0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB;
 
   uint8 internal constant WETHe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8
+  // https://snowscan.xyz/address/0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8
   address internal constant WETHe_A_TOKEN = 0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8;
 
-  // https://snowtrace.io/address/0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351
+  // https://snowscan.xyz/address/0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351
   address internal constant WETHe_V_TOKEN = 0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351;
 
-  // https://snowtrace.io/address/0xD8Ad37849950903571df17049516a5CD4cbE55F6
+  // https://snowscan.xyz/address/0xD8Ad37849950903571df17049516a5CD4cbE55F6
   address internal constant WETHe_S_TOKEN = 0xD8Ad37849950903571df17049516a5CD4cbE55F6;
 
-  // https://snowtrace.io/address/0x976B3D034E162d8bD72D6b9C989d545b839003b0
+  // https://snowscan.xyz/address/0x976B3D034E162d8bD72D6b9C989d545b839003b0
   address internal constant WETHe_ORACLE = 0x976B3D034E162d8bD72D6b9C989d545b839003b0;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant WETHe_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731
+  // https://snowscan.xyz/address/0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731
   address internal constant WETHe_STATA_TOKEN = 0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731;
 
-  // https://snowtrace.io/address/0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7
+  // https://snowscan.xyz/address/0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7
   address internal constant USDt_UNDERLYING = 0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7;
 
   uint8 internal constant USDt_DECIMALS = 6;
 
-  // https://snowtrace.io/address/0x6ab707Aca953eDAeFBc4fD23bA73294241490620
+  // https://snowscan.xyz/address/0x6ab707Aca953eDAeFBc4fD23bA73294241490620
   address internal constant USDt_A_TOKEN = 0x6ab707Aca953eDAeFBc4fD23bA73294241490620;
 
-  // https://snowtrace.io/address/0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7
+  // https://snowscan.xyz/address/0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7
   address internal constant USDt_V_TOKEN = 0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7;
 
-  // https://snowtrace.io/address/0x70eFfc565DB6EEf7B927610155602d31b670e802
+  // https://snowscan.xyz/address/0x70eFfc565DB6EEf7B927610155602d31b670e802
   address internal constant USDt_S_TOKEN = 0x70eFfc565DB6EEf7B927610155602d31b670e802;
 
-  // https://snowtrace.io/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
+  // https://snowscan.xyz/address/0x39185f2236A6022b682e8BB93C040d125DA093CF
   address internal constant USDt_ORACLE = 0x39185f2236A6022b682e8BB93C040d125DA093CF;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant USDt_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x5525Ee69BC1e354B356864187De486fab5AD67d7
+  // https://snowscan.xyz/address/0x5525Ee69BC1e354B356864187De486fab5AD67d7
   address internal constant USDt_STATA_TOKEN = 0x5525Ee69BC1e354B356864187De486fab5AD67d7;
 
-  // https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
+  // https://snowscan.xyz/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
   address internal constant AAVEe_UNDERLYING = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;
 
   uint8 internal constant AAVEe_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0xf329e36C7bF6E5E86ce2150875a84Ce77f477375
+  // https://snowscan.xyz/address/0xf329e36C7bF6E5E86ce2150875a84Ce77f477375
   address internal constant AAVEe_A_TOKEN = 0xf329e36C7bF6E5E86ce2150875a84Ce77f477375;
 
-  // https://snowtrace.io/address/0xE80761Ea617F66F96274eA5e8c37f03960ecC679
+  // https://snowscan.xyz/address/0xE80761Ea617F66F96274eA5e8c37f03960ecC679
   address internal constant AAVEe_V_TOKEN = 0xE80761Ea617F66F96274eA5e8c37f03960ecC679;
 
-  // https://snowtrace.io/address/0xfAeF6A702D15428E588d4C0614AEFb4348D83D48
+  // https://snowscan.xyz/address/0xfAeF6A702D15428E588d4C0614AEFb4348D83D48
   address internal constant AAVEe_S_TOKEN = 0xfAeF6A702D15428E588d4C0614AEFb4348D83D48;
 
-  // https://snowtrace.io/address/0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED
+  // https://snowscan.xyz/address/0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED
   address internal constant AAVEe_ORACLE = 0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant AAVEe_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA
+  // https://snowscan.xyz/address/0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA
   address internal constant AAVEe_STATA_TOKEN = 0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA;
 
-  // https://snowtrace.io/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
+  // https://snowscan.xyz/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
   address internal constant WAVAX_UNDERLYING = 0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7;
 
   uint8 internal constant WAVAX_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97
+  // https://snowscan.xyz/address/0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97
   address internal constant WAVAX_A_TOKEN = 0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97;
 
-  // https://snowtrace.io/address/0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8
+  // https://snowscan.xyz/address/0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8
   address internal constant WAVAX_V_TOKEN = 0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8;
 
-  // https://snowtrace.io/address/0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E
+  // https://snowscan.xyz/address/0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E
   address internal constant WAVAX_S_TOKEN = 0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E;
 
-  // https://snowtrace.io/address/0x0A77230d17318075983913bC2145DB16C7366156
+  // https://snowscan.xyz/address/0x0A77230d17318075983913bC2145DB16C7366156
   address internal constant WAVAX_ORACLE = 0x0A77230d17318075983913bC2145DB16C7366156;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d
+  // https://snowscan.xyz/address/0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d
   address internal constant WAVAX_STATA_TOKEN = 0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d;
 
-  // https://snowtrace.io/address/0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE
+  // https://snowscan.xyz/address/0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE
   address internal constant sAVAX_UNDERLYING = 0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE;
 
   uint8 internal constant sAVAX_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf
+  // https://snowscan.xyz/address/0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf
   address internal constant sAVAX_A_TOKEN = 0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf;
 
-  // https://snowtrace.io/address/0x77CA01483f379E58174739308945f044e1a764dc
+  // https://snowscan.xyz/address/0x77CA01483f379E58174739308945f044e1a764dc
   address internal constant sAVAX_V_TOKEN = 0x77CA01483f379E58174739308945f044e1a764dc;
 
-  // https://snowtrace.io/address/0x08Cb71192985E936C7Cd166A8b268035e400c3c3
+  // https://snowscan.xyz/address/0x08Cb71192985E936C7Cd166A8b268035e400c3c3
   address internal constant sAVAX_S_TOKEN = 0x08Cb71192985E936C7Cd166A8b268035e400c3c3;
 
-  // https://snowtrace.io/address/0xB2B332f27e4B7305649a228C31Ed9858c5a6bAD9
+  // https://snowscan.xyz/address/0xB2B332f27e4B7305649a228C31Ed9858c5a6bAD9
   address internal constant sAVAX_ORACLE = 0xB2B332f27e4B7305649a228C31Ed9858c5a6bAD9;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant sAVAX_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f
+  // https://snowscan.xyz/address/0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f
   address internal constant sAVAX_STATA_TOKEN = 0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f;
 
-  // https://snowtrace.io/address/0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64
+  // https://snowscan.xyz/address/0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64
   address internal constant FRAX_UNDERLYING = 0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64;
 
   uint8 internal constant FRAX_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA
+  // https://snowscan.xyz/address/0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA
   address internal constant FRAX_A_TOKEN = 0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA;
 
-  // https://snowtrace.io/address/0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907
+  // https://snowscan.xyz/address/0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907
   address internal constant FRAX_V_TOKEN = 0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907;
 
-  // https://snowtrace.io/address/0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841
+  // https://snowscan.xyz/address/0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841
   address internal constant FRAX_S_TOKEN = 0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841;
 
-  // https://snowtrace.io/address/0x6208576378D06ce69A27987b7A524A9B15d499a4
+  // https://snowscan.xyz/address/0x6208576378D06ce69A27987b7A524A9B15d499a4
   address internal constant FRAX_ORACLE = 0x6208576378D06ce69A27987b7A524A9B15d499a4;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73
+  // https://snowscan.xyz/address/0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73
   address internal constant FRAX_STATA_TOKEN = 0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73;
 
-  // https://snowtrace.io/address/0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b
+  // https://snowscan.xyz/address/0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b
   address internal constant MAI_UNDERLYING = 0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b;
 
   uint8 internal constant MAI_DECIMALS = 18;
 
-  // https://snowtrace.io/address/0x8Eb270e296023E9D92081fdF967dDd7878724424
+  // https://snowscan.xyz/address/0x8Eb270e296023E9D92081fdF967dDd7878724424
   address internal constant MAI_A_TOKEN = 0x8Eb270e296023E9D92081fdF967dDd7878724424;
 
-  // https://snowtrace.io/address/0xCE186F6Cccb0c955445bb9d10C59caE488Fea559
+  // https://snowscan.xyz/address/0xCE186F6Cccb0c955445bb9d10C59caE488Fea559
   address internal constant MAI_V_TOKEN = 0xCE186F6Cccb0c955445bb9d10C59caE488Fea559;
 
-  // https://snowtrace.io/address/0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc
+  // https://snowscan.xyz/address/0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc
   address internal constant MAI_S_TOKEN = 0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc;
 
-  // https://snowtrace.io/address/0xCcC55Db26B78a19Dba1beE0066F9c1665575439A
+  // https://snowscan.xyz/address/0xCcC55Db26B78a19Dba1beE0066F9c1665575439A
   address internal constant MAI_ORACLE = 0xCcC55Db26B78a19Dba1beE0066F9c1665575439A;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant MAI_INTEREST_RATE_STRATEGY = 0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce
+  // https://snowscan.xyz/address/0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce
   address internal constant MAI_STATA_TOKEN = 0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce;
 
-  // https://snowtrace.io/address/0x152b9d0FdC40C096757F570A51E494bd4b943E50
+  // https://snowscan.xyz/address/0x152b9d0FdC40C096757F570A51E494bd4b943E50
   address internal constant BTCb_UNDERLYING = 0x152b9d0FdC40C096757F570A51E494bd4b943E50;
 
   uint8 internal constant BTCb_DECIMALS = 8;
 
-  // https://snowtrace.io/address/0x8ffDf2DE812095b1D19CB146E4c004587C0A0692
+  // https://snowscan.xyz/address/0x8ffDf2DE812095b1D19CB146E4c004587C0A0692
   address internal constant BTCb_A_TOKEN = 0x8ffDf2DE812095b1D19CB146E4c004587C0A0692;
 
-  // https://snowtrace.io/address/0xA8669021776Bc142DfcA87c21b4A52595bCbB40a
+  // https://snowscan.xyz/address/0xA8669021776Bc142DfcA87c21b4A52595bCbB40a
   address internal constant BTCb_V_TOKEN = 0xA8669021776Bc142DfcA87c21b4A52595bCbB40a;
 
-  // https://snowtrace.io/address/0xa5e408678469d23efDB7694b1B0A85BB0669e8bd
+  // https://snowscan.xyz/address/0xa5e408678469d23efDB7694b1B0A85BB0669e8bd
   address internal constant BTCb_S_TOKEN = 0xa5e408678469d23efDB7694b1B0A85BB0669e8bd;
 
-  // https://snowtrace.io/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
+  // https://snowscan.xyz/address/0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743
   address internal constant BTCb_ORACLE = 0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743;
 
-  // https://snowtrace.io/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
+  // https://snowscan.xyz/address/0x43dD6f474e436348db037BAeA24eD02E68c475bE
   address internal constant BTCb_INTEREST_RATE_STRATEGY =
     0x43dD6f474e436348db037BAeA24eD02E68c475bE;
 
-  // https://snowtrace.io/address/0x34d768cc830c32DcD743321c09A2A702651bF9a2
+  // https://snowscan.xyz/address/0x34d768cc830c32DcD743321c09A2A702651bF9a2
   address internal constant BTCb_STATA_TOKEN = 0x34d768cc830c32DcD743321c09A2A702651bF9a2;
 }
 
@@ -405,24 +408,24 @@ library AaveV3AvalancheEModes {
 }
 
 library AaveV3AvalancheExternalLibraries {
-  // https://snowtrace.io/address/0x6DA8d7EF0625e965dafc393793C048096392d4a5
+  // https://snowscan.xyz/address/0x6DA8d7EF0625e965dafc393793C048096392d4a5
   address internal constant FLASHLOAN_LOGIC = 0x6DA8d7EF0625e965dafc393793C048096392d4a5;
 
-  // https://snowtrace.io/address/0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1
+  // https://snowscan.xyz/address/0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1
   address internal constant BORROW_LOGIC = 0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1;
 
-  // https://snowtrace.io/address/0xca2385754bCa5d632F5160B560352aBd12029685
+  // https://snowscan.xyz/address/0xca2385754bCa5d632F5160B560352aBd12029685
   address internal constant BRIDGE_LOGIC = 0xca2385754bCa5d632F5160B560352aBd12029685;
 
-  // https://snowtrace.io/address/0x12959a64470Dd003590Bb1EcFC436dddE7608724
+  // https://snowscan.xyz/address/0x12959a64470Dd003590Bb1EcFC436dddE7608724
   address internal constant E_MODE_LOGIC = 0x12959a64470Dd003590Bb1EcFC436dddE7608724;
 
-  // https://snowtrace.io/address/0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e
+  // https://snowscan.xyz/address/0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e
   address internal constant LIQUIDATION_LOGIC = 0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e;
 
-  // https://snowtrace.io/address/0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975
+  // https://snowscan.xyz/address/0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975
   address internal constant POOL_LOGIC = 0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975;
 
-  // https://snowtrace.io/address/0x9336943ecd91C201D9ED5A21562b34Aef710052f
+  // https://snowscan.xyz/address/0x9336943ecd91C201D9ED5A21562b34Aef710052f
   address internal constant SUPPLY_LOGIC = 0x9336943ecd91C201D9ED5A21562b34Aef710052f;
 }
diff --git a/src/AaveV3BNB.sol b/src/AaveV3BNB.sol
index eab430a0..d9353bf1 100644
--- a/src/AaveV3BNB.sol
+++ b/src/AaveV3BNB.sol
@@ -61,6 +61,9 @@ library AaveV3BNB {
   // https://bscscan.com/address/0x971F1C94b139AdEdedA729DA636e2B0C433Ff595
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x971F1C94b139AdEdedA729DA636e2B0C433Ff595;
 
+  // https://bscscan.com/address/0x45918bB1D3F73904a30Ffc3eD11CdB1c05eBF726
+  address internal constant RISK_STEWARD = 0x45918bB1D3F73904a30Ffc3eD11CdB1c05eBF726;
+
   // https://bscscan.com/address/0x83f15Bc50d1A212576B202f80489502a7cc10412
   address internal constant FREEZING_STEWARD = 0x83f15Bc50d1A212576B202f80489502a7cc10412;
 
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 0bd83e5a..dbb18b37 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -64,6 +64,9 @@ library AaveV3Base {
   // https://basescan.org/address/0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6;
 
+  // https://basescan.org/address/0x963C0b3dFF5C35b171CcC11DAC006a605E42BeD2
+  address internal constant RISK_STEWARD = 0x963C0b3dFF5C35b171CcC11DAC006a605E42BeD2;
+
   // https://basescan.org/address/0x4A4c73d563395ad827511F70097d4Ef82E653805
   address internal constant FREEZING_STEWARD = 0x4A4c73d563395ad827511F70097d4Ef82E653805;
 
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index 280e2d17..4ed9da77 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -61,6 +61,9 @@ library AaveV3Ethereum {
   // https://etherscan.io/address/0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778;
 
+  // https://etherscan.io/address/0xF3911922bd054Bf6f4d6A02B8ADAC444921B0c51
+  address internal constant RISK_STEWARD = 0xF3911922bd054Bf6f4d6A02B8ADAC444921B0c51;
+
   // https://etherscan.io/address/0x2eE68ACb6A1319de1b49DC139894644E424fefD6
   address internal constant FREEZING_STEWARD = 0x2eE68ACb6A1319de1b49DC139894644E424fefD6;
 
diff --git a/src/AaveV3EthereumLido.sol b/src/AaveV3EthereumLido.sol
index 63499416..4907cd60 100644
--- a/src/AaveV3EthereumLido.sol
+++ b/src/AaveV3EthereumLido.sol
@@ -89,6 +89,9 @@ library AaveV3EthereumLido {
 
   // https://etherscan.io/address/0x3843b29118fFC18d5d12EE079d0324E1bF115e69
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x3843b29118fFC18d5d12EE079d0324E1bF115e69;
+
+  // https://etherscan.io/address/0x45C4f8b32927eFFdf1dA3cA42498504947dd4d0D
+  address internal constant RISK_STEWARD = 0x45C4f8b32927eFFdf1dA3cA42498504947dd4d0D;
 }
 
 library AaveV3EthereumLidoAssets {
diff --git a/src/AaveV3Fuji.sol b/src/AaveV3Fuji.sol
index 3825b1e8..27979472 100644
--- a/src/AaveV3Fuji.sol
+++ b/src/AaveV3Fuji.sol
@@ -6,239 +6,239 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Fuji {
-  // https://testnet.snowtrace.io/address/0xfb87056c0587923f15EB0aABc7d0572450Cc8003
+  // https://testnet.snowscan.xyz/address/0xfb87056c0587923f15EB0aABc7d0572450Cc8003
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0xfb87056c0587923f15EB0aABc7d0572450Cc8003);
 
-  // https://testnet.snowtrace.io/address/0xccEa5C65f6d4F465B71501418b88FBe4e7071283
+  // https://testnet.snowscan.xyz/address/0xccEa5C65f6d4F465B71501418b88FBe4e7071283
   IPool internal constant POOL = IPool(0xccEa5C65f6d4F465B71501418b88FBe4e7071283);
 
-  // https://testnet.snowtrace.io/address/0x987F9410f61c56F0d0D2F44B783d7E1B75141249
+  // https://testnet.snowscan.xyz/address/0x987F9410f61c56F0d0D2F44B783d7E1B75141249
   address internal constant POOL_IMPL = 0x987F9410f61c56F0d0D2F44B783d7E1B75141249;
 
-  // https://testnet.snowtrace.io/address/0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7
+  // https://testnet.snowscan.xyz/address/0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7);
 
-  // https://testnet.snowtrace.io/address/0x892E31b5a218879C9dbe258f691897AC28c5e061
+  // https://testnet.snowscan.xyz/address/0x892E31b5a218879C9dbe258f691897AC28c5e061
   address internal constant POOL_CONFIGURATOR_IMPL = 0x892E31b5a218879C9dbe258f691897AC28c5e061;
 
-  // https://testnet.snowtrace.io/address/0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318
+  // https://testnet.snowscan.xyz/address/0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318
   IAaveOracle internal constant ORACLE = IAaveOracle(0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318);
 
-  // https://testnet.snowtrace.io/address/0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51
+  // https://testnet.snowscan.xyz/address/0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51);
 
-  // https://testnet.snowtrace.io/address/0x4f2344ACBEfAe1aD87F41B84691E2552C719f723
+  // https://testnet.snowscan.xyz/address/0x4f2344ACBEfAe1aD87F41B84691E2552C719f723
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0x4f2344ACBEfAe1aD87F41B84691E2552C719f723);
 
-  // https://testnet.snowtrace.io/address/0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8
+  // https://testnet.snowscan.xyz/address/0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8
   address internal constant ACL_ADMIN = 0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8;
 
-  // https://testnet.snowtrace.io/address/0xB847a72802E43dF643ceC66315B58832Af724Efa
+  // https://testnet.snowscan.xyz/address/0xB847a72802E43dF643ceC66315B58832Af724Efa
   ICollector internal constant COLLECTOR = ICollector(0xB847a72802E43dF643ceC66315B58832Af724Efa);
 
-  // https://testnet.snowtrace.io/address/0x25f130Df328c8c2f2C0270377D0e7a984E96ce56
+  // https://testnet.snowscan.xyz/address/0x25f130Df328c8c2f2C0270377D0e7a984E96ce56
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0x25f130Df328c8c2f2C0270377D0e7a984E96ce56;
 
-  // https://testnet.snowtrace.io/address/0xDB8266d95Bc9E1b4C1440501Fae90838381a9156
+  // https://testnet.snowscan.xyz/address/0xDB8266d95Bc9E1b4C1440501Fae90838381a9156
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0xDB8266d95Bc9E1b4C1440501Fae90838381a9156;
 
-  // https://testnet.snowtrace.io/address/0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2
+  // https://testnet.snowscan.xyz/address/0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
     0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2;
 
-  // https://testnet.snowtrace.io/address/0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80
+  // https://testnet.snowscan.xyz/address/0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
     0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80;
 
-  // https://testnet.snowtrace.io/address/0x94D29389b874E6B5b7190dd891E7360827c0E3B4
+  // https://testnet.snowscan.xyz/address/0x94D29389b874E6B5b7190dd891E7360827c0E3B4
   address internal constant EMISSION_MANAGER = 0x94D29389b874E6B5b7190dd891E7360827c0E3B4;
 
-  // https://testnet.snowtrace.io/address/0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96
+  // https://testnet.snowscan.xyz/address/0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96
   address internal constant FAUCET = 0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96;
 
-  // https://testnet.snowtrace.io/address/0x1EFf285a4E34217495b5531151bffa222A94A4F9
+  // https://testnet.snowscan.xyz/address/0x1EFf285a4E34217495b5531151bffa222A94A4F9
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x1EFf285a4E34217495b5531151bffa222A94A4F9;
 
-  // https://testnet.snowtrace.io/address/0x279c790Afcd547e2f20d896c5DDEe3846b9790B5
+  // https://testnet.snowscan.xyz/address/0x279c790Afcd547e2f20d896c5DDEe3846b9790B5
   address internal constant UI_POOL_DATA_PROVIDER = 0x279c790Afcd547e2f20d896c5DDEe3846b9790B5;
 
-  // https://testnet.snowtrace.io/address/0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd
+  // https://testnet.snowscan.xyz/address/0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd
   address internal constant WALLET_BALANCE_PROVIDER = 0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd;
 
-  // https://testnet.snowtrace.io/address/0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF
+  // https://testnet.snowscan.xyz/address/0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF
   address internal constant WETH_GATEWAY = 0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF;
 }
 
 library AaveV3FujiAssets {
-  // https://testnet.snowtrace.io/address/0x676bD5B5d0955925aeCe653C50426940c58036c8
+  // https://testnet.snowscan.xyz/address/0x676bD5B5d0955925aeCe653C50426940c58036c8
   address internal constant DAI_UNDERLYING = 0x676bD5B5d0955925aeCe653C50426940c58036c8;
 
   uint8 internal constant DAI_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0xc2E0542ae75DF6ceC02fea12972918a5D18Eb956
+  // https://testnet.snowscan.xyz/address/0xc2E0542ae75DF6ceC02fea12972918a5D18Eb956
   address internal constant DAI_A_TOKEN = 0xc2E0542ae75DF6ceC02fea12972918a5D18Eb956;
 
-  // https://testnet.snowtrace.io/address/0x070fF79b060C14284754e8d575d2B96eCd2Fb15F
+  // https://testnet.snowscan.xyz/address/0x070fF79b060C14284754e8d575d2B96eCd2Fb15F
   address internal constant DAI_V_TOKEN = 0x070fF79b060C14284754e8d575d2B96eCd2Fb15F;
 
-  // https://testnet.snowtrace.io/address/0x713106F071747aa337F40A52dc66D5aF0caB4510
+  // https://testnet.snowscan.xyz/address/0x713106F071747aa337F40A52dc66D5aF0caB4510
   address internal constant DAI_S_TOKEN = 0x713106F071747aa337F40A52dc66D5aF0caB4510;
 
-  // https://testnet.snowtrace.io/address/0xA99a7aCefb0a5Cc5152f27814A95c2D914e2f6e5
+  // https://testnet.snowscan.xyz/address/0xA99a7aCefb0a5Cc5152f27814A95c2D914e2f6e5
   address internal constant DAI_ORACLE = 0xA99a7aCefb0a5Cc5152f27814A95c2D914e2f6e5;
 
-  // https://testnet.snowtrace.io/address/0x056e5A5ad84607fa7d9abaAe8464adE9D2020a7c
+  // https://testnet.snowscan.xyz/address/0x056e5A5ad84607fa7d9abaAe8464adE9D2020a7c
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0x056e5A5ad84607fa7d9abaAe8464adE9D2020a7c;
 
-  // https://testnet.snowtrace.io/address/0x3A38c4d0444b5fFcc5323b2e86A21aBaaf5FbF26
+  // https://testnet.snowscan.xyz/address/0x3A38c4d0444b5fFcc5323b2e86A21aBaaf5FbF26
   address internal constant LINK_UNDERLYING = 0x3A38c4d0444b5fFcc5323b2e86A21aBaaf5FbF26;
 
   uint8 internal constant LINK_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0x6cC4457C7547E6995ba7bA000851182F94658A51
+  // https://testnet.snowscan.xyz/address/0x6cC4457C7547E6995ba7bA000851182F94658A51
   address internal constant LINK_A_TOKEN = 0x6cC4457C7547E6995ba7bA000851182F94658A51;
 
-  // https://testnet.snowtrace.io/address/0x03578922eD24B3B07525D12464e69646551fd58E
+  // https://testnet.snowscan.xyz/address/0x03578922eD24B3B07525D12464e69646551fd58E
   address internal constant LINK_V_TOKEN = 0x03578922eD24B3B07525D12464e69646551fd58E;
 
-  // https://testnet.snowtrace.io/address/0xD79D85ce953266ef3c7f218c4b9F081b663566fC
+  // https://testnet.snowscan.xyz/address/0xD79D85ce953266ef3c7f218c4b9F081b663566fC
   address internal constant LINK_S_TOKEN = 0xD79D85ce953266ef3c7f218c4b9F081b663566fC;
 
-  // https://testnet.snowtrace.io/address/0x97cd7dc7DAA77E577C544Da7131e466952a72e9D
+  // https://testnet.snowscan.xyz/address/0x97cd7dc7DAA77E577C544Da7131e466952a72e9D
   address internal constant LINK_ORACLE = 0x97cd7dc7DAA77E577C544Da7131e466952a72e9D;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
+  // https://testnet.snowscan.xyz/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
 
-  // https://testnet.snowtrace.io/address/0xCaC7Ffa82c0f43EBB0FC11FCd32123EcA46626cf
+  // https://testnet.snowscan.xyz/address/0xCaC7Ffa82c0f43EBB0FC11FCd32123EcA46626cf
   address internal constant USDC_UNDERLYING = 0xCaC7Ffa82c0f43EBB0FC11FCd32123EcA46626cf;
 
   uint8 internal constant USDC_DECIMALS = 6;
 
-  // https://testnet.snowtrace.io/address/0xb1c85310a1b809C70fA6806d27Da425C1261F801
+  // https://testnet.snowscan.xyz/address/0xb1c85310a1b809C70fA6806d27Da425C1261F801
   address internal constant USDC_A_TOKEN = 0xb1c85310a1b809C70fA6806d27Da425C1261F801;
 
-  // https://testnet.snowtrace.io/address/0xaEF614b7ab1e50A919A181623E0888452c5139e5
+  // https://testnet.snowscan.xyz/address/0xaEF614b7ab1e50A919A181623E0888452c5139e5
   address internal constant USDC_V_TOKEN = 0xaEF614b7ab1e50A919A181623E0888452c5139e5;
 
-  // https://testnet.snowtrace.io/address/0x37258ee15dE91909Ff2EF9e17ED3568196a6B62F
+  // https://testnet.snowscan.xyz/address/0x37258ee15dE91909Ff2EF9e17ED3568196a6B62F
   address internal constant USDC_S_TOKEN = 0x37258ee15dE91909Ff2EF9e17ED3568196a6B62F;
 
-  // https://testnet.snowtrace.io/address/0x5Ce12885EFe9fc9E3D710F4e729D53BEBBf32a8E
+  // https://testnet.snowscan.xyz/address/0x5Ce12885EFe9fc9E3D710F4e729D53BEBBf32a8E
   address internal constant USDC_ORACLE = 0x5Ce12885EFe9fc9E3D710F4e729D53BEBBf32a8E;
 
-  // https://testnet.snowtrace.io/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
+  // https://testnet.snowscan.xyz/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x58f262FBAE3a3F91db894E726ee35394b5649593;
 
-  // https://testnet.snowtrace.io/address/0x0EFD8Ad2231c0B9C4d63F892E0a0a59a626Ce88d
+  // https://testnet.snowscan.xyz/address/0x0EFD8Ad2231c0B9C4d63F892E0a0a59a626Ce88d
   address internal constant WBTC_UNDERLYING = 0x0EFD8Ad2231c0B9C4d63F892E0a0a59a626Ce88d;
 
   uint8 internal constant WBTC_DECIMALS = 8;
 
-  // https://testnet.snowtrace.io/address/0x3d1F7da320eFDE834Cb7974d68591ca65de92FDC
+  // https://testnet.snowscan.xyz/address/0x3d1F7da320eFDE834Cb7974d68591ca65de92FDC
   address internal constant WBTC_A_TOKEN = 0x3d1F7da320eFDE834Cb7974d68591ca65de92FDC;
 
-  // https://testnet.snowtrace.io/address/0xbbBe736E39FC0a74C110869f837089fA5e57Ec04
+  // https://testnet.snowscan.xyz/address/0xbbBe736E39FC0a74C110869f837089fA5e57Ec04
   address internal constant WBTC_V_TOKEN = 0xbbBe736E39FC0a74C110869f837089fA5e57Ec04;
 
-  // https://testnet.snowtrace.io/address/0xA782143aBAC80aA3fB265c10dA31eaeCD84f82c4
+  // https://testnet.snowscan.xyz/address/0xA782143aBAC80aA3fB265c10dA31eaeCD84f82c4
   address internal constant WBTC_S_TOKEN = 0xA782143aBAC80aA3fB265c10dA31eaeCD84f82c4;
 
-  // https://testnet.snowtrace.io/address/0xBc251DE443F7Db3921e0cBC0d55c45336c646F7c
+  // https://testnet.snowscan.xyz/address/0xBc251DE443F7Db3921e0cBC0d55c45336c646F7c
   address internal constant WBTC_ORACLE = 0xBc251DE443F7Db3921e0cBC0d55c45336c646F7c;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
+  // https://testnet.snowscan.xyz/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
 
-  // https://testnet.snowtrace.io/address/0xf97b6C636167B529B6f1D729Bd9bC0e2Bd491848
+  // https://testnet.snowscan.xyz/address/0xf97b6C636167B529B6f1D729Bd9bC0e2Bd491848
   address internal constant WETH_UNDERLYING = 0xf97b6C636167B529B6f1D729Bd9bC0e2Bd491848;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0x812664237ad3DfdaA697B77b7919bBde7486D90E
+  // https://testnet.snowscan.xyz/address/0x812664237ad3DfdaA697B77b7919bBde7486D90E
   address internal constant WETH_A_TOKEN = 0x812664237ad3DfdaA697B77b7919bBde7486D90E;
 
-  // https://testnet.snowtrace.io/address/0xEBaC3ae7bFC81C4e05Ad65a69aD69673B1b53a0f
+  // https://testnet.snowscan.xyz/address/0xEBaC3ae7bFC81C4e05Ad65a69aD69673B1b53a0f
   address internal constant WETH_V_TOKEN = 0xEBaC3ae7bFC81C4e05Ad65a69aD69673B1b53a0f;
 
-  // https://testnet.snowtrace.io/address/0x4921c29cb9f79eB7Bf1e7B16836F2984ef569B38
+  // https://testnet.snowscan.xyz/address/0x4921c29cb9f79eB7Bf1e7B16836F2984ef569B38
   address internal constant WETH_S_TOKEN = 0x4921c29cb9f79eB7Bf1e7B16836F2984ef569B38;
 
-  // https://testnet.snowtrace.io/address/0x3A19706EC161e02917f056F0c2a91961d2Cf32a0
+  // https://testnet.snowscan.xyz/address/0x3A19706EC161e02917f056F0c2a91961d2Cf32a0
   address internal constant WETH_ORACLE = 0x3A19706EC161e02917f056F0c2a91961d2Cf32a0;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
+  // https://testnet.snowscan.xyz/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
 
-  // https://testnet.snowtrace.io/address/0xBDE7fbbb1DC89E74B73C54Ad911A1C9685caCD83
+  // https://testnet.snowscan.xyz/address/0xBDE7fbbb1DC89E74B73C54Ad911A1C9685caCD83
   address internal constant USDT_UNDERLYING = 0xBDE7fbbb1DC89E74B73C54Ad911A1C9685caCD83;
 
   uint8 internal constant USDT_DECIMALS = 6;
 
-  // https://testnet.snowtrace.io/address/0x13f2B2AFCbe58e72b3d275aC197c3f602CC57735
+  // https://testnet.snowscan.xyz/address/0x13f2B2AFCbe58e72b3d275aC197c3f602CC57735
   address internal constant USDT_A_TOKEN = 0x13f2B2AFCbe58e72b3d275aC197c3f602CC57735;
 
-  // https://testnet.snowtrace.io/address/0xa09275Af89b16036944a48F82D9980C55B950162
+  // https://testnet.snowscan.xyz/address/0xa09275Af89b16036944a48F82D9980C55B950162
   address internal constant USDT_V_TOKEN = 0xa09275Af89b16036944a48F82D9980C55B950162;
 
-  // https://testnet.snowtrace.io/address/0x663Fe6EF3Ce8330c9f9494f933FBb426553F4F12
+  // https://testnet.snowscan.xyz/address/0x663Fe6EF3Ce8330c9f9494f933FBb426553F4F12
   address internal constant USDT_S_TOKEN = 0x663Fe6EF3Ce8330c9f9494f933FBb426553F4F12;
 
-  // https://testnet.snowtrace.io/address/0x58D19E04fAfC6aC17c01B5667aF137431d9CaAF4
+  // https://testnet.snowscan.xyz/address/0x58D19E04fAfC6aC17c01B5667aF137431d9CaAF4
   address internal constant USDT_ORACLE = 0x58D19E04fAfC6aC17c01B5667aF137431d9CaAF4;
 
-  // https://testnet.snowtrace.io/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
+  // https://testnet.snowscan.xyz/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0x58f262FBAE3a3F91db894E726ee35394b5649593;
 
-  // https://testnet.snowtrace.io/address/0xfB4CeA030Fa61FC435E922CFDc4bF9C80456E19b
+  // https://testnet.snowscan.xyz/address/0xfB4CeA030Fa61FC435E922CFDc4bF9C80456E19b
   address internal constant AAVE_UNDERLYING = 0xfB4CeA030Fa61FC435E922CFDc4bF9C80456E19b;
 
   uint8 internal constant AAVE_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0x8419b35fA4AE8105d3241687a6421abA7303E642
+  // https://testnet.snowscan.xyz/address/0x8419b35fA4AE8105d3241687a6421abA7303E642
   address internal constant AAVE_A_TOKEN = 0x8419b35fA4AE8105d3241687a6421abA7303E642;
 
-  // https://testnet.snowtrace.io/address/0x202AB06b46b0b37804753CF8B2bC0C750b6d6A35
+  // https://testnet.snowscan.xyz/address/0x202AB06b46b0b37804753CF8B2bC0C750b6d6A35
   address internal constant AAVE_V_TOKEN = 0x202AB06b46b0b37804753CF8B2bC0C750b6d6A35;
 
-  // https://testnet.snowtrace.io/address/0x38BcB6c581EEF8F6Ec545989B04973dC31252fA2
+  // https://testnet.snowscan.xyz/address/0x38BcB6c581EEF8F6Ec545989B04973dC31252fA2
   address internal constant AAVE_S_TOKEN = 0x38BcB6c581EEF8F6Ec545989B04973dC31252fA2;
 
-  // https://testnet.snowtrace.io/address/0xe19ee4B292a3c52A5089e0f84b5874ee29005895
+  // https://testnet.snowscan.xyz/address/0xe19ee4B292a3c52A5089e0f84b5874ee29005895
   address internal constant AAVE_ORACLE = 0xe19ee4B292a3c52A5089e0f84b5874ee29005895;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
+  // https://testnet.snowscan.xyz/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
 
-  // https://testnet.snowtrace.io/address/0x2f6179f64FFe203899600Ba26d10979B314eA13D
+  // https://testnet.snowscan.xyz/address/0x2f6179f64FFe203899600Ba26d10979B314eA13D
   address internal constant WAVAX_UNDERLYING = 0x2f6179f64FFe203899600Ba26d10979B314eA13D;
 
   uint8 internal constant WAVAX_DECIMALS = 18;
 
-  // https://testnet.snowtrace.io/address/0x339f50bCbd874A892fb2c6A56Cf8D85Dd215Bf8e
+  // https://testnet.snowscan.xyz/address/0x339f50bCbd874A892fb2c6A56Cf8D85Dd215Bf8e
   address internal constant WAVAX_A_TOKEN = 0x339f50bCbd874A892fb2c6A56Cf8D85Dd215Bf8e;
 
-  // https://testnet.snowtrace.io/address/0xDB40902115B5eEBe5810AfB469A32b66c8258c9E
+  // https://testnet.snowscan.xyz/address/0xDB40902115B5eEBe5810AfB469A32b66c8258c9E
   address internal constant WAVAX_V_TOKEN = 0xDB40902115B5eEBe5810AfB469A32b66c8258c9E;
 
-  // https://testnet.snowtrace.io/address/0xeea401488B4752969cD67E325f818d657a0Ea9a5
+  // https://testnet.snowscan.xyz/address/0xeea401488B4752969cD67E325f818d657a0Ea9a5
   address internal constant WAVAX_S_TOKEN = 0xeea401488B4752969cD67E325f818d657a0Ea9a5;
 
-  // https://testnet.snowtrace.io/address/0xA575a92bdEDe1740eF4De70F304A1288AD6E1fb8
+  // https://testnet.snowscan.xyz/address/0xA575a92bdEDe1740eF4De70F304A1288AD6E1fb8
   address internal constant WAVAX_ORACLE = 0xA575a92bdEDe1740eF4De70F304A1288AD6E1fb8;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
+  // https://testnet.snowscan.xyz/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
 }
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index 09312c9f..fb5a7c21 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -80,6 +80,9 @@ library AaveV3Gnosis {
   // https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x33AE1f41546a2e05368Bf789b3d868813c0Ae658;
 
+  // https://gnosisscan.io/address/0x0b9cA640284cf2636577703f785D5aEEc466BC56
+  address internal constant RISK_STEWARD = 0x0b9cA640284cf2636577703f785D5aEEc466BC56;
+
   // https://gnosisscan.io/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
   address internal constant FREEZING_STEWARD = 0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5;
 
diff --git a/src/AaveV3Metis.sol b/src/AaveV3Metis.sol
index b7a8e09a..3b088388 100644
--- a/src/AaveV3Metis.sol
+++ b/src/AaveV3Metis.sol
@@ -6,209 +6,212 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Metis {
-  // https://explorer.metis.io/address/0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF
+  // https://andromeda-explorer.metis.io/address/0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF);
 
-  // https://explorer.metis.io/address/0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57
+  // https://andromeda-explorer.metis.io/address/0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57
   IPool internal constant POOL = IPool(0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57);
 
-  // https://explorer.metis.io/address/0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD
+  // https://andromeda-explorer.metis.io/address/0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD
   address internal constant POOL_IMPL = 0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD;
 
-  // https://explorer.metis.io/address/0x69FEE8F261E004453BE0800BC9039717528645A6
+  // https://andromeda-explorer.metis.io/address/0x69FEE8F261E004453BE0800BC9039717528645A6
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x69FEE8F261E004453BE0800BC9039717528645A6);
 
-  // https://explorer.metis.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
+  // https://andromeda-explorer.metis.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
   address internal constant POOL_CONFIGURATOR_IMPL = 0x419226e0Ad27f3B2019123f7246a364622b018e5;
 
-  // https://explorer.metis.io/address/0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e
+  // https://andromeda-explorer.metis.io/address/0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e
   IAaveOracle internal constant ORACLE = IAaveOracle(0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e);
 
-  // https://explorer.metis.io/address/0x2B5EA1604BAbb7B730120950Cb13951f3525828A
+  // https://andromeda-explorer.metis.io/address/0x2B5EA1604BAbb7B730120950Cb13951f3525828A
   address internal constant PRICE_ORACLE_SENTINEL = 0x2B5EA1604BAbb7B730120950Cb13951f3525828A;
 
-  // https://explorer.metis.io/address/0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9
+  // https://andromeda-explorer.metis.io/address/0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9);
 
-  // https://explorer.metis.io/address/0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8
+  // https://andromeda-explorer.metis.io/address/0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8);
 
-  // https://explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+  // https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
   address internal constant ACL_ADMIN = 0x6fD45D32375d5aDB8D76275A3932c740F03a8718;
 
-  // https://explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
+  // https://andromeda-explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
   ICollector internal constant COLLECTOR = ICollector(0xB5b64c7E00374e766272f8B442Cd261412D4b118);
 
-  // https://explorer.metis.io/address/0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B
+  // https://andromeda-explorer.metis.io/address/0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B;
 
-  // https://explorer.metis.io/address/0x246405C70461f93513C74606815615c24c5C8C79
+  // https://andromeda-explorer.metis.io/address/0x246405C70461f93513C74606815615c24c5C8C79
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0x246405C70461f93513C74606815615c24c5C8C79;
 
-  // https://explorer.metis.io/address/0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f
+  // https://andromeda-explorer.metis.io/address/0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
     0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f;
 
-  // https://explorer.metis.io/address/0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4
+  // https://andromeda-explorer.metis.io/address/0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
     0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4;
 
-  // https://explorer.metis.io/address/0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2
+  // https://andromeda-explorer.metis.io/address/0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2
   address internal constant EMISSION_MANAGER = 0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2;
 
-  // https://explorer.metis.io/address/0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731
+  // https://andromeda-explorer.metis.io/address/0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731;
 
-  // https://explorer.metis.io/address/0x2C77153fF4a1e83A8d8D750735FB101ECB55949f
+  // https://andromeda-explorer.metis.io/address/0xF73F2634b43344d86921DA3391d4EF0d5675Dd63
+  address internal constant RISK_STEWARD = 0xF73F2634b43344d86921DA3391d4EF0d5675Dd63;
+
+  // https://andromeda-explorer.metis.io/address/0x2C77153fF4a1e83A8d8D750735FB101ECB55949f
   address internal constant FREEZING_STEWARD = 0x2C77153fF4a1e83A8d8D750735FB101ECB55949f;
 
-  // https://explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
+  // https://andromeda-explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
   address internal constant L2_ENCODER = 0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9;
 
-  // https://explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
+  // https://andromeda-explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
   address internal constant CONFIG_ENGINE = 0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957;
 
-  // https://explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
+  // https://andromeda-explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5;
 
-  // https://explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
+  // https://andromeda-explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927;
 
-  // https://explorer.metis.io/address/0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763
+  // https://andromeda-explorer.metis.io/address/0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763
   address internal constant UI_POOL_DATA_PROVIDER = 0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763;
 
-  // https://explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
+  // https://andromeda-explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
   address internal constant WALLET_BALANCE_PROVIDER = 0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b;
 
-  // https://explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
+  // https://andromeda-explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
   address internal constant STATIC_A_TOKEN_FACTORY = 0x9C62AdC332888F56998542415c38D7CDf3Ff7619;
 }
 
 library AaveV3MetisAssets {
-  // https://explorer.metis.io/address/0x4c078361FC9BbB78DF910800A991C7c3DD2F6ce0
+  // https://andromeda-explorer.metis.io/address/0x4c078361FC9BbB78DF910800A991C7c3DD2F6ce0
   address internal constant mDAI_UNDERLYING = 0x4c078361FC9BbB78DF910800A991C7c3DD2F6ce0;
 
   uint8 internal constant mDAI_DECIMALS = 18;
 
-  // https://explorer.metis.io/address/0x85ABAdDcae06efee2CB5F75f33b6471759eFDE24
+  // https://andromeda-explorer.metis.io/address/0x85ABAdDcae06efee2CB5F75f33b6471759eFDE24
   address internal constant mDAI_A_TOKEN = 0x85ABAdDcae06efee2CB5F75f33b6471759eFDE24;
 
-  // https://explorer.metis.io/address/0x13Bd89aF338f3c7eAE9a75852fC2F1ca28B4DDbF
+  // https://andromeda-explorer.metis.io/address/0x13Bd89aF338f3c7eAE9a75852fC2F1ca28B4DDbF
   address internal constant mDAI_V_TOKEN = 0x13Bd89aF338f3c7eAE9a75852fC2F1ca28B4DDbF;
 
-  // https://explorer.metis.io/address/0xf1cd706E177F3AEa620c722Dc436B5a2066E4C68
+  // https://andromeda-explorer.metis.io/address/0xf1cd706E177F3AEa620c722Dc436B5a2066E4C68
   address internal constant mDAI_S_TOKEN = 0xf1cd706E177F3AEa620c722Dc436B5a2066E4C68;
 
-  // https://explorer.metis.io/address/0xB3721282cd62Ba8F7bB02Cb843F3a34f9e109ef8
+  // https://andromeda-explorer.metis.io/address/0xB3721282cd62Ba8F7bB02Cb843F3a34f9e109ef8
   address internal constant mDAI_ORACLE = 0xB3721282cd62Ba8F7bB02Cb843F3a34f9e109ef8;
 
-  // https://explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
+  // https://andromeda-explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
   address internal constant mDAI_INTEREST_RATE_STRATEGY =
     0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8;
 
-  // https://explorer.metis.io/address/0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509
+  // https://andromeda-explorer.metis.io/address/0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509
   address internal constant mDAI_STATA_TOKEN = 0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509;
 
-  // https://explorer.metis.io/address/0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000
+  // https://andromeda-explorer.metis.io/address/0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000
   address internal constant Metis_UNDERLYING = 0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000;
 
   uint8 internal constant Metis_DECIMALS = 18;
 
-  // https://explorer.metis.io/address/0x7314Ef2CA509490f65F52CC8FC9E0675C66390b8
+  // https://andromeda-explorer.metis.io/address/0x7314Ef2CA509490f65F52CC8FC9E0675C66390b8
   address internal constant Metis_A_TOKEN = 0x7314Ef2CA509490f65F52CC8FC9E0675C66390b8;
 
-  // https://explorer.metis.io/address/0x0110174183e13D5Ea59D7512226c5D5A47bA2c40
+  // https://andromeda-explorer.metis.io/address/0x0110174183e13D5Ea59D7512226c5D5A47bA2c40
   address internal constant Metis_V_TOKEN = 0x0110174183e13D5Ea59D7512226c5D5A47bA2c40;
 
-  // https://explorer.metis.io/address/0xeF547E238d689BAa811E597105A596bBE2Fe0761
+  // https://andromeda-explorer.metis.io/address/0xeF547E238d689BAa811E597105A596bBE2Fe0761
   address internal constant Metis_S_TOKEN = 0xeF547E238d689BAa811E597105A596bBE2Fe0761;
 
-  // https://explorer.metis.io/address/0xD4a5Bb03B5D66d9bf81507379302Ac2C2DFDFa6D
+  // https://andromeda-explorer.metis.io/address/0xD4a5Bb03B5D66d9bf81507379302Ac2C2DFDFa6D
   address internal constant Metis_ORACLE = 0xD4a5Bb03B5D66d9bf81507379302Ac2C2DFDFa6D;
 
-  // https://explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
+  // https://andromeda-explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
   address internal constant Metis_INTEREST_RATE_STRATEGY =
     0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8;
 
-  // https://explorer.metis.io/address/0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784
+  // https://andromeda-explorer.metis.io/address/0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784
   address internal constant Metis_STATA_TOKEN = 0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784;
 
-  // https://explorer.metis.io/address/0xEA32A96608495e54156Ae48931A7c20f0dcc1a21
+  // https://andromeda-explorer.metis.io/address/0xEA32A96608495e54156Ae48931A7c20f0dcc1a21
   address internal constant mUSDC_UNDERLYING = 0xEA32A96608495e54156Ae48931A7c20f0dcc1a21;
 
   uint8 internal constant mUSDC_DECIMALS = 6;
 
-  // https://explorer.metis.io/address/0x885C8AEC5867571582545F894A5906971dB9bf27
+  // https://andromeda-explorer.metis.io/address/0x885C8AEC5867571582545F894A5906971dB9bf27
   address internal constant mUSDC_A_TOKEN = 0x885C8AEC5867571582545F894A5906971dB9bf27;
 
-  // https://explorer.metis.io/address/0x571171a7EF1e3c8c83d47EF1a50E225E9c351380
+  // https://andromeda-explorer.metis.io/address/0x571171a7EF1e3c8c83d47EF1a50E225E9c351380
   address internal constant mUSDC_V_TOKEN = 0x571171a7EF1e3c8c83d47EF1a50E225E9c351380;
 
-  // https://explorer.metis.io/address/0x81aC531A7CA8Bdaeb571d8d948e29481A35495C8
+  // https://andromeda-explorer.metis.io/address/0x81aC531A7CA8Bdaeb571d8d948e29481A35495C8
   address internal constant mUSDC_S_TOKEN = 0x81aC531A7CA8Bdaeb571d8d948e29481A35495C8;
 
-  // https://explorer.metis.io/address/0xF2acD6aE4fcf662161eA354dA844f224bf91FF8c
+  // https://andromeda-explorer.metis.io/address/0xF2acD6aE4fcf662161eA354dA844f224bf91FF8c
   address internal constant mUSDC_ORACLE = 0xF2acD6aE4fcf662161eA354dA844f224bf91FF8c;
 
-  // https://explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
+  // https://andromeda-explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
   address internal constant mUSDC_INTEREST_RATE_STRATEGY =
     0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8;
 
-  // https://explorer.metis.io/address/0xb24451C231C6e6A60aC46f45E98a267caae898f4
+  // https://andromeda-explorer.metis.io/address/0xb24451C231C6e6A60aC46f45E98a267caae898f4
   address internal constant mUSDC_STATA_TOKEN = 0xb24451C231C6e6A60aC46f45E98a267caae898f4;
 
-  // https://explorer.metis.io/address/0xbB06DCA3AE6887fAbF931640f67cab3e3a16F4dC
+  // https://andromeda-explorer.metis.io/address/0xbB06DCA3AE6887fAbF931640f67cab3e3a16F4dC
   address internal constant mUSDT_UNDERLYING = 0xbB06DCA3AE6887fAbF931640f67cab3e3a16F4dC;
 
   uint8 internal constant mUSDT_DECIMALS = 6;
 
-  // https://explorer.metis.io/address/0xd9fa75D14c26720d5ce7eE2530793a823e8f07b9
+  // https://andromeda-explorer.metis.io/address/0xd9fa75D14c26720d5ce7eE2530793a823e8f07b9
   address internal constant mUSDT_A_TOKEN = 0xd9fa75D14c26720d5ce7eE2530793a823e8f07b9;
 
-  // https://explorer.metis.io/address/0x6B45DcE8aF4fE5Ab3bFCF030d8fB57718eAB54e5
+  // https://andromeda-explorer.metis.io/address/0x6B45DcE8aF4fE5Ab3bFCF030d8fB57718eAB54e5
   address internal constant mUSDT_V_TOKEN = 0x6B45DcE8aF4fE5Ab3bFCF030d8fB57718eAB54e5;
 
-  // https://explorer.metis.io/address/0xb4984c08984776074fB9BB78fFE24e9F1E97CD3F
+  // https://andromeda-explorer.metis.io/address/0xb4984c08984776074fB9BB78fFE24e9F1E97CD3F
   address internal constant mUSDT_S_TOKEN = 0xb4984c08984776074fB9BB78fFE24e9F1E97CD3F;
 
-  // https://explorer.metis.io/address/0xD1D7DCBDE72916646A7F8AcE6Ad8C5179D8ddFbB
+  // https://andromeda-explorer.metis.io/address/0xD1D7DCBDE72916646A7F8AcE6Ad8C5179D8ddFbB
   address internal constant mUSDT_ORACLE = 0xD1D7DCBDE72916646A7F8AcE6Ad8C5179D8ddFbB;
 
-  // https://explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
+  // https://andromeda-explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
   address internal constant mUSDT_INTEREST_RATE_STRATEGY =
     0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8;
 
-  // https://explorer.metis.io/address/0xAAea6F041425B813760dA201d08d46487034A266
+  // https://andromeda-explorer.metis.io/address/0xAAea6F041425B813760dA201d08d46487034A266
   address internal constant mUSDT_STATA_TOKEN = 0xAAea6F041425B813760dA201d08d46487034A266;
 
-  // https://explorer.metis.io/address/0x420000000000000000000000000000000000000A
+  // https://andromeda-explorer.metis.io/address/0x420000000000000000000000000000000000000A
   address internal constant WETH_UNDERLYING = 0x420000000000000000000000000000000000000A;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://explorer.metis.io/address/0x8acAe35059C9aE27709028fF6689386a44c09f3a
+  // https://andromeda-explorer.metis.io/address/0x8acAe35059C9aE27709028fF6689386a44c09f3a
   address internal constant WETH_A_TOKEN = 0x8acAe35059C9aE27709028fF6689386a44c09f3a;
 
-  // https://explorer.metis.io/address/0x8Bb19e3DD277a73D4A95EE434F14cE4B92898421
+  // https://andromeda-explorer.metis.io/address/0x8Bb19e3DD277a73D4A95EE434F14cE4B92898421
   address internal constant WETH_V_TOKEN = 0x8Bb19e3DD277a73D4A95EE434F14cE4B92898421;
 
-  // https://explorer.metis.io/address/0x38cFF1C1dFE9e2566F11CB717Ac43fa56fEeCFbd
+  // https://andromeda-explorer.metis.io/address/0x38cFF1C1dFE9e2566F11CB717Ac43fa56fEeCFbd
   address internal constant WETH_S_TOKEN = 0x38cFF1C1dFE9e2566F11CB717Ac43fa56fEeCFbd;
 
-  // https://explorer.metis.io/address/0x3BBe70e2F96c87aEce7F67A2b0178052f62E37fE
+  // https://andromeda-explorer.metis.io/address/0x3BBe70e2F96c87aEce7F67A2b0178052f62E37fE
   address internal constant WETH_ORACLE = 0x3BBe70e2F96c87aEce7F67A2b0178052f62E37fE;
 
-  // https://explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
+  // https://andromeda-explorer.metis.io/address/0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xE263434d0c71Ff6EB089034F2aFf89e9f6F714E8;
 
-  // https://explorer.metis.io/address/0x2f1606864d6322c54b50a1762D4a1ca67f42d23d
+  // https://andromeda-explorer.metis.io/address/0x2f1606864d6322c54b50a1762D4a1ca67f42d23d
   address internal constant WETH_STATA_TOKEN = 0x2f1606864d6322c54b50a1762D4a1ca67f42d23d;
 }
 
@@ -217,24 +220,24 @@ library AaveV3MetisEModes {
 }
 
 library AaveV3MetisExternalLibraries {
-  // https://explorer.metis.io/address/0x6DA8d7EF0625e965dafc393793C048096392d4a5
+  // https://andromeda-explorer.metis.io/address/0x6DA8d7EF0625e965dafc393793C048096392d4a5
   address internal constant FLASHLOAN_LOGIC = 0x6DA8d7EF0625e965dafc393793C048096392d4a5;
 
-  // https://explorer.metis.io/address/0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1
+  // https://andromeda-explorer.metis.io/address/0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1
   address internal constant BORROW_LOGIC = 0x41717de714Db8630F02Dea8f6A39C73A5b5C7df1;
 
-  // https://explorer.metis.io/address/0xca2385754bCa5d632F5160B560352aBd12029685
+  // https://andromeda-explorer.metis.io/address/0xca2385754bCa5d632F5160B560352aBd12029685
   address internal constant BRIDGE_LOGIC = 0xca2385754bCa5d632F5160B560352aBd12029685;
 
-  // https://explorer.metis.io/address/0x12959a64470Dd003590Bb1EcFC436dddE7608724
+  // https://andromeda-explorer.metis.io/address/0x12959a64470Dd003590Bb1EcFC436dddE7608724
   address internal constant E_MODE_LOGIC = 0x12959a64470Dd003590Bb1EcFC436dddE7608724;
 
-  // https://explorer.metis.io/address/0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e
+  // https://andromeda-explorer.metis.io/address/0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e
   address internal constant LIQUIDATION_LOGIC = 0x72c272aE914EC11AFe1e74A0016e0A91c1A6014e;
 
-  // https://explorer.metis.io/address/0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975
+  // https://andromeda-explorer.metis.io/address/0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975
   address internal constant POOL_LOGIC = 0x55D552EFbc8aEB87AffCEa8630B43a33BA24D975;
 
-  // https://explorer.metis.io/address/0x9336943ecd91C201D9ED5A21562b34Aef710052f
+  // https://andromeda-explorer.metis.io/address/0x9336943ecd91C201D9ED5A21562b34Aef710052f
   address internal constant SUPPLY_LOGIC = 0x9336943ecd91C201D9ED5A21562b34Aef710052f;
 }
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index f6a0c1ab..38d65d99 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -64,6 +64,9 @@ library AaveV3Optimism {
   // https://optimistic.etherscan.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x5E76E98E0963EcDC6A065d1435F84065b7523f39;
 
+  // https://optimistic.etherscan.io/address/0x9062F78b631f33D24Ed058cBc116A653452ea82A
+  address internal constant RISK_STEWARD = 0x9062F78b631f33D24Ed058cBc116A653452ea82A;
+
   // https://optimistic.etherscan.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
   address internal constant FREEZING_STEWARD = 0x3829943c53F2d00e20B58475aF19716724bF90Ba;
 
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index e11f3007..1629e622 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -61,6 +61,9 @@ library AaveV3Polygon {
   // https://polygonscan.com/address/0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f
   address internal constant CAPS_PLUS_RISK_STEWARD = 0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f;
 
+  // https://polygonscan.com/address/0xfF33BEcB9ECFE4328D4f9C37bE0F07b2CFe976E3
+  address internal constant RISK_STEWARD = 0xfF33BEcB9ECFE4328D4f9C37bE0F07b2CFe976E3;
+
   // https://polygonscan.com/address/0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB
   address internal constant FREEZING_STEWARD = 0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB;
 
diff --git a/src/AaveV3Scroll.sol b/src/AaveV3Scroll.sol
index 59803d18..1c39d482 100644
--- a/src/AaveV3Scroll.sol
+++ b/src/AaveV3Scroll.sol
@@ -67,6 +67,9 @@ library AaveV3Scroll {
   // https://scrollscan.com/address/0xc4dcA550EF04FD0f8AbD4c384575Fb8a8123054e
   address internal constant CAPS_PLUS_RISK_STEWARD = 0xc4dcA550EF04FD0f8AbD4c384575Fb8a8123054e;
 
+  // https://scrollscan.com/address/0x5E27B8EfDe76814795a07c8a378FcdF09715850b
+  address internal constant RISK_STEWARD = 0x5E27B8EfDe76814795a07c8a378FcdF09715850b;
+
   // https://scrollscan.com/address/0xc68D0C511076283075bD5cc9aA61E43673135f37
   address internal constant FREEZING_STEWARD = 0xc68D0C511076283075bD5cc9aA61E43673135f37;
 
diff --git a/src/AaveV3ScrollSepolia.sol b/src/AaveV3ScrollSepolia.sol
index b4fb5e74..4c083dc6 100644
--- a/src/AaveV3ScrollSepolia.sol
+++ b/src/AaveV3ScrollSepolia.sol
@@ -6,242 +6,242 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3ScrollSepolia {
-  // https://sepolia.scrollscan.com/address/0x52A27dC690F8652288194Dd2bc523863eBdEa236
+  // https://sepolia-blockscout.scroll.io/address/0x52A27dC690F8652288194Dd2bc523863eBdEa236
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0x52A27dC690F8652288194Dd2bc523863eBdEa236);
 
-  // https://sepolia.scrollscan.com/address/0x48914C788295b5db23aF2b5F0B3BE775C4eA9440
+  // https://sepolia-blockscout.scroll.io/address/0x48914C788295b5db23aF2b5F0B3BE775C4eA9440
   IPool internal constant POOL = IPool(0x48914C788295b5db23aF2b5F0B3BE775C4eA9440);
 
-  // https://sepolia.scrollscan.com/address/0xB186894F315133C2396104CAb386C3A0fEC09025
+  // https://sepolia-blockscout.scroll.io/address/0xB186894F315133C2396104CAb386C3A0fEC09025
   address internal constant POOL_IMPL = 0xB186894F315133C2396104CAb386C3A0fEC09025;
 
-  // https://sepolia.scrollscan.com/address/0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10
+  // https://sepolia-blockscout.scroll.io/address/0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10);
 
-  // https://sepolia.scrollscan.com/address/0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF
+  // https://sepolia-blockscout.scroll.io/address/0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF
   address internal constant POOL_CONFIGURATOR_IMPL = 0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF;
 
-  // https://sepolia.scrollscan.com/address/0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59
+  // https://sepolia-blockscout.scroll.io/address/0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59
   IAaveOracle internal constant ORACLE = IAaveOracle(0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59);
 
-  // https://sepolia.scrollscan.com/address/0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee
+  // https://sepolia-blockscout.scroll.io/address/0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee);
 
-  // https://sepolia.scrollscan.com/address/0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C
+  // https://sepolia-blockscout.scroll.io/address/0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C);
 
-  // https://sepolia.scrollscan.com/address/0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0
+  // https://sepolia-blockscout.scroll.io/address/0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0
   address internal constant ACL_ADMIN = 0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0;
 
-  // https://sepolia.scrollscan.com/address/0x104Cd7695C9247096F7AD37d3258B63c9675A00e
+  // https://sepolia-blockscout.scroll.io/address/0x104Cd7695C9247096F7AD37d3258B63c9675A00e
   ICollector internal constant COLLECTOR = ICollector(0x104Cd7695C9247096F7AD37d3258B63c9675A00e);
 
-  // https://sepolia.scrollscan.com/address/0xa76F05D0cdf599E0186dec880F2FA480fd0c5280
+  // https://sepolia-blockscout.scroll.io/address/0xa76F05D0cdf599E0186dec880F2FA480fd0c5280
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0xa76F05D0cdf599E0186dec880F2FA480fd0c5280;
 
-  // https://sepolia.scrollscan.com/address/0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd
+  // https://sepolia-blockscout.scroll.io/address/0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd;
 
-  // https://sepolia.scrollscan.com/address/0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07
+  // https://sepolia-blockscout.scroll.io/address/0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
     0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07;
 
-  // https://sepolia.scrollscan.com/address/0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256
+  // https://sepolia-blockscout.scroll.io/address/0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
     0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256;
 
-  // https://sepolia.scrollscan.com/address/0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2
+  // https://sepolia-blockscout.scroll.io/address/0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2
   address internal constant EMISSION_MANAGER = 0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2;
 
-  // https://sepolia.scrollscan.com/address/0x2F826FD1a0071476330a58dD1A9B36bcF7da832d
+  // https://sepolia-blockscout.scroll.io/address/0x2F826FD1a0071476330a58dD1A9B36bcF7da832d
   address internal constant FAUCET = 0x2F826FD1a0071476330a58dD1A9B36bcF7da832d;
 
-  // https://sepolia.scrollscan.com/address/0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC
+  // https://sepolia-blockscout.scroll.io/address/0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC
   address internal constant L2_ENCODER = 0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC;
 
-  // https://sepolia.scrollscan.com/address/0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37
+  // https://sepolia-blockscout.scroll.io/address/0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37;
 
-  // https://sepolia.scrollscan.com/address/0xDC55BcFC0963608401A4bA6298624E5895f8250a
+  // https://sepolia-blockscout.scroll.io/address/0xDC55BcFC0963608401A4bA6298624E5895f8250a
   address internal constant UI_POOL_DATA_PROVIDER = 0xDC55BcFC0963608401A4bA6298624E5895f8250a;
 
-  // https://sepolia.scrollscan.com/address/0x6c68e975764a56e62AF3d1C8209F789779Eb763B
+  // https://sepolia-blockscout.scroll.io/address/0x6c68e975764a56e62AF3d1C8209F789779Eb763B
   address internal constant WALLET_BALANCE_PROVIDER = 0x6c68e975764a56e62AF3d1C8209F789779Eb763B;
 
-  // https://sepolia.scrollscan.com/address/0x57ce905CfD7f986A929A26b006f797d181dB706e
+  // https://sepolia-blockscout.scroll.io/address/0x57ce905CfD7f986A929A26b006f797d181dB706e
   address internal constant WETH_GATEWAY = 0x57ce905CfD7f986A929A26b006f797d181dB706e;
 }
 
 library AaveV3ScrollSepoliaAssets {
-  // https://sepolia.scrollscan.com/address/0x7984E363c38b590bB4CA35aEd5133Ef2c6619C40
+  // https://sepolia-blockscout.scroll.io/address/0x7984E363c38b590bB4CA35aEd5133Ef2c6619C40
   address internal constant DAI_UNDERLYING = 0x7984E363c38b590bB4CA35aEd5133Ef2c6619C40;
 
   uint8 internal constant DAI_DECIMALS = 18;
 
-  // https://sepolia.scrollscan.com/address/0x99Cb50E6bE36C8096e6731ED7738d93090B710DD
+  // https://sepolia-blockscout.scroll.io/address/0x99Cb50E6bE36C8096e6731ED7738d93090B710DD
   address internal constant DAI_A_TOKEN = 0x99Cb50E6bE36C8096e6731ED7738d93090B710DD;
 
-  // https://sepolia.scrollscan.com/address/0x09F9A7cd11BE8468064b06FF20Dce43E0A434a2A
+  // https://sepolia-blockscout.scroll.io/address/0x09F9A7cd11BE8468064b06FF20Dce43E0A434a2A
   address internal constant DAI_V_TOKEN = 0x09F9A7cd11BE8468064b06FF20Dce43E0A434a2A;
 
-  // https://sepolia.scrollscan.com/address/0x94Bb76d2420C1F083c53061CA862619D6056fdFE
+  // https://sepolia-blockscout.scroll.io/address/0x94Bb76d2420C1F083c53061CA862619D6056fdFE
   address internal constant DAI_S_TOKEN = 0x94Bb76d2420C1F083c53061CA862619D6056fdFE;
 
-  // https://sepolia.scrollscan.com/address/0x58A5C0E02CF344c538F4Cf8d3EFC51e7c134B31A
+  // https://sepolia-blockscout.scroll.io/address/0x58A5C0E02CF344c538F4Cf8d3EFC51e7c134B31A
   address internal constant DAI_ORACLE = 0x58A5C0E02CF344c538F4Cf8d3EFC51e7c134B31A;
 
-  // https://sepolia.scrollscan.com/address/0x85AD5a4a0974b6092d1F7369eC39c8b2255b8e6f
+  // https://sepolia-blockscout.scroll.io/address/0x85AD5a4a0974b6092d1F7369eC39c8b2255b8e6f
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0x85AD5a4a0974b6092d1F7369eC39c8b2255b8e6f;
 
-  // https://sepolia.scrollscan.com/address/0x279cBF5B7e3651F03CB9b71A9E7A3c924b267801
+  // https://sepolia-blockscout.scroll.io/address/0x279cBF5B7e3651F03CB9b71A9E7A3c924b267801
   address internal constant LINK_UNDERLYING = 0x279cBF5B7e3651F03CB9b71A9E7A3c924b267801;
 
   uint8 internal constant LINK_DECIMALS = 18;
 
-  // https://sepolia.scrollscan.com/address/0x55DD1cDFE13fCa68F6D14D452E2a20cABe191841
+  // https://sepolia-blockscout.scroll.io/address/0x55DD1cDFE13fCa68F6D14D452E2a20cABe191841
   address internal constant LINK_A_TOKEN = 0x55DD1cDFE13fCa68F6D14D452E2a20cABe191841;
 
-  // https://sepolia.scrollscan.com/address/0x2f42470c67aA2f6D7d2855FBB691179a6Dba4822
+  // https://sepolia-blockscout.scroll.io/address/0x2f42470c67aA2f6D7d2855FBB691179a6Dba4822
   address internal constant LINK_V_TOKEN = 0x2f42470c67aA2f6D7d2855FBB691179a6Dba4822;
 
-  // https://sepolia.scrollscan.com/address/0x89Bb2A2904E89A90559e423Ec8ec00cc2E127146
+  // https://sepolia-blockscout.scroll.io/address/0x89Bb2A2904E89A90559e423Ec8ec00cc2E127146
   address internal constant LINK_S_TOKEN = 0x89Bb2A2904E89A90559e423Ec8ec00cc2E127146;
 
-  // https://sepolia.scrollscan.com/address/0x01BdbF85210e113db2216e837D9b1e401eb7003e
+  // https://sepolia-blockscout.scroll.io/address/0x01BdbF85210e113db2216e837D9b1e401eb7003e
   address internal constant LINK_ORACLE = 0x01BdbF85210e113db2216e837D9b1e401eb7003e;
 
-  // https://sepolia.scrollscan.com/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
+  // https://sepolia-blockscout.scroll.io/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0x9a8D012c2e26cE911AD211976aa06Ca020487389;
 
-  // https://sepolia.scrollscan.com/address/0x2C9678042D52B97D27f2bD2947F7111d93F3dD0D
+  // https://sepolia-blockscout.scroll.io/address/0x2C9678042D52B97D27f2bD2947F7111d93F3dD0D
   address internal constant USDC_UNDERLYING = 0x2C9678042D52B97D27f2bD2947F7111d93F3dD0D;
 
   uint8 internal constant USDC_DECIMALS = 6;
 
-  // https://sepolia.scrollscan.com/address/0x6E4A1BcBd3C3038e6957207cadC1A17092DC7ba3
+  // https://sepolia-blockscout.scroll.io/address/0x6E4A1BcBd3C3038e6957207cadC1A17092DC7ba3
   address internal constant USDC_A_TOKEN = 0x6E4A1BcBd3C3038e6957207cadC1A17092DC7ba3;
 
-  // https://sepolia.scrollscan.com/address/0x6ED2eB0A4141975A8A33558234137265f36055f7
+  // https://sepolia-blockscout.scroll.io/address/0x6ED2eB0A4141975A8A33558234137265f36055f7
   address internal constant USDC_V_TOKEN = 0x6ED2eB0A4141975A8A33558234137265f36055f7;
 
-  // https://sepolia.scrollscan.com/address/0x307a974951cb1a06635432c40C8efDbc5C67446D
+  // https://sepolia-blockscout.scroll.io/address/0x307a974951cb1a06635432c40C8efDbc5C67446D
   address internal constant USDC_S_TOKEN = 0x307a974951cb1a06635432c40C8efDbc5C67446D;
 
-  // https://sepolia.scrollscan.com/address/0xB1732127A07B05e6Ea1FA53c8B791560Ff768439
+  // https://sepolia-blockscout.scroll.io/address/0xB1732127A07B05e6Ea1FA53c8B791560Ff768439
   address internal constant USDC_ORACLE = 0xB1732127A07B05e6Ea1FA53c8B791560Ff768439;
 
-  // https://sepolia.scrollscan.com/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
+  // https://sepolia-blockscout.scroll.io/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x9c41A3E545126Cc2c160634405E00461Ec30F709;
 
-  // https://sepolia.scrollscan.com/address/0x5EA79f3190ff37418d42F9B2618688494dBD9693
+  // https://sepolia-blockscout.scroll.io/address/0x5EA79f3190ff37418d42F9B2618688494dBD9693
   address internal constant WBTC_UNDERLYING = 0x5EA79f3190ff37418d42F9B2618688494dBD9693;
 
   uint8 internal constant WBTC_DECIMALS = 8;
 
-  // https://sepolia.scrollscan.com/address/0x43AE2a14AD923915aa85d683D1b7d0d320ae87B2
+  // https://sepolia-blockscout.scroll.io/address/0x43AE2a14AD923915aa85d683D1b7d0d320ae87B2
   address internal constant WBTC_A_TOKEN = 0x43AE2a14AD923915aa85d683D1b7d0d320ae87B2;
 
-  // https://sepolia.scrollscan.com/address/0x52a011bF32a85D952aa259D85b705b7cF040836f
+  // https://sepolia-blockscout.scroll.io/address/0x52a011bF32a85D952aa259D85b705b7cF040836f
   address internal constant WBTC_V_TOKEN = 0x52a011bF32a85D952aa259D85b705b7cF040836f;
 
-  // https://sepolia.scrollscan.com/address/0x0e78aC6Bf2a391bbBD15C3DEFadeC7B5d9f00343
+  // https://sepolia-blockscout.scroll.io/address/0x0e78aC6Bf2a391bbBD15C3DEFadeC7B5d9f00343
   address internal constant WBTC_S_TOKEN = 0x0e78aC6Bf2a391bbBD15C3DEFadeC7B5d9f00343;
 
-  // https://sepolia.scrollscan.com/address/0xb09f1850207Af7AFcd564632bB541B7b3c776006
+  // https://sepolia-blockscout.scroll.io/address/0xb09f1850207Af7AFcd564632bB541B7b3c776006
   address internal constant WBTC_ORACLE = 0xb09f1850207Af7AFcd564632bB541B7b3c776006;
 
-  // https://sepolia.scrollscan.com/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
+  // https://sepolia-blockscout.scroll.io/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x9a8D012c2e26cE911AD211976aa06Ca020487389;
 
-  // https://sepolia.scrollscan.com/address/0xb123dCe044EdF0a755505d9623Fba16C0F41cae9
+  // https://sepolia-blockscout.scroll.io/address/0xb123dCe044EdF0a755505d9623Fba16C0F41cae9
   address internal constant WETH_UNDERLYING = 0xb123dCe044EdF0a755505d9623Fba16C0F41cae9;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://sepolia.scrollscan.com/address/0x9E8CEC4F2F4596141B62e88966D7167E9db555aD
+  // https://sepolia-blockscout.scroll.io/address/0x9E8CEC4F2F4596141B62e88966D7167E9db555aD
   address internal constant WETH_A_TOKEN = 0x9E8CEC4F2F4596141B62e88966D7167E9db555aD;
 
-  // https://sepolia.scrollscan.com/address/0xD502CD7A595ec36992b0601fae0A4b50A88084D4
+  // https://sepolia-blockscout.scroll.io/address/0xD502CD7A595ec36992b0601fae0A4b50A88084D4
   address internal constant WETH_V_TOKEN = 0xD502CD7A595ec36992b0601fae0A4b50A88084D4;
 
-  // https://sepolia.scrollscan.com/address/0xeab312503904945BfeC5d56dFaC03d69Ef11DdE5
+  // https://sepolia-blockscout.scroll.io/address/0xeab312503904945BfeC5d56dFaC03d69Ef11DdE5
   address internal constant WETH_S_TOKEN = 0xeab312503904945BfeC5d56dFaC03d69Ef11DdE5;
 
-  // https://sepolia.scrollscan.com/address/0xA0579Ea869d26CE4dfED0b65b54A08A4BdF3F5A8
+  // https://sepolia-blockscout.scroll.io/address/0xA0579Ea869d26CE4dfED0b65b54A08A4BdF3F5A8
   address internal constant WETH_ORACLE = 0xA0579Ea869d26CE4dfED0b65b54A08A4BdF3F5A8;
 
-  // https://sepolia.scrollscan.com/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
+  // https://sepolia-blockscout.scroll.io/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x9a8D012c2e26cE911AD211976aa06Ca020487389;
 
-  // https://sepolia.scrollscan.com/address/0x186C0C26c45A8DA1Da34339ee513624a9609156d
+  // https://sepolia-blockscout.scroll.io/address/0x186C0C26c45A8DA1Da34339ee513624a9609156d
   address internal constant USDT_UNDERLYING = 0x186C0C26c45A8DA1Da34339ee513624a9609156d;
 
   uint8 internal constant USDT_DECIMALS = 6;
 
-  // https://sepolia.scrollscan.com/address/0x54Cb3ba40705d7CCB18c1C24edD8B602a88eF4CE
+  // https://sepolia-blockscout.scroll.io/address/0x54Cb3ba40705d7CCB18c1C24edD8B602a88eF4CE
   address internal constant USDT_A_TOKEN = 0x54Cb3ba40705d7CCB18c1C24edD8B602a88eF4CE;
 
-  // https://sepolia.scrollscan.com/address/0x4cB0Dd10789208630F4def0DAAB4161f4Bb7b09D
+  // https://sepolia-blockscout.scroll.io/address/0x4cB0Dd10789208630F4def0DAAB4161f4Bb7b09D
   address internal constant USDT_V_TOKEN = 0x4cB0Dd10789208630F4def0DAAB4161f4Bb7b09D;
 
-  // https://sepolia.scrollscan.com/address/0x197E7980a9A5b2BE23345A492612FBb53317fb1D
+  // https://sepolia-blockscout.scroll.io/address/0x197E7980a9A5b2BE23345A492612FBb53317fb1D
   address internal constant USDT_S_TOKEN = 0x197E7980a9A5b2BE23345A492612FBb53317fb1D;
 
-  // https://sepolia.scrollscan.com/address/0x2d00F2DBA40e677E23AC442B5ab932Ce699d163e
+  // https://sepolia-blockscout.scroll.io/address/0x2d00F2DBA40e677E23AC442B5ab932Ce699d163e
   address internal constant USDT_ORACLE = 0x2d00F2DBA40e677E23AC442B5ab932Ce699d163e;
 
-  // https://sepolia.scrollscan.com/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
+  // https://sepolia-blockscout.scroll.io/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0x9c41A3E545126Cc2c160634405E00461Ec30F709;
 
-  // https://sepolia.scrollscan.com/address/0xfc2921bE7B2762F0E87039905d6019B0fF5978a8
+  // https://sepolia-blockscout.scroll.io/address/0xfc2921bE7B2762F0E87039905d6019B0fF5978a8
   address internal constant AAVE_UNDERLYING = 0xfc2921bE7B2762F0E87039905d6019B0fF5978a8;
 
   uint8 internal constant AAVE_DECIMALS = 18;
 
-  // https://sepolia.scrollscan.com/address/0xC5209E1325A0DBeb28143D82e7E1DE709456Fc8a
+  // https://sepolia-blockscout.scroll.io/address/0xC5209E1325A0DBeb28143D82e7E1DE709456Fc8a
   address internal constant AAVE_A_TOKEN = 0xC5209E1325A0DBeb28143D82e7E1DE709456Fc8a;
 
-  // https://sepolia.scrollscan.com/address/0x7AE95AD823943283c3D5b7E9bE5E24414ba980cD
+  // https://sepolia-blockscout.scroll.io/address/0x7AE95AD823943283c3D5b7E9bE5E24414ba980cD
   address internal constant AAVE_V_TOKEN = 0x7AE95AD823943283c3D5b7E9bE5E24414ba980cD;
 
-  // https://sepolia.scrollscan.com/address/0xD6CB6AE9f09eD5ffE6e0374482F9D64707Df061C
+  // https://sepolia-blockscout.scroll.io/address/0xD6CB6AE9f09eD5ffE6e0374482F9D64707Df061C
   address internal constant AAVE_S_TOKEN = 0xD6CB6AE9f09eD5ffE6e0374482F9D64707Df061C;
 
-  // https://sepolia.scrollscan.com/address/0x79fb53cF4Ba1B59E07Eeed92D641F8374DaAFC8f
+  // https://sepolia-blockscout.scroll.io/address/0x79fb53cF4Ba1B59E07Eeed92D641F8374DaAFC8f
   address internal constant AAVE_ORACLE = 0x79fb53cF4Ba1B59E07Eeed92D641F8374DaAFC8f;
 
-  // https://sepolia.scrollscan.com/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
+  // https://sepolia-blockscout.scroll.io/address/0x9a8D012c2e26cE911AD211976aa06Ca020487389
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0x9a8D012c2e26cE911AD211976aa06Ca020487389;
 
-  // https://sepolia.scrollscan.com/address/0xDf40f3a3566b4271450083f1Ad5732590BA47575
+  // https://sepolia-blockscout.scroll.io/address/0xDf40f3a3566b4271450083f1Ad5732590BA47575
   address internal constant EURS_UNDERLYING = 0xDf40f3a3566b4271450083f1Ad5732590BA47575;
 
   uint8 internal constant EURS_DECIMALS = 2;
 
-  // https://sepolia.scrollscan.com/address/0xD49d1CF2886B1c95A94e8a9066E8b298646716b6
+  // https://sepolia-blockscout.scroll.io/address/0xD49d1CF2886B1c95A94e8a9066E8b298646716b6
   address internal constant EURS_A_TOKEN = 0xD49d1CF2886B1c95A94e8a9066E8b298646716b6;
 
-  // https://sepolia.scrollscan.com/address/0x2160F75FB89A6C35Bd59Ecf120B26f459956c925
+  // https://sepolia-blockscout.scroll.io/address/0x2160F75FB89A6C35Bd59Ecf120B26f459956c925
   address internal constant EURS_V_TOKEN = 0x2160F75FB89A6C35Bd59Ecf120B26f459956c925;
 
-  // https://sepolia.scrollscan.com/address/0x5D77C7207385a3D2A731f13E555066B209a2b9fc
+  // https://sepolia-blockscout.scroll.io/address/0x5D77C7207385a3D2A731f13E555066B209a2b9fc
   address internal constant EURS_S_TOKEN = 0x5D77C7207385a3D2A731f13E555066B209a2b9fc;
 
-  // https://sepolia.scrollscan.com/address/0xC6C58919440AD9daBF04D85b29820477AE7E808E
+  // https://sepolia-blockscout.scroll.io/address/0xC6C58919440AD9daBF04D85b29820477AE7E808E
   address internal constant EURS_ORACLE = 0xC6C58919440AD9daBF04D85b29820477AE7E808E;
 
-  // https://sepolia.scrollscan.com/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
+  // https://sepolia-blockscout.scroll.io/address/0x9c41A3E545126Cc2c160634405E00461Ec30F709
   address internal constant EURS_INTEREST_RATE_STRATEGY =
     0x9c41A3E545126Cc2c160634405E00461Ec30F709;
 }
diff --git a/src/GovernanceV3Avalanche.sol b/src/GovernanceV3Avalanche.sol
index 8c6128e1..cd3a4fe2 100644
--- a/src/GovernanceV3Avalanche.sol
+++ b/src/GovernanceV3Avalanche.sol
@@ -5,36 +5,36 @@ pragma solidity >=0.6.0;
 import {IGovernanceCore, IPayloadsControllerCore, IDataWarehouse, IVotingStrategy} from './GovernanceV3.sol';
 
 library GovernanceV3Avalanche {
-  // https://snowtrace.io/address/0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928
+  // https://snowscan.xyz/address/0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928
   address internal constant CROSS_CHAIN_CONTROLLER = 0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928;
 
-  // https://snowtrace.io/address/0x41185495Bc8297a65DC46f94001DC7233775EbEe
+  // https://snowscan.xyz/address/0x41185495Bc8297a65DC46f94001DC7233775EbEe
   address internal constant CL_EMERGENCY_ORACLE = 0x41185495Bc8297a65DC46f94001DC7233775EbEe;
 
-  // https://snowtrace.io/address/0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F
+  // https://snowscan.xyz/address/0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F
   address internal constant VOTING_MACHINE = 0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F;
 
-  // https://snowtrace.io/address/0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80
+  // https://snowscan.xyz/address/0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80
   IPayloadsControllerCore internal constant PAYLOADS_CONTROLLER =
     IPayloadsControllerCore(0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80);
 
-  // https://snowtrace.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
+  // https://snowscan.xyz/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
   address internal constant PC_DATA_HELPER = 0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A;
 
-  // https://snowtrace.io/address/0x77976B51569896523EE215962Ee91ff236Fa50E8
+  // https://snowscan.xyz/address/0x77976B51569896523EE215962Ee91ff236Fa50E8
   address internal constant VM_DATA_HELPER = 0x77976B51569896523EE215962Ee91ff236Fa50E8;
 
-  // https://snowtrace.io/address/0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65
+  // https://snowscan.xyz/address/0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65
   address internal constant GRANULAR_GUARDIAN = 0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65;
 
-  // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+  // https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
   address internal constant EXECUTOR_LVL_1 = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
-  // https://snowtrace.io/address/0x690C218668B440204F369Af1541245d367cc805C
+  // https://snowscan.xyz/address/0x690C218668B440204F369Af1541245d367cc805C
   IVotingStrategy internal constant VOTING_STRATEGY =
     IVotingStrategy(0x690C218668B440204F369Af1541245d367cc805C);
 
-  // https://snowtrace.io/address/0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff
+  // https://snowscan.xyz/address/0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff
   IDataWarehouse internal constant DATA_WAREHOUSE =
     IDataWarehouse(0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff);
 }
diff --git a/src/GovernanceV3Fuji.sol b/src/GovernanceV3Fuji.sol
index 0a7f877b..84e767e5 100644
--- a/src/GovernanceV3Fuji.sol
+++ b/src/GovernanceV3Fuji.sol
@@ -5,24 +5,24 @@ pragma solidity >=0.6.0;
 import {IGovernanceCore, IPayloadsControllerCore, IDataWarehouse, IVotingStrategy} from './GovernanceV3.sol';
 
 library GovernanceV3Fuji {
-  // https://testnet.snowtrace.io/address/0x5488A48E5C22175548E8d68622211F5928cBbf23
+  // https://testnet.snowscan.xyz/address/0x5488A48E5C22175548E8d68622211F5928cBbf23
   address internal constant CROSS_CHAIN_CONTROLLER = 0x5488A48E5C22175548E8d68622211F5928cBbf23;
 
-  // https://testnet.snowtrace.io/address/0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0
+  // https://testnet.snowscan.xyz/address/0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0
   address internal constant VOTING_MACHINE = 0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0;
 
-  // https://testnet.snowtrace.io/address/0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15
+  // https://testnet.snowscan.xyz/address/0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15
   IPayloadsControllerCore internal constant PAYLOADS_CONTROLLER =
     IPayloadsControllerCore(0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15);
 
-  // https://testnet.snowtrace.io/address/0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6
+  // https://testnet.snowscan.xyz/address/0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6
   address internal constant EXECUTOR_LVL_1 = 0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6;
 
-  // https://testnet.snowtrace.io/address/0x8c55a1bf3DC7076522C5cd025f497A498eF90143
+  // https://testnet.snowscan.xyz/address/0x8c55a1bf3DC7076522C5cd025f497A498eF90143
   IVotingStrategy internal constant VOTING_STRATEGY =
     IVotingStrategy(0x8c55a1bf3DC7076522C5cd025f497A498eF90143);
 
-  // https://testnet.snowtrace.io/address/0xDB23939d4C483E748c2487916fB20d7fF7e39588
+  // https://testnet.snowscan.xyz/address/0xDB23939d4C483E748c2487916fB20d7fF7e39588
   IDataWarehouse internal constant DATA_WAREHOUSE =
     IDataWarehouse(0xDB23939d4C483E748c2487916fB20d7fF7e39588);
 }
diff --git a/src/GovernanceV3Metis.sol b/src/GovernanceV3Metis.sol
index e146a54f..9d8aed66 100644
--- a/src/GovernanceV3Metis.sol
+++ b/src/GovernanceV3Metis.sol
@@ -5,19 +5,19 @@ pragma solidity >=0.6.0;
 import {IGovernanceCore, IPayloadsControllerCore, IDataWarehouse, IVotingStrategy} from './GovernanceV3.sol';
 
 library GovernanceV3Metis {
-  // https://explorer.metis.io/address/0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70
+  // https://andromeda-explorer.metis.io/address/0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70
   address internal constant CROSS_CHAIN_CONTROLLER = 0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70;
 
-  // https://explorer.metis.io/address/0x2233F8A66A728FBa6E1dC95570B25360D07D5524
+  // https://andromeda-explorer.metis.io/address/0x2233F8A66A728FBa6E1dC95570B25360D07D5524
   IPayloadsControllerCore internal constant PAYLOADS_CONTROLLER =
     IPayloadsControllerCore(0x2233F8A66A728FBa6E1dC95570B25360D07D5524);
 
-  // https://explorer.metis.io/address/0x81d32B36380e6266e1BDd490eAC56cdB300afBe0
+  // https://andromeda-explorer.metis.io/address/0x81d32B36380e6266e1BDd490eAC56cdB300afBe0
   address internal constant PC_DATA_HELPER = 0x81d32B36380e6266e1BDd490eAC56cdB300afBe0;
 
-  // https://explorer.metis.io/address/0x61BE97d3a0550549f67CA7421725fA73Fa2036B5
+  // https://andromeda-explorer.metis.io/address/0x61BE97d3a0550549f67CA7421725fA73Fa2036B5
   address internal constant GRANULAR_GUARDIAN = 0x61BE97d3a0550549f67CA7421725fA73Fa2036B5;
 
-  // https://explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+  // https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
   address internal constant EXECUTOR_LVL_1 = 0x6fD45D32375d5aDB8D76275A3932c740F03a8718;
 }
diff --git a/src/MiscAvalanche.sol b/src/MiscAvalanche.sol
index 29467f39..61cf03f8 100644
--- a/src/MiscAvalanche.sol
+++ b/src/MiscAvalanche.sol
@@ -3,24 +3,24 @@
 pragma solidity >=0.6.0;
 
 library MiscAvalanche {
-  // https://snowtrace.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
+  // https://snowscan.xyz/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
   address internal constant PARASWAP_FEE_CLAIMER = 0x9abf798f5314BFd793A9E57A654BEd35af4A1D60;
 
-  // https://snowtrace.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
+  // https://snowscan.xyz/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
   address internal constant TRANSPARENT_PROXY_FACTORY = 0xB4e496f70602fE2AC6Ae511D028BA4D194773B29;
 
-  // https://snowtrace.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
+  // https://snowscan.xyz/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
   address internal constant PROXY_ADMIN = 0xD3cF979e676265e4f6379749DECe4708B9A22476;
 
-  // https://snowtrace.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
+  // https://snowscan.xyz/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
   address internal constant CREATE_3_FACTORY = 0x3b56998Ec06477704622ca8e2eA1b4db134cec32;
 
-  // https://snowtrace.io/address/0x06d958772304e7220fc3E463756CE01Ed0D24db2
+  // https://snowscan.xyz/address/0x06d958772304e7220fc3E463756CE01Ed0D24db2
   address internal constant AAVE_CL_ROBOT_OPERATOR = 0x06d958772304e7220fc3E463756CE01Ed0D24db2;
 
-  // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
+  // https://snowscan.xyz/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
   address internal constant PROTOCOL_GUARDIAN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
 
-  // https://snowtrace.io/address/0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E
+  // https://snowscan.xyz/address/0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E
   address internal constant AAVE_MERKLE_DISTRIBUTOR = 0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E;
 }
diff --git a/src/MiscFuji.sol b/src/MiscFuji.sol
index 0ff18e7b..bb422c23 100644
--- a/src/MiscFuji.sol
+++ b/src/MiscFuji.sol
@@ -3,6 +3,6 @@
 pragma solidity >=0.6.0;
 
 library MiscFuji {
-  // https://testnet.snowtrace.io/address/0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723
+  // https://testnet.snowscan.xyz/address/0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723
   address internal constant GHO_TOKEN = 0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723;
 }
diff --git a/src/MiscMetis.sol b/src/MiscMetis.sol
index abc2b79f..80e7d8de 100644
--- a/src/MiscMetis.sol
+++ b/src/MiscMetis.sol
@@ -3,15 +3,15 @@
 pragma solidity >=0.6.0;
 
 library MiscMetis {
-  // https://explorer.metis.io/address/0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB
+  // https://andromeda-explorer.metis.io/address/0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB
   address internal constant TRANSPARENT_PROXY_FACTORY = 0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB;
 
-  // https://explorer.metis.io/address/0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97
+  // https://andromeda-explorer.metis.io/address/0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97
   address internal constant PROXY_ADMIN = 0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97;
 
-  // https://explorer.metis.io/address/0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A
+  // https://andromeda-explorer.metis.io/address/0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A
   address internal constant CREATE_3_FACTORY = 0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A;
 
-  // https://explorer.metis.io/address/0xF6Db48C5968A9eBCB935786435530f28e32Cc501
+  // https://andromeda-explorer.metis.io/address/0xF6Db48C5968A9eBCB935786435530f28e32Cc501
   address internal constant PROTOCOL_GUARDIAN = 0xF6Db48C5968A9eBCB935786435530f28e32Cc501;
 }
diff --git a/src/ts/AaveGovernanceV2.ts b/src/ts/AaveGovernanceV2.ts
index 6738fdbb..85db6859 100644
--- a/src/ts/AaveGovernanceV2.ts
+++ b/src/ts/AaveGovernanceV2.ts
@@ -17,7 +17,7 @@ export const OPTIMISM_BRIDGE_EXECUTOR = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f
 // address https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
 export const ARBITRUM_BRIDGE_EXECUTOR = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
 
-// address https://explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
+// address https://andromeda-explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
 export const METIS_BRIDGE_EXECUTOR = '0x8EC77963068474a45016938Deb95E603Ca82a029';
 
 // address https://basescan.org/address/0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45
diff --git a/src/ts/AaveV2Avalanche.ts b/src/ts/AaveV2Avalanche.ts
index c315db48..9b324d16 100644
--- a/src/ts/AaveV2Avalanche.ts
+++ b/src/ts/AaveV2Avalanche.ts
@@ -1,83 +1,83 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// ILendingPoolAddressesProvider https://snowtrace.io/address/0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f
+// ILendingPoolAddressesProvider https://snowscan.xyz/address/0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f
 export const POOL_ADDRESSES_PROVIDER = '0xb6A86025F0FE1862B372cb0ca18CE3EDe02A318f';
 
-// ILendingPool https://snowtrace.io/address/0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C
+// ILendingPool https://snowscan.xyz/address/0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C
 export const POOL = '0x4F01AeD16D97E3aB5ab2B501154DC9bb0F1A5A2C';
 
-// https://snowtrace.io/address/0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029
+// https://snowscan.xyz/address/0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029
 export const POOL_IMPL = '0x102Bf2C03c1901AdBA191457A8c4A4eF18b40029';
 
-// ILendingPoolConfigurator https://snowtrace.io/address/0x230B618aD4C475393A7239aE03630042281BD86e
+// ILendingPoolConfigurator https://snowscan.xyz/address/0x230B618aD4C475393A7239aE03630042281BD86e
 export const POOL_CONFIGURATOR = '0x230B618aD4C475393A7239aE03630042281BD86e';
 
-// https://snowtrace.io/address/0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E
+// https://snowscan.xyz/address/0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E
 export const POOL_CONFIGURATOR_IMPL = '0x3616f776F2b5fAd02F2478DFd4822Fc70d24399E';
 
-// IAaveOracle https://snowtrace.io/address/0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89
+// IAaveOracle https://snowscan.xyz/address/0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89
 export const ORACLE = '0xdC336Cd4769f4cC7E9d726DA53e6d3fC710cEB89';
 
-// ILendingRateOracle https://snowtrace.io/address/0xc34254642B504484465F38Cb1CC396d45a9c7c80
+// ILendingRateOracle https://snowscan.xyz/address/0xc34254642B504484465F38Cb1CC396d45a9c7c80
 export const LENDING_RATE_ORACLE = '0xc34254642B504484465F38Cb1CC396d45a9c7c80';
 
-// IAaveProtocolDataProvider https://snowtrace.io/address/0x65285E9dfab318f57051ab2b139ccCf232945451
+// IAaveProtocolDataProvider https://snowscan.xyz/address/0x65285E9dfab318f57051ab2b139ccCf232945451
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x65285E9dfab318f57051ab2b139ccCf232945451';
 
-// https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+// https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
 export const POOL_ADMIN = '0x3C06dce358add17aAf230f2234bCCC4afd50d090';
 
-// https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
+// https://snowscan.xyz/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
 export const EMERGENCY_ADMIN = '0xa35b76E4935449E33C56aB24b23fcd3246f13470';
 
-// ICollector https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
+// ICollector https://snowscan.xyz/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
 export const COLLECTOR = '0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0';
 
-// https://snowtrace.io/address/0x01D83Fe6A10D2f2B7AF17034343746188272cAc9
+// https://snowscan.xyz/address/0x01D83Fe6A10D2f2B7AF17034343746188272cAc9
 export const DEFAULT_INCENTIVES_CONTROLLER = '0x01D83Fe6A10D2f2B7AF17034343746188272cAc9';
 
-// https://snowtrace.io/address/0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26
+// https://snowscan.xyz/address/0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26
 export const EMISSION_MANAGER = '0x5CfCd7E6D055Ba4f7B998914336254aDE3F69f26';
 
-// https://snowtrace.io/address/0x69A45013F047A65422deFdD0C43f09530D7025c0
+// https://snowscan.xyz/address/0x69A45013F047A65422deFdD0C43f09530D7025c0
 export const LENDING_POOL_COLLATERAL_MANAGER = '0x69A45013F047A65422deFdD0C43f09530D7025c0';
 
-// https://snowtrace.io/address/0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73
+// https://snowscan.xyz/address/0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73
 export const DEBT_SWAP_ADAPTER = '0xc1D40f4cF36e4aE4108Ffa08818cD16c2d9aEF73';
 
-// https://snowtrace.io/address/0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c
+// https://snowscan.xyz/address/0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c
 export const CONFIG_ENGINE = '0x7902F3c60f05b5A6b7e4Ce0Cac11Cb17bC8e607c';
 
-// https://snowtrace.io/address/0xf50a080aC535e531EC33cC05b227E910De2fb1fA
+// https://snowscan.xyz/address/0xf50a080aC535e531EC33cC05b227E910De2fb1fA
 export const MIGRATION_HELPER = '0xf50a080aC535e531EC33cC05b227E910De2fb1fA';
 
-// https://snowtrace.io/address/0x4235E22d9C3f28DCDA82b58276cb6370B01265C2
+// https://snowscan.xyz/address/0x4235E22d9C3f28DCDA82b58276cb6370B01265C2
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x4235E22d9C3f28DCDA82b58276cb6370B01265C2';
 
-// https://snowtrace.io/address/0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8
+// https://snowscan.xyz/address/0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8
 export const PROOF_OF_RESERVE = '0x7fc3FCb14eF04A48Bb0c12f0c39CD74C249c37d8';
 
-// https://snowtrace.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
+// https://snowscan.xyz/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
 export const PROOF_OF_RESERVE_AGGREGATOR = '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439';
 
-// https://snowtrace.io/address/0x6e66E50870A93691C1b953788A3219e01fDdeDD7
+// https://snowscan.xyz/address/0x6e66E50870A93691C1b953788A3219e01fDdeDD7
 export const RATES_FACTORY = '0x6e66E50870A93691C1b953788A3219e01fDdeDD7';
 
-// https://snowtrace.io/address/0x935b362EE3E1f342cc48118C528AAbee5118F6e6
+// https://snowscan.xyz/address/0x935b362EE3E1f342cc48118C528AAbee5118F6e6
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x935b362EE3E1f342cc48118C528AAbee5118F6e6';
 
-// https://snowtrace.io/address/0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5
+// https://snowscan.xyz/address/0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5
 export const SWAP_COLLATERAL_ADAPTER = '0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5';
 
-// https://snowtrace.io/address/0x11979886A6dBAE27D7a72c49fCF3F23240D647bF
+// https://snowscan.xyz/address/0x11979886A6dBAE27D7a72c49fCF3F23240D647bF
 export const UI_INCENTIVE_DATA_PROVIDER = '0x11979886A6dBAE27D7a72c49fCF3F23240D647bF';
 
-// https://snowtrace.io/address/0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A
+// https://snowscan.xyz/address/0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A
 export const UI_POOL_DATA_PROVIDER = '0x00e50FAB64eBB37b87df06Aa46b8B35d5f1A4e1A';
 
-// https://snowtrace.io/address/0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6
+// https://snowscan.xyz/address/0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6
 export const WALLET_BALANCE_PROVIDER = '0x73e4898a1Bfa9f710B6A6AB516403A6299e01fc6';
 
-// https://snowtrace.io/address/0x68c815cB8C8390bc3F2CE99265044dEC9D350C49
+// https://snowscan.xyz/address/0x68c815cB8C8390bc3F2CE99265044dEC9D350C49
 export const WETH_GATEWAY = '0x68c815cB8C8390bc3F2CE99265044dEC9D350C49';
 
 export const CHAIN_ID = 43114;
diff --git a/src/ts/AaveV2Fuji.ts b/src/ts/AaveV2Fuji.ts
index 998faa49..d632aa23 100644
--- a/src/ts/AaveV2Fuji.ts
+++ b/src/ts/AaveV2Fuji.ts
@@ -1,62 +1,62 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// ILendingPoolAddressesProvider https://testnet.snowtrace.io/address/0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f
+// ILendingPoolAddressesProvider https://testnet.snowscan.xyz/address/0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f
 export const POOL_ADDRESSES_PROVIDER = '0x7fdC1FdF79BE3309bf82f4abdAD9f111A6590C0f';
 
-// ILendingPool https://testnet.snowtrace.io/address/0x76cc67FF2CC77821A70ED14321111Ce381C2594D
+// ILendingPool https://testnet.snowscan.xyz/address/0x76cc67FF2CC77821A70ED14321111Ce381C2594D
 export const POOL = '0x76cc67FF2CC77821A70ED14321111Ce381C2594D';
 
-// https://testnet.snowtrace.io/address/0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1
+// https://testnet.snowscan.xyz/address/0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1
 export const POOL_IMPL = '0x6C66d96ACCCCC2E6F576813A480AD230D56FB2F1';
 
-// ILendingPoolConfigurator https://testnet.snowtrace.io/address/0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3
+// ILendingPoolConfigurator https://testnet.snowscan.xyz/address/0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3
 export const POOL_CONFIGURATOR = '0x4ceBAFAAcc6Cb26FD90E4cDe138Eb812442bb5f3';
 
-// https://testnet.snowtrace.io/address/0x4f350F6D1688ca1eae4811e182569130a8B6CCaf
+// https://testnet.snowscan.xyz/address/0x4f350F6D1688ca1eae4811e182569130a8B6CCaf
 export const POOL_CONFIGURATOR_IMPL = '0x4f350F6D1688ca1eae4811e182569130a8B6CCaf';
 
-// IAaveOracle https://testnet.snowtrace.io/address/0xfa4f5B081632c4709667D467F817C09d9008A46A
+// IAaveOracle https://testnet.snowscan.xyz/address/0xfa4f5B081632c4709667D467F817C09d9008A46A
 export const ORACLE = '0xfa4f5B081632c4709667D467F817C09d9008A46A';
 
-// ILendingRateOracle https://testnet.snowtrace.io/address/0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8
+// ILendingRateOracle https://testnet.snowscan.xyz/address/0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8
 export const LENDING_RATE_ORACLE = '0x76Ec7c83aCb6af821E61F1DF1E0aBE684Bc904F8';
 
-// IAaveProtocolDataProvider https://testnet.snowtrace.io/address/0x0668EDE013c1c475724523409b8B6bE633469585
+// IAaveProtocolDataProvider https://testnet.snowscan.xyz/address/0x0668EDE013c1c475724523409b8B6bE633469585
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x0668EDE013c1c475724523409b8B6bE633469585';
 
-// https://testnet.snowtrace.io/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
+// https://testnet.snowscan.xyz/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
 export const POOL_ADMIN = '0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e';
 
-// https://testnet.snowtrace.io/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
+// https://testnet.snowscan.xyz/address/0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e
 export const EMERGENCY_ADMIN = '0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e';
 
-// ICollector https://testnet.snowtrace.io/address/0xB45F5C501A22288dfdb897e5f73E189597e09288
+// ICollector https://testnet.snowscan.xyz/address/0xB45F5C501A22288dfdb897e5f73E189597e09288
 export const COLLECTOR = '0xB45F5C501A22288dfdb897e5f73E189597e09288';
 
-// https://testnet.snowtrace.io/address/0xa1EF206fb9a8D8186157FC817fCddcC47727ED55
+// https://testnet.snowscan.xyz/address/0xa1EF206fb9a8D8186157FC817fCddcC47727ED55
 export const DEFAULT_INCENTIVES_CONTROLLER = '0xa1EF206fb9a8D8186157FC817fCddcC47727ED55';
 
-// https://testnet.snowtrace.io/address/0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2
+// https://testnet.snowscan.xyz/address/0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2
 export const EMISSION_MANAGER = '0x3b60cABB2C0e9ADe3e364b1F9752342A5D6079e2';
 
-// https://testnet.snowtrace.io/address/0x007bbD6A554E27EcdA1D10b40974eb7478799EcB
+// https://testnet.snowscan.xyz/address/0x007bbD6A554E27EcdA1D10b40974eb7478799EcB
 export const LENDING_POOL_COLLATERAL_MANAGER = '0x007bbD6A554E27EcdA1D10b40974eb7478799EcB';
 
-// https://testnet.snowtrace.io/address/0x90E5BAc5A98fff59617080848959f44eACB4Cd7B
+// https://testnet.snowscan.xyz/address/0x90E5BAc5A98fff59617080848959f44eACB4Cd7B
 export const FAUCET = '0x90E5BAc5A98fff59617080848959f44eACB4Cd7B';
 
-// https://testnet.snowtrace.io/address/0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF
+// https://testnet.snowscan.xyz/address/0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x04A6Fa9999E3C807Ee7b6Ca58eFAb93713d405BF';
 
-// https://testnet.snowtrace.io/address/0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b
+// https://testnet.snowscan.xyz/address/0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b
 export const UI_INCENTIVE_DATA_PROVIDER = '0x9842E5B7b7C6cEDfB1952a388e050582Ff95645b';
 
-// https://testnet.snowtrace.io/address/0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45
+// https://testnet.snowscan.xyz/address/0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45
 export const UI_POOL_DATA_PROVIDER = '0x88b4013f8C50e61ab027Cc253ab9a50663e2dF45';
 
-// https://testnet.snowtrace.io/address/0x3f5A507B33260a3869878B31FB90F04F451d28e3
+// https://testnet.snowscan.xyz/address/0x3f5A507B33260a3869878B31FB90F04F451d28e3
 export const WALLET_BALANCE_PROVIDER = '0x3f5A507B33260a3869878B31FB90F04F451d28e3';
 
-// https://testnet.snowtrace.io/address/0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335
+// https://testnet.snowscan.xyz/address/0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335
 export const WETH_GATEWAY = '0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335';
 
 export const CHAIN_ID = 43113;
diff --git a/src/ts/AaveV3Arbitrum.ts b/src/ts/AaveV3Arbitrum.ts
index 7f223ae0..f3e2ffb6 100644
--- a/src/ts/AaveV3Arbitrum.ts
+++ b/src/ts/AaveV3Arbitrum.ts
@@ -50,6 +50,9 @@ export const EMISSION_MANAGER = '0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73';
 // https://arbiscan.io/address/0xADf86b537eF08591c2777E144322E8b0Ca7E82a7
 export const CAPS_PLUS_RISK_STEWARD = '0xADf86b537eF08591c2777E144322E8b0Ca7E82a7';
 
+// https://arbiscan.io/address/0x9EEa1Ba822d204077e9f90a92D30432417184587
+export const RISK_STEWARD = '0x9EEa1Ba822d204077e9f90a92D30432417184587';
+
 // https://arbiscan.io/address/0xe59470B3BE3293534603487E00A44C72f2CD466d
 export const FREEZING_STEWARD = '0xe59470B3BE3293534603487E00A44C72f2CD466d';
 
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index 1a227679..e3d766dd 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -1,92 +1,95 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://snowtrace.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
+// IPoolAddressesProvider https://snowscan.xyz/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
 export const POOL_ADDRESSES_PROVIDER = '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb';
 
-// IPool https://snowtrace.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
+// IPool https://snowscan.xyz/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
 export const POOL = '0x794a61358D6845594F94dc1DB02A252b5b4814aD';
 
-// https://snowtrace.io/address/0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477
+// https://snowscan.xyz/address/0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477
 export const POOL_IMPL = '0xc4F7b5d4ca00eE04cF9887D5D811d3C5d6506477';
 
-// IPoolConfigurator https://snowtrace.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
+// IPoolConfigurator https://snowscan.xyz/address/0x8145eddDf43f50276641b55bd3AD95944510021E
 export const POOL_CONFIGURATOR = '0x8145eddDf43f50276641b55bd3AD95944510021E';
 
-// https://snowtrace.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
+// https://snowscan.xyz/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
 export const POOL_CONFIGURATOR_IMPL = '0x419226e0Ad27f3B2019123f7246a364622b018e5';
 
-// IAaveOracle https://snowtrace.io/address/0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C
+// IAaveOracle https://snowscan.xyz/address/0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C
 export const ORACLE = '0xEBd36016B3eD09D4693Ed4251c67Bd858c3c7C9C';
 
-// IPoolDataProvider https://snowtrace.io/address/0x7deEB8aCE4220643D8edeC871a23807E4d006eE5
+// IPoolDataProvider https://snowscan.xyz/address/0x7deEB8aCE4220643D8edeC871a23807E4d006eE5
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x7deEB8aCE4220643D8edeC871a23807E4d006eE5';
 
-// IACLManager https://snowtrace.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
+// IACLManager https://snowscan.xyz/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+// https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
 export const ACL_ADMIN = '0x3C06dce358add17aAf230f2234bCCC4afd50d090';
 
-// ICollector https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
+// ICollector https://snowscan.xyz/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
 export const COLLECTOR = '0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0';
 
-// https://snowtrace.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
+// https://snowscan.xyz/address/0x929EC64c34a17401F460460D4B9390518E5B473e
 export const DEFAULT_INCENTIVES_CONTROLLER = '0x929EC64c34a17401F460460D4B9390518E5B473e';
 
-// https://snowtrace.io/address/0x1E81af09001aD208BDa68FF022544dB2102A752d
+// https://snowscan.xyz/address/0x1E81af09001aD208BDa68FF022544dB2102A752d
 export const DEFAULT_A_TOKEN_IMPL_REV_2 = '0x1E81af09001aD208BDa68FF022544dB2102A752d';
 
-// https://snowtrace.io/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
+// https://snowscan.xyz/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_2 = '0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24';
 
-// https://snowtrace.io/address/0xccf12894957E637Bd69693B12F3ba12b539C2D11
+// https://snowscan.xyz/address/0xccf12894957E637Bd69693B12F3ba12b539C2D11
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_3 = '0xccf12894957E637Bd69693B12F3ba12b539C2D11';
 
-// https://snowtrace.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
+// https://snowscan.xyz/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
 export const EMISSION_MANAGER = '0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73';
 
-// https://snowtrace.io/address/0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5
+// https://snowscan.xyz/address/0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5
 export const CAPS_PLUS_RISK_STEWARD = '0xD2C92b5A793e196aB11dBefBe3Af6BddeD6c3DD5';
 
-// https://snowtrace.io/address/0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99
+// https://snowscan.xyz/address/0x5d7e9a32E0c3db609089186bEBC4B9d8Eb86ad2c
+export const RISK_STEWARD = '0x5d7e9a32E0c3db609089186bEBC4B9d8Eb86ad2c';
+
+// https://snowscan.xyz/address/0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99
 export const FREEZING_STEWARD = '0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99';
 
-// https://snowtrace.io/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
+// https://snowscan.xyz/address/0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4
 export const DEBT_SWAP_ADAPTER = '0x8A9b2c132EA7676EE267F5b97b622083d6E3a2d4';
 
-// https://snowtrace.io/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
+// https://snowscan.xyz/address/0x5fF5c392C5D397926364789E22f74043f7E42f2b
 export const CONFIG_ENGINE = '0x5fF5c392C5D397926364789E22f74043f7E42f2b';
 
-// https://snowtrace.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
+// https://snowscan.xyz/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x770ef9f4fe897e59daCc474EF11238303F9552b6';
 
-// https://snowtrace.io/address/0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc
+// https://snowscan.xyz/address/0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc
 export const PROOF_OF_RESERVE = '0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc';
 
-// https://snowtrace.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
+// https://snowscan.xyz/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
 export const PROOF_OF_RESERVE_AGGREGATOR = '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439';
 
-// https://snowtrace.io/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
+// https://snowscan.xyz/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9';
 
-// https://snowtrace.io/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
+// https://snowscan.xyz/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
 export const STATIC_A_TOKEN_FACTORY = '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19';
 
-// https://snowtrace.io/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
+// https://snowscan.xyz/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
 export const SWAP_COLLATERAL_ADAPTER = '0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A';
 
-// https://snowtrace.io/address/0x265d414f80b0fca9505710e6F16dB4b67555D365
+// https://snowscan.xyz/address/0x265d414f80b0fca9505710e6F16dB4b67555D365
 export const UI_INCENTIVE_DATA_PROVIDER = '0x265d414f80b0fca9505710e6F16dB4b67555D365';
 
-// https://snowtrace.io/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
+// https://snowscan.xyz/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
 export const UI_POOL_DATA_PROVIDER = '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9';
 
-// https://snowtrace.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
+// https://snowscan.xyz/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://snowtrace.io/address/0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0
+// https://snowscan.xyz/address/0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0
 export const WETH_GATEWAY = '0x2DeC8BCE3471eD65B1bB558Fa28439D45bF446d0';
 
-// https://snowtrace.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
+// https://snowscan.xyz/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
 
 export const CHAIN_ID = 43114;
diff --git a/src/ts/AaveV3BNB.ts b/src/ts/AaveV3BNB.ts
index 82998607..43cf4f91 100644
--- a/src/ts/AaveV3BNB.ts
+++ b/src/ts/AaveV3BNB.ts
@@ -47,6 +47,9 @@ export const EMISSION_MANAGER = '0x6eD1c70aa357fB8a7e1Eac85aa59e33287Df8f85';
 // https://bscscan.com/address/0x971F1C94b139AdEdedA729DA636e2B0C433Ff595
 export const CAPS_PLUS_RISK_STEWARD = '0x971F1C94b139AdEdedA729DA636e2B0C433Ff595';
 
+// https://bscscan.com/address/0x45918bB1D3F73904a30Ffc3eD11CdB1c05eBF726
+export const RISK_STEWARD = '0x45918bB1D3F73904a30Ffc3eD11CdB1c05eBF726';
+
 // https://bscscan.com/address/0x83f15Bc50d1A212576B202f80489502a7cc10412
 export const FREEZING_STEWARD = '0x83f15Bc50d1A212576B202f80489502a7cc10412';
 
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index f7446354..e34dc998 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -50,6 +50,9 @@ export const EMISSION_MANAGER = '0x6533A273F3aC84Df91DCD654D6EBAbA73687e246';
 // https://basescan.org/address/0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6
 export const CAPS_PLUS_RISK_STEWARD = '0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6';
 
+// https://basescan.org/address/0x963C0b3dFF5C35b171CcC11DAC006a605E42BeD2
+export const RISK_STEWARD = '0x963C0b3dFF5C35b171CcC11DAC006a605E42BeD2';
+
 // https://basescan.org/address/0x4A4c73d563395ad827511F70097d4Ef82E653805
 export const FREEZING_STEWARD = '0x4A4c73d563395ad827511F70097d4Ef82E653805';
 
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index b6dba22f..3244440a 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -47,6 +47,9 @@ export const EMISSION_MANAGER = '0x223d844fc4B006D67c0cDbd39371A9F73f69d974';
 // https://etherscan.io/address/0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778
 export const CAPS_PLUS_RISK_STEWARD = '0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778';
 
+// https://etherscan.io/address/0xF3911922bd054Bf6f4d6A02B8ADAC444921B0c51
+export const RISK_STEWARD = '0xF3911922bd054Bf6f4d6A02B8ADAC444921B0c51';
+
 // https://etherscan.io/address/0x2eE68ACb6A1319de1b49DC139894644E424fefD6
 export const FREEZING_STEWARD = '0x2eE68ACb6A1319de1b49DC139894644E424fefD6';
 
diff --git a/src/ts/AaveV3EthereumLido.ts b/src/ts/AaveV3EthereumLido.ts
index 090856de..78083c82 100644
--- a/src/ts/AaveV3EthereumLido.ts
+++ b/src/ts/AaveV3EthereumLido.ts
@@ -74,6 +74,9 @@ export const CONFIG_ENGINE = '0xC80f057d40Fc7f0A01ad4a634f35520Df8079707';
 // https://etherscan.io/address/0x3843b29118fFC18d5d12EE079d0324E1bF115e69
 export const CAPS_PLUS_RISK_STEWARD = '0x3843b29118fFC18d5d12EE079d0324E1bF115e69';
 
+// https://etherscan.io/address/0x45C4f8b32927eFFdf1dA3cA42498504947dd4d0D
+export const RISK_STEWARD = '0x45C4f8b32927eFFdf1dA3cA42498504947dd4d0D';
+
 export const CHAIN_ID = 1;
 export const ASSETS = {
   wstETH: {
diff --git a/src/ts/AaveV3Fuji.ts b/src/ts/AaveV3Fuji.ts
index e1cc8d09..74249f5e 100644
--- a/src/ts/AaveV3Fuji.ts
+++ b/src/ts/AaveV3Fuji.ts
@@ -1,62 +1,62 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://testnet.snowtrace.io/address/0xfb87056c0587923f15EB0aABc7d0572450Cc8003
+// IPoolAddressesProvider https://testnet.snowscan.xyz/address/0xfb87056c0587923f15EB0aABc7d0572450Cc8003
 export const POOL_ADDRESSES_PROVIDER = '0xfb87056c0587923f15EB0aABc7d0572450Cc8003';
 
-// IPool https://testnet.snowtrace.io/address/0xccEa5C65f6d4F465B71501418b88FBe4e7071283
+// IPool https://testnet.snowscan.xyz/address/0xccEa5C65f6d4F465B71501418b88FBe4e7071283
 export const POOL = '0xccEa5C65f6d4F465B71501418b88FBe4e7071283';
 
-// https://testnet.snowtrace.io/address/0x987F9410f61c56F0d0D2F44B783d7E1B75141249
+// https://testnet.snowscan.xyz/address/0x987F9410f61c56F0d0D2F44B783d7E1B75141249
 export const POOL_IMPL = '0x987F9410f61c56F0d0D2F44B783d7E1B75141249';
 
-// IPoolConfigurator https://testnet.snowtrace.io/address/0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7
+// IPoolConfigurator https://testnet.snowscan.xyz/address/0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7
 export const POOL_CONFIGURATOR = '0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7';
 
-// https://testnet.snowtrace.io/address/0x892E31b5a218879C9dbe258f691897AC28c5e061
+// https://testnet.snowscan.xyz/address/0x892E31b5a218879C9dbe258f691897AC28c5e061
 export const POOL_CONFIGURATOR_IMPL = '0x892E31b5a218879C9dbe258f691897AC28c5e061';
 
-// IAaveOracle https://testnet.snowtrace.io/address/0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318
+// IAaveOracle https://testnet.snowscan.xyz/address/0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318
 export const ORACLE = '0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318';
 
-// IPoolDataProvider https://testnet.snowtrace.io/address/0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51
+// IPoolDataProvider https://testnet.snowscan.xyz/address/0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51';
 
-// IACLManager https://testnet.snowtrace.io/address/0x4f2344ACBEfAe1aD87F41B84691E2552C719f723
+// IACLManager https://testnet.snowscan.xyz/address/0x4f2344ACBEfAe1aD87F41B84691E2552C719f723
 export const ACL_MANAGER = '0x4f2344ACBEfAe1aD87F41B84691E2552C719f723';
 
-// https://testnet.snowtrace.io/address/0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8
+// https://testnet.snowscan.xyz/address/0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8
 export const ACL_ADMIN = '0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8';
 
-// ICollector https://testnet.snowtrace.io/address/0xB847a72802E43dF643ceC66315B58832Af724Efa
+// ICollector https://testnet.snowscan.xyz/address/0xB847a72802E43dF643ceC66315B58832Af724Efa
 export const COLLECTOR = '0xB847a72802E43dF643ceC66315B58832Af724Efa';
 
-// https://testnet.snowtrace.io/address/0x25f130Df328c8c2f2C0270377D0e7a984E96ce56
+// https://testnet.snowscan.xyz/address/0x25f130Df328c8c2f2C0270377D0e7a984E96ce56
 export const DEFAULT_INCENTIVES_CONTROLLER = '0x25f130Df328c8c2f2C0270377D0e7a984E96ce56';
 
-// https://testnet.snowtrace.io/address/0xDB8266d95Bc9E1b4C1440501Fae90838381a9156
+// https://testnet.snowscan.xyz/address/0xDB8266d95Bc9E1b4C1440501Fae90838381a9156
 export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0xDB8266d95Bc9E1b4C1440501Fae90838381a9156';
 
-// https://testnet.snowtrace.io/address/0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2
+// https://testnet.snowscan.xyz/address/0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2';
 
-// https://testnet.snowtrace.io/address/0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80
+// https://testnet.snowscan.xyz/address/0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80';
 
-// https://testnet.snowtrace.io/address/0x94D29389b874E6B5b7190dd891E7360827c0E3B4
+// https://testnet.snowscan.xyz/address/0x94D29389b874E6B5b7190dd891E7360827c0E3B4
 export const EMISSION_MANAGER = '0x94D29389b874E6B5b7190dd891E7360827c0E3B4';
 
-// https://testnet.snowtrace.io/address/0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96
+// https://testnet.snowscan.xyz/address/0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96
 export const FAUCET = '0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96';
 
-// https://testnet.snowtrace.io/address/0x1EFf285a4E34217495b5531151bffa222A94A4F9
+// https://testnet.snowscan.xyz/address/0x1EFf285a4E34217495b5531151bffa222A94A4F9
 export const UI_INCENTIVE_DATA_PROVIDER = '0x1EFf285a4E34217495b5531151bffa222A94A4F9';
 
-// https://testnet.snowtrace.io/address/0x279c790Afcd547e2f20d896c5DDEe3846b9790B5
+// https://testnet.snowscan.xyz/address/0x279c790Afcd547e2f20d896c5DDEe3846b9790B5
 export const UI_POOL_DATA_PROVIDER = '0x279c790Afcd547e2f20d896c5DDEe3846b9790B5';
 
-// https://testnet.snowtrace.io/address/0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd
+// https://testnet.snowscan.xyz/address/0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd
 export const WALLET_BALANCE_PROVIDER = '0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd';
 
-// https://testnet.snowtrace.io/address/0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF
+// https://testnet.snowscan.xyz/address/0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF
 export const WETH_GATEWAY = '0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF';
 
 export const CHAIN_ID = 43113;
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index 9fe9f48a..2f1921ef 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -65,6 +65,9 @@ export const WETH_GATEWAY = '0xfE76366A986B72c3f2923e05E6ba07b7de5401e4';
 // https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
 export const CAPS_PLUS_RISK_STEWARD = '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658';
 
+// https://gnosisscan.io/address/0x0b9cA640284cf2636577703f785D5aEEc466BC56
+export const RISK_STEWARD = '0x0b9cA640284cf2636577703f785D5aEEc466BC56';
+
 // https://gnosisscan.io/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
 export const FREEZING_STEWARD = '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5';
 
diff --git a/src/ts/AaveV3Metis.ts b/src/ts/AaveV3Metis.ts
index 8a01caa9..ae7f318c 100644
--- a/src/ts/AaveV3Metis.ts
+++ b/src/ts/AaveV3Metis.ts
@@ -1,77 +1,80 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://explorer.metis.io/address/0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF
+// IPoolAddressesProvider https://andromeda-explorer.metis.io/address/0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF
 export const POOL_ADDRESSES_PROVIDER = '0xB9FABd7500B2C6781c35Dd48d54f81fc2299D7AF';
 
-// IPool https://explorer.metis.io/address/0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57
+// IPool https://andromeda-explorer.metis.io/address/0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57
 export const POOL = '0x90df02551bB792286e8D4f13E0e357b4Bf1D6a57';
 
-// https://explorer.metis.io/address/0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD
+// https://andromeda-explorer.metis.io/address/0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD
 export const POOL_IMPL = '0x3E89ce4ECe20bCDCcDd48FFA60669242720276aD';
 
-// IPoolConfigurator https://explorer.metis.io/address/0x69FEE8F261E004453BE0800BC9039717528645A6
+// IPoolConfigurator https://andromeda-explorer.metis.io/address/0x69FEE8F261E004453BE0800BC9039717528645A6
 export const POOL_CONFIGURATOR = '0x69FEE8F261E004453BE0800BC9039717528645A6';
 
-// https://explorer.metis.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
+// https://andromeda-explorer.metis.io/address/0x419226e0Ad27f3B2019123f7246a364622b018e5
 export const POOL_CONFIGURATOR_IMPL = '0x419226e0Ad27f3B2019123f7246a364622b018e5';
 
-// IAaveOracle https://explorer.metis.io/address/0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e
+// IAaveOracle https://andromeda-explorer.metis.io/address/0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e
 export const ORACLE = '0x38D36e85E47eA6ff0d18B0adF12E5fC8984A6f8e';
 
-// https://explorer.metis.io/address/0x2B5EA1604BAbb7B730120950Cb13951f3525828A
+// https://andromeda-explorer.metis.io/address/0x2B5EA1604BAbb7B730120950Cb13951f3525828A
 export const PRICE_ORACLE_SENTINEL = '0x2B5EA1604BAbb7B730120950Cb13951f3525828A';
 
-// IPoolDataProvider https://explorer.metis.io/address/0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9
+// IPoolDataProvider https://andromeda-explorer.metis.io/address/0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0xD554B5e13F796F4a65B6f607781C2dc3C46f9fa9';
 
-// IACLManager https://explorer.metis.io/address/0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8
+// IACLManager https://andromeda-explorer.metis.io/address/0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8
 export const ACL_MANAGER = '0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8';
 
-// https://explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+// https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
 export const ACL_ADMIN = '0x6fD45D32375d5aDB8D76275A3932c740F03a8718';
 
-// ICollector https://explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
+// ICollector https://andromeda-explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
 export const COLLECTOR = '0xB5b64c7E00374e766272f8B442Cd261412D4b118';
 
-// https://explorer.metis.io/address/0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B
+// https://andromeda-explorer.metis.io/address/0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B
 export const DEFAULT_INCENTIVES_CONTROLLER = '0x30C1b8F0490fa0908863d6Cbd2E36400b4310A6B';
 
-// https://explorer.metis.io/address/0x246405C70461f93513C74606815615c24c5C8C79
+// https://andromeda-explorer.metis.io/address/0x246405C70461f93513C74606815615c24c5C8C79
 export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x246405C70461f93513C74606815615c24c5C8C79';
 
-// https://explorer.metis.io/address/0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f
+// https://andromeda-explorer.metis.io/address/0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0xE7fA271BD76FC9c6F2F968976E9f4f553256E02f';
 
-// https://explorer.metis.io/address/0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4
+// https://andromeda-explorer.metis.io/address/0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0x52aC2476Fc6F788B4c5A9B12Cfcb7fDB163955f4';
 
-// https://explorer.metis.io/address/0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2
+// https://andromeda-explorer.metis.io/address/0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2
 export const EMISSION_MANAGER = '0xfDb2580A1ac4CDc67E4236738b28af59e2022Dd2';
 
-// https://explorer.metis.io/address/0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731
+// https://andromeda-explorer.metis.io/address/0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731
 export const CAPS_PLUS_RISK_STEWARD = '0x5f4d15d761528c57a5C30c43c1DAb26Fc5452731';
 
-// https://explorer.metis.io/address/0x2C77153fF4a1e83A8d8D750735FB101ECB55949f
+// https://andromeda-explorer.metis.io/address/0xF73F2634b43344d86921DA3391d4EF0d5675Dd63
+export const RISK_STEWARD = '0xF73F2634b43344d86921DA3391d4EF0d5675Dd63';
+
+// https://andromeda-explorer.metis.io/address/0x2C77153fF4a1e83A8d8D750735FB101ECB55949f
 export const FREEZING_STEWARD = '0x2C77153fF4a1e83A8d8D750735FB101ECB55949f';
 
-// https://explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
+// https://andromeda-explorer.metis.io/address/0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9
 export const L2_ENCODER = '0x9f3A1B399A9074eBA63Dc4fc274bE2A2b2d80cB9';
 
-// https://explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
+// https://andromeda-explorer.metis.io/address/0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957
 export const CONFIG_ENGINE = '0x17Dd33Ed0e3dD2a80E37489B8A63063161BE6957';
 
-// https://explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
+// https://andromeda-explorer.metis.io/address/0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5';
 
-// https://explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
+// https://andromeda-explorer.metis.io/address/0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927
 export const UI_INCENTIVE_DATA_PROVIDER = '0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927';
 
-// https://explorer.metis.io/address/0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763
+// https://andromeda-explorer.metis.io/address/0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763
 export const UI_POOL_DATA_PROVIDER = '0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763';
 
-// https://explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
+// https://andromeda-explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
 export const WALLET_BALANCE_PROVIDER = '0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b';
 
-// https://explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
+// https://andromeda-explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
 export const STATIC_A_TOKEN_FACTORY = '0x9C62AdC332888F56998542415c38D7CDf3Ff7619';
 
 export const CHAIN_ID = 1088;
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index d483c9b0..297d315b 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -50,6 +50,9 @@ export const EMISSION_MANAGER = '0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73';
 // https://optimistic.etherscan.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
 export const CAPS_PLUS_RISK_STEWARD = '0x5E76E98E0963EcDC6A065d1435F84065b7523f39';
 
+// https://optimistic.etherscan.io/address/0x9062F78b631f33D24Ed058cBc116A653452ea82A
+export const RISK_STEWARD = '0x9062F78b631f33D24Ed058cBc116A653452ea82A';
+
 // https://optimistic.etherscan.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
 export const FREEZING_STEWARD = '0x3829943c53F2d00e20B58475aF19716724bF90Ba';
 
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index a52eaa96..f4bc6ace 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -47,6 +47,9 @@ export const EMISSION_MANAGER = '0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73';
 // https://polygonscan.com/address/0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f
 export const CAPS_PLUS_RISK_STEWARD = '0xc5de989E0D1BF605d19478Fdd32Aa827a10b464f';
 
+// https://polygonscan.com/address/0xfF33BEcB9ECFE4328D4f9C37bE0F07b2CFe976E3
+export const RISK_STEWARD = '0xfF33BEcB9ECFE4328D4f9C37bE0F07b2CFe976E3';
+
 // https://polygonscan.com/address/0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB
 export const FREEZING_STEWARD = '0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB';
 
diff --git a/src/ts/AaveV3Scroll.ts b/src/ts/AaveV3Scroll.ts
index 88507ade..ce1b9f04 100644
--- a/src/ts/AaveV3Scroll.ts
+++ b/src/ts/AaveV3Scroll.ts
@@ -53,6 +53,9 @@ export const L2_ENCODER = '0x8714E5ED2d8edD4E88eFf66637C3FE8eCf2B8C40';
 // https://scrollscan.com/address/0xc4dcA550EF04FD0f8AbD4c384575Fb8a8123054e
 export const CAPS_PLUS_RISK_STEWARD = '0xc4dcA550EF04FD0f8AbD4c384575Fb8a8123054e';
 
+// https://scrollscan.com/address/0x5E27B8EfDe76814795a07c8a378FcdF09715850b
+export const RISK_STEWARD = '0x5E27B8EfDe76814795a07c8a378FcdF09715850b';
+
 // https://scrollscan.com/address/0xc68D0C511076283075bD5cc9aA61E43673135f37
 export const FREEZING_STEWARD = '0xc68D0C511076283075bD5cc9aA61E43673135f37';
 
diff --git a/src/ts/AaveV3ScrollSepolia.ts b/src/ts/AaveV3ScrollSepolia.ts
index 57c9a90d..eca1d9dc 100644
--- a/src/ts/AaveV3ScrollSepolia.ts
+++ b/src/ts/AaveV3ScrollSepolia.ts
@@ -1,65 +1,65 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://sepolia.scrollscan.com/address/0x52A27dC690F8652288194Dd2bc523863eBdEa236
+// IPoolAddressesProvider https://sepolia-blockscout.scroll.io/address/0x52A27dC690F8652288194Dd2bc523863eBdEa236
 export const POOL_ADDRESSES_PROVIDER = '0x52A27dC690F8652288194Dd2bc523863eBdEa236';
 
-// IPool https://sepolia.scrollscan.com/address/0x48914C788295b5db23aF2b5F0B3BE775C4eA9440
+// IPool https://sepolia-blockscout.scroll.io/address/0x48914C788295b5db23aF2b5F0B3BE775C4eA9440
 export const POOL = '0x48914C788295b5db23aF2b5F0B3BE775C4eA9440';
 
-// https://sepolia.scrollscan.com/address/0xB186894F315133C2396104CAb386C3A0fEC09025
+// https://sepolia-blockscout.scroll.io/address/0xB186894F315133C2396104CAb386C3A0fEC09025
 export const POOL_IMPL = '0xB186894F315133C2396104CAb386C3A0fEC09025';
 
-// IPoolConfigurator https://sepolia.scrollscan.com/address/0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10
+// IPoolConfigurator https://sepolia-blockscout.scroll.io/address/0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10
 export const POOL_CONFIGURATOR = '0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10';
 
-// https://sepolia.scrollscan.com/address/0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF
+// https://sepolia-blockscout.scroll.io/address/0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF
 export const POOL_CONFIGURATOR_IMPL = '0xE7560d98a9fdAe4F3b87eb172ae44177A075eeDF';
 
-// IAaveOracle https://sepolia.scrollscan.com/address/0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59
+// IAaveOracle https://sepolia-blockscout.scroll.io/address/0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59
 export const ORACLE = '0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59';
 
-// IPoolDataProvider https://sepolia.scrollscan.com/address/0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee
+// IPoolDataProvider https://sepolia-blockscout.scroll.io/address/0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee';
 
-// IACLManager https://sepolia.scrollscan.com/address/0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C
+// IACLManager https://sepolia-blockscout.scroll.io/address/0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C
 export const ACL_MANAGER = '0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C';
 
-// https://sepolia.scrollscan.com/address/0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0
+// https://sepolia-blockscout.scroll.io/address/0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0
 export const ACL_ADMIN = '0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0';
 
-// ICollector https://sepolia.scrollscan.com/address/0x104Cd7695C9247096F7AD37d3258B63c9675A00e
+// ICollector https://sepolia-blockscout.scroll.io/address/0x104Cd7695C9247096F7AD37d3258B63c9675A00e
 export const COLLECTOR = '0x104Cd7695C9247096F7AD37d3258B63c9675A00e';
 
-// https://sepolia.scrollscan.com/address/0xa76F05D0cdf599E0186dec880F2FA480fd0c5280
+// https://sepolia-blockscout.scroll.io/address/0xa76F05D0cdf599E0186dec880F2FA480fd0c5280
 export const DEFAULT_INCENTIVES_CONTROLLER = '0xa76F05D0cdf599E0186dec880F2FA480fd0c5280';
 
-// https://sepolia.scrollscan.com/address/0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd
+// https://sepolia-blockscout.scroll.io/address/0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd
 export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd';
 
-// https://sepolia.scrollscan.com/address/0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07
+// https://sepolia-blockscout.scroll.io/address/0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07';
 
-// https://sepolia.scrollscan.com/address/0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256
+// https://sepolia-blockscout.scroll.io/address/0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256';
 
-// https://sepolia.scrollscan.com/address/0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2
+// https://sepolia-blockscout.scroll.io/address/0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2
 export const EMISSION_MANAGER = '0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2';
 
-// https://sepolia.scrollscan.com/address/0x2F826FD1a0071476330a58dD1A9B36bcF7da832d
+// https://sepolia-blockscout.scroll.io/address/0x2F826FD1a0071476330a58dD1A9B36bcF7da832d
 export const FAUCET = '0x2F826FD1a0071476330a58dD1A9B36bcF7da832d';
 
-// https://sepolia.scrollscan.com/address/0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC
+// https://sepolia-blockscout.scroll.io/address/0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC
 export const L2_ENCODER = '0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC';
 
-// https://sepolia.scrollscan.com/address/0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37
+// https://sepolia-blockscout.scroll.io/address/0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37
 export const UI_INCENTIVE_DATA_PROVIDER = '0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37';
 
-// https://sepolia.scrollscan.com/address/0xDC55BcFC0963608401A4bA6298624E5895f8250a
+// https://sepolia-blockscout.scroll.io/address/0xDC55BcFC0963608401A4bA6298624E5895f8250a
 export const UI_POOL_DATA_PROVIDER = '0xDC55BcFC0963608401A4bA6298624E5895f8250a';
 
-// https://sepolia.scrollscan.com/address/0x6c68e975764a56e62AF3d1C8209F789779Eb763B
+// https://sepolia-blockscout.scroll.io/address/0x6c68e975764a56e62AF3d1C8209F789779Eb763B
 export const WALLET_BALANCE_PROVIDER = '0x6c68e975764a56e62AF3d1C8209F789779Eb763B';
 
-// https://sepolia.scrollscan.com/address/0x57ce905CfD7f986A929A26b006f797d181dB706e
+// https://sepolia-blockscout.scroll.io/address/0x57ce905CfD7f986A929A26b006f797d181dB706e
 export const WETH_GATEWAY = '0x57ce905CfD7f986A929A26b006f797d181dB706e';
 
 export const CHAIN_ID = 534351;
diff --git a/src/ts/GovernanceV3Avalanche.ts b/src/ts/GovernanceV3Avalanche.ts
index 98c8321a..99409edd 100644
--- a/src/ts/GovernanceV3Avalanche.ts
+++ b/src/ts/GovernanceV3Avalanche.ts
@@ -1,31 +1,31 @@
-// https://snowtrace.io/address/0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928
+// https://snowscan.xyz/address/0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928
 export const CROSS_CHAIN_CONTROLLER = '0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928';
 
-// https://snowtrace.io/address/0x41185495Bc8297a65DC46f94001DC7233775EbEe
+// https://snowscan.xyz/address/0x41185495Bc8297a65DC46f94001DC7233775EbEe
 export const CL_EMERGENCY_ORACLE = '0x41185495Bc8297a65DC46f94001DC7233775EbEe';
 
-// https://snowtrace.io/address/0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F
+// https://snowscan.xyz/address/0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F
 export const VOTING_MACHINE = '0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F';
 
-// IPayloadsControllerCore https://snowtrace.io/address/0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80
+// IPayloadsControllerCore https://snowscan.xyz/address/0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80
 export const PAYLOADS_CONTROLLER = '0x1140CB7CAfAcC745771C2Ea31e7B5C653c5d0B80';
 
-// https://snowtrace.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
+// https://snowscan.xyz/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
 export const PC_DATA_HELPER = '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A';
 
-// https://snowtrace.io/address/0x77976B51569896523EE215962Ee91ff236Fa50E8
+// https://snowscan.xyz/address/0x77976B51569896523EE215962Ee91ff236Fa50E8
 export const VM_DATA_HELPER = '0x77976B51569896523EE215962Ee91ff236Fa50E8';
 
-// https://snowtrace.io/address/0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65
+// https://snowscan.xyz/address/0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65
 export const GRANULAR_GUARDIAN = '0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65';
 
-// https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+// https://snowscan.xyz/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
 export const EXECUTOR_LVL_1 = '0x3C06dce358add17aAf230f2234bCCC4afd50d090';
 
-// IVotingStrategy https://snowtrace.io/address/0x690C218668B440204F369Af1541245d367cc805C
+// IVotingStrategy https://snowscan.xyz/address/0x690C218668B440204F369Af1541245d367cc805C
 export const VOTING_STRATEGY = '0x690C218668B440204F369Af1541245d367cc805C';
 
-// IDataWarehouse https://snowtrace.io/address/0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff
+// IDataWarehouse https://snowscan.xyz/address/0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff
 export const DATA_WAREHOUSE = '0x9626F9d60CC0B7e1c9a0A47b7f0bd618fb6f40ff';
 
 export const CHAIN_ID = 43114;
diff --git a/src/ts/GovernanceV3Fuji.ts b/src/ts/GovernanceV3Fuji.ts
index b38fbfe2..09115e21 100644
--- a/src/ts/GovernanceV3Fuji.ts
+++ b/src/ts/GovernanceV3Fuji.ts
@@ -1,19 +1,19 @@
-// https://testnet.snowtrace.io/address/0x5488A48E5C22175548E8d68622211F5928cBbf23
+// https://testnet.snowscan.xyz/address/0x5488A48E5C22175548E8d68622211F5928cBbf23
 export const CROSS_CHAIN_CONTROLLER = '0x5488A48E5C22175548E8d68622211F5928cBbf23';
 
-// https://testnet.snowtrace.io/address/0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0
+// https://testnet.snowscan.xyz/address/0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0
 export const VOTING_MACHINE = '0x79Edd77c76F95b6b69907CaD1d8241F9DB0e3FD0';
 
-// IPayloadsControllerCore https://testnet.snowtrace.io/address/0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15
+// IPayloadsControllerCore https://testnet.snowscan.xyz/address/0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15
 export const PAYLOADS_CONTROLLER = '0xf1842f9D6C3D9ec1153d7afCBb9cDBC537Ea5d15';
 
-// https://testnet.snowtrace.io/address/0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6
+// https://testnet.snowscan.xyz/address/0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6
 export const EXECUTOR_LVL_1 = '0xACd2b1bA0B85FaF0f45D4974Ba8ee538E157fBc6';
 
-// IVotingStrategy https://testnet.snowtrace.io/address/0x8c55a1bf3DC7076522C5cd025f497A498eF90143
+// IVotingStrategy https://testnet.snowscan.xyz/address/0x8c55a1bf3DC7076522C5cd025f497A498eF90143
 export const VOTING_STRATEGY = '0x8c55a1bf3DC7076522C5cd025f497A498eF90143';
 
-// IDataWarehouse https://testnet.snowtrace.io/address/0xDB23939d4C483E748c2487916fB20d7fF7e39588
+// IDataWarehouse https://testnet.snowscan.xyz/address/0xDB23939d4C483E748c2487916fB20d7fF7e39588
 export const DATA_WAREHOUSE = '0xDB23939d4C483E748c2487916fB20d7fF7e39588';
 
 export const CHAIN_ID = 43113;
diff --git a/src/ts/GovernanceV3Metis.ts b/src/ts/GovernanceV3Metis.ts
index 3412fa42..564ecdfc 100644
--- a/src/ts/GovernanceV3Metis.ts
+++ b/src/ts/GovernanceV3Metis.ts
@@ -1,16 +1,16 @@
-// https://explorer.metis.io/address/0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70
+// https://andromeda-explorer.metis.io/address/0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70
 export const CROSS_CHAIN_CONTROLLER = '0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70';
 
-// IPayloadsControllerCore https://explorer.metis.io/address/0x2233F8A66A728FBa6E1dC95570B25360D07D5524
+// IPayloadsControllerCore https://andromeda-explorer.metis.io/address/0x2233F8A66A728FBa6E1dC95570B25360D07D5524
 export const PAYLOADS_CONTROLLER = '0x2233F8A66A728FBa6E1dC95570B25360D07D5524';
 
-// https://explorer.metis.io/address/0x81d32B36380e6266e1BDd490eAC56cdB300afBe0
+// https://andromeda-explorer.metis.io/address/0x81d32B36380e6266e1BDd490eAC56cdB300afBe0
 export const PC_DATA_HELPER = '0x81d32B36380e6266e1BDd490eAC56cdB300afBe0';
 
-// https://explorer.metis.io/address/0x61BE97d3a0550549f67CA7421725fA73Fa2036B5
+// https://andromeda-explorer.metis.io/address/0x61BE97d3a0550549f67CA7421725fA73Fa2036B5
 export const GRANULAR_GUARDIAN = '0x61BE97d3a0550549f67CA7421725fA73Fa2036B5';
 
-// https://explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+// https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
 export const EXECUTOR_LVL_1 = '0x6fD45D32375d5aDB8D76275A3932c740F03a8718';
 
 export const CHAIN_ID = 1088;
diff --git a/src/ts/MiscAvalanche.ts b/src/ts/MiscAvalanche.ts
index 7a524aab..a7ac3159 100644
--- a/src/ts/MiscAvalanche.ts
+++ b/src/ts/MiscAvalanche.ts
@@ -1,23 +1,23 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// https://snowtrace.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
+// https://snowscan.xyz/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
 export const PARASWAP_FEE_CLAIMER = '0x9abf798f5314BFd793A9E57A654BEd35af4A1D60';
 
-// https://snowtrace.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
+// https://snowscan.xyz/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
 export const TRANSPARENT_PROXY_FACTORY = '0xB4e496f70602fE2AC6Ae511D028BA4D194773B29';
 
-// https://snowtrace.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
+// https://snowscan.xyz/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
 export const PROXY_ADMIN = '0xD3cF979e676265e4f6379749DECe4708B9A22476';
 
-// https://snowtrace.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
+// https://snowscan.xyz/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
 export const CREATE_3_FACTORY = '0x3b56998Ec06477704622ca8e2eA1b4db134cec32';
 
-// https://snowtrace.io/address/0x06d958772304e7220fc3E463756CE01Ed0D24db2
+// https://snowscan.xyz/address/0x06d958772304e7220fc3E463756CE01Ed0D24db2
 export const AAVE_CL_ROBOT_OPERATOR = '0x06d958772304e7220fc3E463756CE01Ed0D24db2';
 
-// https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
+// https://snowscan.xyz/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
 export const PROTOCOL_GUARDIAN = '0xa35b76E4935449E33C56aB24b23fcd3246f13470';
 
-// https://snowtrace.io/address/0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E
+// https://snowscan.xyz/address/0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E
 export const AAVE_MERKLE_DISTRIBUTOR = '0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E';
 
 export const CHAIN_ID = 43114;
diff --git a/src/ts/MiscFuji.ts b/src/ts/MiscFuji.ts
index 3ac3eafd..dfc25a03 100644
--- a/src/ts/MiscFuji.ts
+++ b/src/ts/MiscFuji.ts
@@ -1,5 +1,5 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// https://testnet.snowtrace.io/address/0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723
+// https://testnet.snowscan.xyz/address/0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723
 export const GHO_TOKEN = '0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723';
 
 export const CHAIN_ID = 43113;
diff --git a/src/ts/MiscMetis.ts b/src/ts/MiscMetis.ts
index 8b4da1c6..e1508919 100644
--- a/src/ts/MiscMetis.ts
+++ b/src/ts/MiscMetis.ts
@@ -1,14 +1,14 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// https://explorer.metis.io/address/0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB
+// https://andromeda-explorer.metis.io/address/0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB
 export const TRANSPARENT_PROXY_FACTORY = '0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB';
 
-// https://explorer.metis.io/address/0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97
+// https://andromeda-explorer.metis.io/address/0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97
 export const PROXY_ADMIN = '0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97';
 
-// https://explorer.metis.io/address/0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A
+// https://andromeda-explorer.metis.io/address/0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A
 export const CREATE_3_FACTORY = '0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A';
 
-// https://explorer.metis.io/address/0xF6Db48C5968A9eBCB935786435530f28e32Cc501
+// https://andromeda-explorer.metis.io/address/0xF6Db48C5968A9eBCB935786435530f28e32Cc501
 export const PROTOCOL_GUARDIAN = '0xF6Db48C5968A9eBCB935786435530f28e32Cc501';
 
 export const CHAIN_ID = 1088;
diff --git a/src/ts/tokenlist.ts b/src/ts/tokenlist.ts
index 89e8eaf1..9289c382 100644
--- a/src/ts/tokenlist.ts
+++ b/src/ts/tokenlist.ts
@@ -5969,6 +5969,226 @@ export const tokenlist = {
         underlying: '0x01f0a31698C4d065659b9bdC21B3610292a1c506',
       },
     },
+    {
+      chainId: 4002,
+      address: '0x77FDe93fEe5fe272dC17d799cb61447431E6Eba2',
+      name: 'DAI',
+      decimals: 18,
+      symbol: 'DAI',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/dai.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x2B101eFBB4dFf1fbB8f87f02C560Fb8AC773aFC5',
+      name: 'Aave Fantom DAI',
+      decimals: 18,
+      symbol: 'aFanDAI',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/adai.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x77FDe93fEe5fe272dC17d799cb61447431E6Eba2',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x1Da81b322451C51D2580B373974a999d5A9C2D21',
+      name: 'LINK',
+      decimals: 18,
+      symbol: 'LINK',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/link.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x7d18f0834A38cA6B0e58CC671900f0017E6d55Ff',
+      name: 'Aave Fantom LINK',
+      decimals: 18,
+      symbol: 'aFanLINK',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/alink.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x1Da81b322451C51D2580B373974a999d5A9C2D21',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x66F61903D7FEC18048bEc2e792f272cb8B657733',
+      name: 'USDC',
+      decimals: 6,
+      symbol: 'USDC',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/usdc.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0xFFF336d1310D5Ba18CfFb2006afa762EC7d7a4fb',
+      name: 'Aave Fantom USDC',
+      decimals: 6,
+      symbol: 'aFanUSDC',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/ausdc.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x66F61903D7FEC18048bEc2e792f272cb8B657733',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x2c95d10bA4BBEc79e562e8B3f48687751808C925',
+      name: 'WBTC',
+      decimals: 8,
+      symbol: 'WBTC',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/wbtc.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x17A6c7f20e804a558E0674c0Eef1F69442770596',
+      name: 'Aave Fantom WBTC',
+      decimals: 8,
+      symbol: 'aFanWBTC',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/awbtc.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x2c95d10bA4BBEc79e562e8B3f48687751808C925',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0xc8c0Cf9436F4862a8F60Ce680Ca5a9f0f99b5ded',
+      name: 'WETH',
+      decimals: 18,
+      symbol: 'WETH',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/weth.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x0e426e6e6B226D8bd566e417b90411Dcf14DF861',
+      name: 'Aave Fantom WETH',
+      decimals: 18,
+      symbol: 'aFanWETH',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aweth.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0xc8c0Cf9436F4862a8F60Ce680Ca5a9f0f99b5ded',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x9DFf9E93B1e513379cf820504D642c6891d8F7CC',
+      name: 'USDT',
+      decimals: 6,
+      symbol: 'USDT',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/usdt.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x97293798206Fc4FDF23D6b536ED3D694599e35BC',
+      name: 'Aave Fantom USDT',
+      decimals: 6,
+      symbol: 'aFanUSDT',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/ausdt.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x9DFf9E93B1e513379cf820504D642c6891d8F7CC',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x52D800ca262522580CeBAD275395ca6e7598C014',
+      name: 'AAVE',
+      decimals: 18,
+      symbol: 'AAVE',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aave.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0xf10e04c48f14d50F7378e01a1EEf7498D9a27d08',
+      name: 'Aave Fantom AAVE',
+      decimals: 18,
+      symbol: 'aFanAAVE',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aaave.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x52D800ca262522580CeBAD275395ca6e7598C014',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A',
+      name: 'WFTM',
+      decimals: 18,
+      symbol: 'WFTM',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/wftm.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0xFA3AdA68fA9512B2e22a5fac6b6F0231068A2b36',
+      name: 'Aave Fantom WFTM',
+      decimals: 18,
+      symbol: 'aFanWFTM',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/awftm.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0xc199807AF4fEDB02EE567Ed0FeB814A077de4802',
+      name: 'CRV',
+      decimals: 18,
+      symbol: 'CRV',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/crv.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0x01CEf190E98cE7B8CA722e33C0D3aF456106103d',
+      name: 'Aave Fantom CRV',
+      decimals: 18,
+      symbol: 'aFanCRV',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/acrv.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0xc199807AF4fEDB02EE567Ed0FeB814A077de4802',
+      },
+    },
+    {
+      chainId: 4002,
+      address: '0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2',
+      name: 'SUSHI',
+      decimals: 18,
+      symbol: 'SUSHI',
+      tags: ['underlying'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/sushi.svg',
+    },
+    {
+      chainId: 4002,
+      address: '0xac8fd53423708ac1C49E5486485854FBE1487e65',
+      name: 'Aave Fantom SUSHI',
+      decimals: 18,
+      symbol: 'aFanSUSHI',
+      tags: ['aTokenV3', 'aaveV3'],
+      logoURI: 'https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/asushi.svg',
+      extensions: {
+        pool: '0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8',
+        underlying: '0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2',
+      },
+    },
     {
       chainId: 250,
       address: '0x8D11eC38a3EB5E956B052f67Da8Bdc9bef8Abf3E',
@@ -6392,6 +6612,6 @@ export const tokenlist = {
       },
     },
   ],
-  version: {major: 3, minor: 0, patch: 36},
-  timestamp: '2024-08-26T08:37:22.547Z',
+  version: {major: 3, minor: 0, patch: 37},
+  timestamp: '2024-08-27T11:10:21.101Z',
 };
diff --git a/tokenlist.json b/tokenlist.json
index 7bfd43c0..e02c1cf3 100644
--- a/tokenlist.json
+++ b/tokenlist.json
@@ -5878,6 +5878,226 @@
         "underlying": "0x01f0a31698C4d065659b9bdC21B3610292a1c506"
       }
     },
+    {
+      "chainId": 4002,
+      "address": "0x77FDe93fEe5fe272dC17d799cb61447431E6Eba2",
+      "name": "DAI",
+      "decimals": 18,
+      "symbol": "DAI",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/dai.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x2B101eFBB4dFf1fbB8f87f02C560Fb8AC773aFC5",
+      "name": "Aave Fantom DAI",
+      "decimals": 18,
+      "symbol": "aFanDAI",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/adai.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x77FDe93fEe5fe272dC17d799cb61447431E6Eba2"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x1Da81b322451C51D2580B373974a999d5A9C2D21",
+      "name": "LINK",
+      "decimals": 18,
+      "symbol": "LINK",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/link.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x7d18f0834A38cA6B0e58CC671900f0017E6d55Ff",
+      "name": "Aave Fantom LINK",
+      "decimals": 18,
+      "symbol": "aFanLINK",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/alink.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x1Da81b322451C51D2580B373974a999d5A9C2D21"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x66F61903D7FEC18048bEc2e792f272cb8B657733",
+      "name": "USDC",
+      "decimals": 6,
+      "symbol": "USDC",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/usdc.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0xFFF336d1310D5Ba18CfFb2006afa762EC7d7a4fb",
+      "name": "Aave Fantom USDC",
+      "decimals": 6,
+      "symbol": "aFanUSDC",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/ausdc.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x66F61903D7FEC18048bEc2e792f272cb8B657733"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x2c95d10bA4BBEc79e562e8B3f48687751808C925",
+      "name": "WBTC",
+      "decimals": 8,
+      "symbol": "WBTC",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/wbtc.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x17A6c7f20e804a558E0674c0Eef1F69442770596",
+      "name": "Aave Fantom WBTC",
+      "decimals": 8,
+      "symbol": "aFanWBTC",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/awbtc.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x2c95d10bA4BBEc79e562e8B3f48687751808C925"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0xc8c0Cf9436F4862a8F60Ce680Ca5a9f0f99b5ded",
+      "name": "WETH",
+      "decimals": 18,
+      "symbol": "WETH",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/weth.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x0e426e6e6B226D8bd566e417b90411Dcf14DF861",
+      "name": "Aave Fantom WETH",
+      "decimals": 18,
+      "symbol": "aFanWETH",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aweth.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0xc8c0Cf9436F4862a8F60Ce680Ca5a9f0f99b5ded"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x9DFf9E93B1e513379cf820504D642c6891d8F7CC",
+      "name": "USDT",
+      "decimals": 6,
+      "symbol": "USDT",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/usdt.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x97293798206Fc4FDF23D6b536ED3D694599e35BC",
+      "name": "Aave Fantom USDT",
+      "decimals": 6,
+      "symbol": "aFanUSDT",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/ausdt.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x9DFf9E93B1e513379cf820504D642c6891d8F7CC"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x52D800ca262522580CeBAD275395ca6e7598C014",
+      "name": "AAVE",
+      "decimals": 18,
+      "symbol": "AAVE",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aave.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0xf10e04c48f14d50F7378e01a1EEf7498D9a27d08",
+      "name": "Aave Fantom AAVE",
+      "decimals": 18,
+      "symbol": "aFanAAVE",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/aaave.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x52D800ca262522580CeBAD275395ca6e7598C014"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A",
+      "name": "WFTM",
+      "decimals": 18,
+      "symbol": "WFTM",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/wftm.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0xFA3AdA68fA9512B2e22a5fac6b6F0231068A2b36",
+      "name": "Aave Fantom WFTM",
+      "decimals": 18,
+      "symbol": "aFanWFTM",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/awftm.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0xc199807AF4fEDB02EE567Ed0FeB814A077de4802",
+      "name": "CRV",
+      "decimals": 18,
+      "symbol": "CRV",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/crv.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0x01CEf190E98cE7B8CA722e33C0D3aF456106103d",
+      "name": "Aave Fantom CRV",
+      "decimals": 18,
+      "symbol": "aFanCRV",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/acrv.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0xc199807AF4fEDB02EE567Ed0FeB814A077de4802"
+      }
+    },
+    {
+      "chainId": 4002,
+      "address": "0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2",
+      "name": "SUSHI",
+      "decimals": 18,
+      "symbol": "SUSHI",
+      "tags": ["underlying"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/sushi.svg"
+    },
+    {
+      "chainId": 4002,
+      "address": "0xac8fd53423708ac1C49E5486485854FBE1487e65",
+      "name": "Aave Fantom SUSHI",
+      "decimals": 18,
+      "symbol": "aFanSUSHI",
+      "tags": ["aTokenV3", "aaveV3"],
+      "logoURI": "https://raw.githubusercontent.com/bgd-labs/web3-icons/main/icons/full/asushi.svg",
+      "extensions": {
+        "pool": "0x56Ab717d882F7A8d4a3C2b191707322c5Cc70db8",
+        "underlying": "0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2"
+      }
+    },
     {
       "chainId": 250,
       "address": "0x8D11eC38a3EB5E956B052f67Da8Bdc9bef8Abf3E",
@@ -6301,6 +6521,6 @@
       }
     }
   ],
-  "version": { "major": 3, "minor": 0, "patch": 36 },
-  "timestamp": "2024-08-26T08:37:22.547Z"
+  "version": { "major": 3, "minor": 0, "patch": 37 },
+  "timestamp": "2024-08-27T11:10:21.101Z"
 }