diff --git a/config/aave.ts b/config/aave.ts
index 0c474864..1f769d78 100644
--- a/config/aave.ts
+++ b/config/aave.ts
@@ -54,6 +54,7 @@ export const AaveConfig: IAaveConfiguration = {
     UNI: strategyUNI,
     BUSD: stablecoinStrategyBUSD,
     REN: strategyREN,
+    ENJ: strategyREN,
   },
   ReserveAssets: {
     [eEthereumNetwork.buidlerevm]: {},
@@ -76,9 +77,10 @@ export const AaveConfig: IAaveConfiguration = {
       ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
       SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',
       BUSD: '0x4c6E1EFC12FDfD568186b7BAEc0A43fFfb4bCcCf',
-      REN: ZERO_ADDRESS,
-      YFI: '0x28a8cdD5f533aaC3053d4E97980A7f1e174Db902',
-      UNI: '0x3ad51f7e8B088D32fB1E9DD205Ae4AEFAA5F7169',
+      REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f',
+      YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
+      UNI: '0x075A36BA8846C6B6F53644fDd3bf17E5151789DC',
+      ENJ: '0xC64f90Cd7B564D3ab580eb20a102A8238E218be2',
     },
     [EthereumNetwork.ropsten]: {
       WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
@@ -99,8 +101,9 @@ export const AaveConfig: IAaveConfiguration = {
       SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7',
       BUSD: '0xFA6adcFf6A90c11f31Bc9bb59eC0a6efB38381C6',
       REN: ZERO_ADDRESS,
-      YFI: '0xcAE8C8ee90791af9BB66879FD9493e13abBe4b0e',
+      YFI: ZERO_ADDRESS,
       UNI: ZERO_ADDRESS,
+      ENJ: ZERO_ADDRESS,
     },
     [EthereumNetwork.main]: {
       WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -123,6 +126,7 @@ export const AaveConfig: IAaveConfiguration = {
       REN: '0x408e41876cCCDC0F92210600ef50372656052a38',
       YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
       UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+      ENJ: '0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c',
     },
   },
 };
diff --git a/config/commons.ts b/config/commons.ts
index f3bb14cb..4ffdd95f 100644
--- a/config/commons.ts
+++ b/config/commons.ts
@@ -1,4 +1,5 @@
 import BigNumber from 'bignumber.js';
+import {zeroPad} from 'ethers/lib/utils';
 import {oneEther, oneRay, RAY, ZERO_ADDRESS} from '../helpers/constants';
 import {ICommonConfiguration, EthereumNetwork, eEthereumNetwork} from '../helpers/types';
 
@@ -24,6 +25,7 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   YFI: oneEther.multipliedBy('22.407436').toFixed(),
   REN: oneEther.multipliedBy('0.00065133').toFixed(),
   UNI: oneEther.multipliedBy('0.00536479').toFixed(),
+  ENJ: oneEther.multipliedBy('0.00029560').toFixed(),
   UNI_DAI_ETH: oneEther.multipliedBy('2.1').toFixed(),
   UNI_USDC_ETH: oneEther.multipliedBy('2.1').toFixed(),
   UNI_SETH_ETH: oneEther.multipliedBy('2.1').toFixed(),
@@ -197,6 +199,7 @@ export const CommonsConfig: ICommonConfiguration = {
       YFI: '0xe45f3ed2218E7e411bf8DFdE66069e57F46b26eF',
       REN: ZERO_ADDRESS,
       UNI: ZERO_ADDRESS,
+      ENJ: '0xfaDbe2ee798889F02d1d39eDaD98Eff4c7fe95D4',
       UNI_DAI_ETH: '0x0338C40020Bf886c11406115fD1ba205Ef1D9Ff9',
       UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
       UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',
@@ -225,6 +228,7 @@ export const CommonsConfig: ICommonConfiguration = {
       YFI: ZERO_ADDRESS,
       REN: ZERO_ADDRESS,
       UNI: ZERO_ADDRESS,
+      ENJ: ZERO_ADDRESS,
       UNI_DAI_ETH: '0x16048819e3f77b7112eB033624A0bA9d33743028',
       UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3',
       UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1',
@@ -253,6 +257,7 @@ export const CommonsConfig: ICommonConfiguration = {
       YFI: '0x7c5d4F8345e66f68099581Db340cd65B078C41f4',
       REN: '0x3147D7203354Dc06D9fd350c7a2437bcA92387a4',
       UNI: '0xD6aA3D25116d8dA79Ea0246c4826EB951872e02e',
+      ENJ: '0x24D9aB51950F3d62E9144fdC2f3135DAA6Ce8D1B',
       UNI_DAI_ETH: '0x1bAB293850289Bf161C5DA79ff3d1F02A950555b',
       UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0',
       UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10',
diff --git a/helpers/types.ts b/helpers/types.ts
index 5ad7fa16..bec26bdf 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -191,6 +191,7 @@ export interface iAssetBase<T> {
   UNI: T;
   USD: T;
   REN: T;
+  ENJ: T;
 
   UNI_DAI_ETH: T;
   UNI_USDC_ETH: T;
@@ -226,6 +227,7 @@ export type iAavePoolAssets<T> = Pick<
   | 'YFI'
   | 'UNI'
   | 'REN'
+  | 'ENJ'
 >;
 
 export type iUniAssets<T> = Pick<
@@ -275,6 +277,7 @@ export enum TokenContractId {
   USD = 'USD',
   YFI = 'YFI',
   UNI = 'UNI',
+  ENJ = 'ENJ',
   UNI_DAI_ETH = 'UNI_DAI_ETH',
   UNI_USDC_ETH = 'UNI_USDC_ETH',
   UNI_SETH_ETH = 'UNI_SETH_ETH',