diff --git a/src/Ethereum.sol b/src/Ethereum.sol
index cd655e4..ef61252 100644
--- a/src/Ethereum.sol
+++ b/src/Ethereum.sol
@@ -18,20 +18,6 @@ library Ethereum {
 
     address internal constant SPARK_PROXY = 0x3300f198988e4C9C63F75dF86De36421f06af8c4;
 
-    /******************************************************************************************************************/
-    /*** Token Addresses                                                                                            ***/
-    /******************************************************************************************************************/
-
-    address internal constant DAI    = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
-    address internal constant SDAI   = 0x83F20F44975D03b1b09e64809B757c47f942BEeA;
-    address internal constant USDC   = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
-    address internal constant WBTC   = 0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599;
-    address internal constant WETH   = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-    address internal constant WSTETH = 0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0;
-    address internal constant RETH   = 0xae78736Cd615f374D3085123A210448E74Fc6393;
-    address internal constant GNO    = 0x6810e776880C02933D47DB1b9fc05908e5386b96;
-    address internal constant USDT   = 0xdAC17F958D2ee523a2206206994597C13D831ec7;
-
     /******************************************************************************************************************/
     /*** Core Protocol Addresses                                                                                    ***/
     /******************************************************************************************************************/
@@ -50,54 +36,54 @@ library Ethereum {
     address internal constant WETH_GATEWAY                     = 0xBD7D6a9ad7865463DE44B05F04559f65e3B11704;
 
     /******************************************************************************************************************/
-    /*** Reserve Addresses                                                                                          ***/
+    /*** Reserve Token Addresses                                                                                    ***/
     /******************************************************************************************************************/
 
+    address internal constant DAI                   = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
     address internal constant DAI_ATOKEN            = 0x4DEDf26112B3Ec8eC46e7E31EA5e123490B05B8B;
     address internal constant DAI_STABLE_DEBT_TOKEN = 0xfe2B7a7F4cC0Fb76f7Fc1C6518D586F1e4559176;
     address internal constant DAI_DEBT_TOKEN        = 0xf705d2B7e92B3F38e6ae7afaDAA2fEE110fE5914;
 
+    address internal constant GNO                   = 0x6810e776880C02933D47DB1b9fc05908e5386b96;
     address internal constant GNO_ATOKEN            = 0xbf13910620722D4D4F8A03962894EB3335Bf4FaE;
     address internal constant GNO_STABLE_DEBT_TOKEN = 0x57a2957651DA467fCD4104D749f2F3684784c25a;
     address internal constant GNO_DEBT_TOKEN        = 0x554265A713D6746A62d86A797254590784D436AA;
 
-    address internal constant SDAI_ATOKEN            = 0x78f897F0fE2d3B5690EbAe7f19862DEacedF10a7;
-    address internal constant SDAI_STABLE_DEBT_TOKEN = 0xEc6C6aBEd4DC03299EFf82Ac8A0A83643d3cB335;
-    address internal constant SDAI_DEBT_TOKEN        = 0xaBc57081C04D921388240393ec4088Aa47c6832B;
-
+    address internal constant RETH                   = 0xae78736Cd615f374D3085123A210448E74Fc6393;
     address internal constant RETH_ATOKEN            = 0x9985dF20D7e9103ECBCeb16a84956434B6f06ae8;
     address internal constant RETH_STABLE_DEBT_TOKEN = 0xa9a4037295Ea3a168DC3F65fE69FdA524d52b3e1;
     address internal constant RETH_DEBT_TOKEN        = 0xBa2C8F2eA5B56690bFb8b709438F049e5Dd76B96;
 
+    address internal constant SDAI                   = 0x83F20F44975D03b1b09e64809B757c47f942BEeA;
+    address internal constant SDAI_ATOKEN            = 0x78f897F0fE2d3B5690EbAe7f19862DEacedF10a7;
+    address internal constant SDAI_STABLE_DEBT_TOKEN = 0xEc6C6aBEd4DC03299EFf82Ac8A0A83643d3cB335;
+    address internal constant SDAI_DEBT_TOKEN        = 0xaBc57081C04D921388240393ec4088Aa47c6832B;
+
+    address internal constant USDC                   = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
     address internal constant USDC_ATOKEN            = 0x377C3bd93f2a2984E1E7bE6A5C22c525eD4A4815;
     address internal constant USDC_STABLE_DEBT_TOKEN = 0x887Ac022983Ff083AEb623923789052A955C6798;
     address internal constant USDC_DEBT_TOKEN        = 0x7B70D04099CB9cfb1Db7B6820baDAfB4C5C70A67;
 
+    address internal constant USDT                   = 0xdAC17F958D2ee523a2206206994597C13D831ec7;
     address internal constant USDT_ATOKEN            = 0x0Dae62F953Ceb2E969fB4dE85f3F9074fa920776;
     address internal constant USDT_STABLE_DEBT_TOKEN = 0x529b6158d1D2992E3129F7C69E81a7c677dc3B12;
     address internal constant USDT_DEBT_TOKEN        = 0x0F1a9a787b4103eF5929121CD9399224c6455dD6;
 
+    address internal constant WBTC                   = 0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599;
     address internal constant WBTC_ATOKEN            = 0x4197ba364AE6698015AE5c1468f54087602715b2;
     address internal constant WBTC_STABLE_DEBT_TOKEN = 0x4b29e6cBeE62935CfC92efcB3839eD2c2F35C1d9;
     address internal constant WBTC_DEBT_TOKEN        = 0xf6fEe3A8aC8040C3d6d81d9A4a168516Ec9B51D2;
 
+    address internal constant WETH                   = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
     address internal constant WETH_ATOKEN            = 0x59cD1C87501baa753d0B5B5Ab5D8416A45cD71DB;
     address internal constant WETH_STABLE_DEBT_TOKEN = 0x3c6b93D38ffA15ea995D1BC950d5D0Fa6b22bD05;
     address internal constant WETH_DEBT_TOKEN        = 0x2e7576042566f8D6990e07A1B61Ad1efd86Ae70d;
 
+    address internal constant WSTETH                   = 0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0;
     address internal constant WSTETH_ATOKEN            = 0x12B54025C112Aa61fAce2CDB7118740875A566E9;
     address internal constant WSTETH_STABLE_DEBT_TOKEN = 0x9832D969a0c8662D98fFf334A4ba7FeE62b109C2;
     address internal constant WSTETH_DEBT_TOKEN        = 0xd5c3E3B566a42A6110513Ac7670C1a86D76E13E6;
 
-    /******************************************************************************************************************/
-    /*** Data Provider Addresses                                                                                    ***/
-    /******************************************************************************************************************/
-
-    address internal constant PROTOCOL_DATA_PROVIDER     = 0xFc21d6d146E6086B8359705C8b28512a983db0cb;
-    address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xA7F8A757C4f7696c015B595F51B2901AC0121B18;
-    address internal constant UI_POOL_DATA_PROVIDER      = 0xF028c2F4b19898718fD0F77b9b881CbfdAa5e8Bb;
-    address internal constant WALLET_BALANCE_PROVIDER    = 0xd2AeF86F51F92E8e49F42454c287AE4879D1BeDc;
-
     /******************************************************************************************************************/
     /*** Implementation Addresses                                                                                   ***/
     /******************************************************************************************************************/
@@ -111,4 +97,22 @@ library Ethereum {
     address internal constant TREASURY_IMPL            = 0xF1E57711Eb5F897b415de1aEFCB64d9BAe58D312;
     address internal constant VARIABLE_DEBT_TOKEN_IMPL = 0x86C71796CcDB31c3997F8Ec5C2E3dB3e9e40b985;
 
+    /******************************************************************************************************************/
+    /*** Config Engine Addresses                                                                                    ***/
+    /******************************************************************************************************************/
+
+    address internal constant PROXY_ADMIN               = 0x883A82BDd3d07ae6ACfD151020faD350df25087e;
+    address internal constant CONFIG_ENGINE             = 0x3254F7cd0565aA67eEdC86c2fB608BE48d5cCd78;
+    address internal constant RATES_FACTORY             = 0xfE57e187EF6285e90d7049e6a21571aa47cF11a2;
+    address internal constant TRANSPARENT_PROXY_FACTORY = 0x777803CbDD89D5D5Bc1DdD2151B51b0B07F6bf37;
+
+    /******************************************************************************************************************/
+    /*** Data Provider Addresses                                                                                    ***/
+    /******************************************************************************************************************/
+
+    address internal constant PROTOCOL_DATA_PROVIDER     = 0xFc21d6d146E6086B8359705C8b28512a983db0cb;
+    address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xA7F8A757C4f7696c015B595F51B2901AC0121B18;
+    address internal constant UI_POOL_DATA_PROVIDER      = 0xF028c2F4b19898718fD0F77b9b881CbfdAa5e8Bb;
+    address internal constant WALLET_BALANCE_PROVIDER    = 0xd2AeF86F51F92E8e49F42454c287AE4879D1BeDc;
+
 }
diff --git a/src/Gnosis.sol b/src/Gnosis.sol
index 8615c41..ff9db99 100644
--- a/src/Gnosis.sol
+++ b/src/Gnosis.sol
@@ -9,7 +9,7 @@ library Gnosis {
 
     address internal constant AAVE_ORACLE                      = 0x8105f69D9C41644c6A0803fDA7D03Aa70996cFD9;
     address internal constant ACL_MANAGER                      = 0x86C71796CcDB31c3997F8Ec5C2E3dB3e9e40b985;
-    address internal constant EMISSION_MANAGER                 = 0xf09e48dd4CA8e76F63a57ADd428bB06fee7932a4;
+    address internal constant EMISSION_MANAGER                 = 0x4d988568b5f0462B08d1F40bA1F5f17ad2D24F76;
     address internal constant INCENTIVES                       = 0x98e6BcBA7d5daFbfa4a92dAF08d3d7512820c30C;
     address internal constant POOL                             = 0x2Dae5307c5E3FD1CF5A72Cb6F698f915860607e0;
     address internal constant POOL_ADDRESSES_PROVIDER          = 0xA98DaCB3fC964A6A0d2ce3B77294241585EAbA6d;
@@ -20,13 +20,28 @@ library Gnosis {
     address internal constant WETH_GATEWAY                     = 0xBD7D6a9ad7865463DE44B05F04559f65e3B11704;
 
     /******************************************************************************************************************/
-    /*** Data Provider Addresses                                                                                    ***/
+    /*** Reserve Token Addresses                                                                                    ***/
     /******************************************************************************************************************/
 
-    address internal constant PROTOCOL_DATA_PROVIDER     = 0x2a002054A06546bB5a264D57A81347e23Af91D18;
-    address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xA7F8A757C4f7696c015B595F51B2901AC0121B18;
-    address internal constant UI_POOL_DATA_PROVIDER      = 0xF028c2F4b19898718fD0F77b9b881CbfdAa5e8Bb;
-    address internal constant WALLET_BALANCE_PROVIDER    = 0xd2AeF86F51F92E8e49F42454c287AE4879D1BeDc;
+    address internal constant GNO                   = 0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb;
+    address internal constant GNO_ATOKEN            = 0x2f589BADbE2024a94f144ef24344aF91dE21a33c;
+    address internal constant GNO_STABLE_DEBT_TOKEN = 0xd4bAbF714964E399f95A7bb94B3DeaF22d9F575d;
+    address internal constant GNO_DEBT_TOKEN        = 0xE74569197bFba0e2231c84587cc5f9ceDB807043;
+
+    address internal constant WETH                   = 0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1;
+    address internal constant WETH_ATOKEN            = 0xe21Bf3FB5A2b5Bf7BAE8c6F1696c4B097F5D2f93;
+    address internal constant WETH_STABLE_DEBT_TOKEN = 0x0aD6cCf9a2e81d4d48aB7db791e9da492967eb84;
+    address internal constant WETH_DEBT_TOKEN        = 0xC2C2F532334D5868508f65ddB4610602C6ee8c5d;
+
+    address internal constant WSTETH                   = 0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6;
+    address internal constant WSTETH_ATOKEN            = 0x0F0e336Ab69D9516A9acF448bC59eA0CE79E4a42;
+    address internal constant WSTETH_STABLE_DEBT_TOKEN = 0x3294dA2E28b29D1c08D556e2B86879d221256d31;
+    address internal constant WSTETH_DEBT_TOKEN        = 0x27c74895F0f49177cc4450Bf017281E556751a1a;
+
+    address internal constant WXDAI                   = 0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d;
+    address internal constant WXDAI_ATOKEN            = 0xab1B62A1346Acf534b581684940E2FD781F2EA22;
+    address internal constant WXDAI_STABLE_DEBT_TOKEN = 0x868ADfDf12A86422524EaB6978beAE08A0008F37;
+    address internal constant WXDAI_DEBT_TOKEN        = 0x8b0271080D53f759eCc607f13316bDB3B86449e2;
 
     /******************************************************************************************************************/
     /*** Implementation Addresses                                                                                   ***/
@@ -40,4 +55,30 @@ library Gnosis {
     address internal constant TREASURY_IMPL            = 0x571501be53711c372cE69De51865dD34B87698D5;
     address internal constant VARIABLE_DEBT_TOKEN_IMPL = 0x0ee554F6A1f7a4Cb4f82D4C124DdC2AD3E37fde1;
 
+    /******************************************************************************************************************/
+    /*** Config Engine Addresses                                                                                    ***/
+    /******************************************************************************************************************/
+
+    address internal constant PROXY_ADMIN               = 0xf76B8262dfd60fb7432C6b55E91f42b6da953647;
+    address internal constant CONFIG_ENGINE             = 0x36eddc380C7f370e5f05Da5Bd7F970a27f063e39;
+    address internal constant RATES_FACTORY             = 0xe04ba71E46fCd7DBB9334D8FBa13d476f38EB0f8;
+    address internal constant TRANSPARENT_PROXY_FACTORY = 0x91277b74a9d1Cc30fA0ff4927C287fe55E307D78;
+
+    /******************************************************************************************************************/
+    /*** Data Provider Addresses                                                                                    ***/
+    /******************************************************************************************************************/
+
+    address internal constant PROTOCOL_DATA_PROVIDER     = 0x2a002054A06546bB5a264D57A81347e23Af91D18;
+    address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xA7F8A757C4f7696c015B595F51B2901AC0121B18;
+    address internal constant UI_POOL_DATA_PROVIDER      = 0xF028c2F4b19898718fD0F77b9b881CbfdAa5e8Bb;
+    address internal constant WALLET_BALANCE_PROVIDER    = 0xd2AeF86F51F92E8e49F42454c287AE4879D1BeDc;
+
+    /******************************************************************************************************************/
+    /*** Bridging Addresses                                                                                         ***/
+    /******************************************************************************************************************/
+
+    address constant AMB_EXECUTOR = 0xc4218C1127cB24a0D6c1e7D25dc34e10f2625f5A;
+    address constant L1_AMB       = 0x4C36d2919e407f0Cc2Ee3c993ccF8ac26d9CE64e;
+    address constant L2_AMB       = 0x75Df5AF045d91108662D8080fD1FEFAd6aA0bb59;
+
 }