diff --git a/Makefile b/Makefile
index 2708df60..8db7ae3b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,31 +9,45 @@ update:; forge update
 test   :; forge test -vvv --no-match-contract DeploymentsGasLimits
 test-contract :; forge test --match-contract ${filter} -vvv
 test-watch   :; forge test --watch -vvv --no-match-contract DeploymentsGasLimits
-coverage :; forge coverage --report lcov && \
-	lcov --remove ./lcov.info -o ./lcov.info.p \
-	'scripts/*' \
-	'tests/*' \
-	'src/deployments/*' \
-	'src/periphery/contracts/v3-config-engine/*' \
-	'src/periphery/contracts/treasury/*' \
-	'src/periphery/contracts/dependencies/openzeppelin/ReentrancyGuard.sol' \
-	'src/periphery/contracts/misc/UiIncentiveDataProviderV3.sol' \
-	'src/periphery/contracts/misc/UiPoolDataProviderV3.sol' \
-	'src/periphery/contracts/misc/WalletBalanceProvider.sol' \
-	'src/periphery/contracts/mocks/*' \
-	'src/core/contracts/mocks/*' \
-	'src/core/contracts/dependencies/*' \
-	'src/core/contracts/misc/AaveProtocolDataProvider.sol' \
-	'src/core/contracts/protocol/libraries/configuration/*' \
-	'src/core/contracts/protocol/libraries/logic/GenericLogic.sol' \
-	'src/core/contracts/protocol/libraries/logic/ReserveLogic.sol' \
-	&& genhtml ./lcov.info.p -o report --branch-coverage \
-	&& coverage=$$(awk -F '[<>]' '/headerCovTableEntryHi/{print $3}' ./report/index.html | sed 's/[^0-9.]//g' | head -n 1); \
+
+# Coverage
+coverage-base :; forge coverage --report lcov --no-match-coverage "(scripts|tests|deployments|mocks)"
+coverage-clean :; lcov --rc derive_function_end_line=0 --remove ./lcov.info -o ./lcov.info.p \
+	'src/contracts/extensions/v3-config-engine/*' \
+	'src/contracts/treasury/*' \
+	'src/contracts/dependencies/openzeppelin/ReentrancyGuard.sol' \
+	'src/contracts/helpers/UiIncentiveDataProviderV3.sol' \
+	'src/contracts/helpers/UiPoolDataProviderV3.sol' \
+	'src/contracts/helpers/WalletBalanceProvider.sol' \
+	'src/contracts/dependencies/*' \
+	'src/contracts/helpers/AaveProtocolDataProvider.sol' \
+	'src/contracts/protocol/libraries/configuration/*' \
+	'src/contracts/protocol/libraries/logic/GenericLogic.sol' \
+	'src/contracts/protocol/libraries/logic/ReserveLogic.sol'
+coverage-report :; genhtml ./lcov.info.p -o report --branch-coverage --rc derive_function_end_line=0 --parallel
+coverage-badge :; coverage=$$(awk -F '[<>]' '/headerCovTableEntryHi/{print $3}' ./report/index.html | sed 's/[^0-9.]//g' | head -n 1); \
 	wget -O ./report/coverage.svg "https://img.shields.io/badge/coverage-$${coverage}%25-brightgreen"
+coverage :
+	make coverage-base
+	make coverage-clean
+	make coverage-report
+	make coverage-badge
 
 # Utilities
 download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}
 git-diff :
 	@mkdir -p diffs
 	@npx prettier ${before} ${after} --write
-	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md
+	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md
+
+# Deploy
+deploy-libs-one	:;
+	forge script scripts/misc/LibraryPreCompileOne.sol --rpc-url ${chain} --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify --slow --broadcast
+deploy-libs-two	:;
+	forge script scripts/misc/LibraryPreCompileTwo.sol --rpc-url ${chain} --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify --slow --broadcast
+
+deploy-libs :
+	make deploy-libs-one chain=${chain}
+	npx catapulta-verify -b broadcast/LibraryPreCompileOne.sol/${chainId}/run-latest.json
+	make deploy-libs-two chain=${chain}
+	npx catapulta-verify -b broadcast/LibraryPreCompileTwo.sol/${chainId}/run-latest.json
diff --git a/certora/applyHarness.patch b/certora/applyHarness.patch
index 62c1705e..06b4e1ca 100644
--- a/certora/applyHarness.patch
+++ b/certora/applyHarness.patch
@@ -1,22 +1,22 @@
-diff -ruN core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
---- core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 12:57:15.497294747 +0200
-+++ core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 13:08:22.155984803 +0200
+diff -ruN contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
+--- contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 12:57:15.497294747 +0200
++++ contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol	2024-03-27 13:08:22.155984803 +0200
 @@ -34,7 +34,7 @@
    }
- 
+
    /// @inheritdoc IScaledBalanceToken
 -  function scaledBalanceOf(address user) external view override returns (uint256) {
 +  function scaledBalanceOf(address user) public view override returns (uint256) {
      return super.balanceOf(user);
    }
- 
-diff -ruN core/instances/ATokenInstance.sol core/instances/ATokenInstance.sol
---- core/instances/ATokenInstance.sol	2024-03-27 12:57:15.497294747 +0200
-+++ core/instances/ATokenInstance.sol	2024-03-27 13:14:17.971198372 +0200
+
+diff -ruN contracts/instances/ATokenInstance.sol contracts/instances/ATokenInstance.sol
+--- contracts/instances/ATokenInstance.sol	2024-03-27 12:57:15.497294747 +0200
++++ contracts/instances/ATokenInstance.sol	2024-03-27 13:14:17.971198372 +0200
 @@ -35,15 +35,15 @@
- 
+
      _domainSeparator = _calculateDomainSeparator();
- 
+
 -    emit Initialized(
 -      underlyingAsset,
 -      address(POOL),
diff --git a/certora/conf/NEW-pool-no-summarizations.conf b/certora/conf/NEW-pool-no-summarizations.conf
index 080f07f5..bcf611fc 100644
--- a/certora/conf/NEW-pool-no-summarizations.conf
+++ b/certora/conf/NEW-pool-no-summarizations.conf
@@ -2,15 +2,14 @@
   "files": [
     "certora/harness/ATokenHarness.sol",
     "certora/harness/PoolHarness.sol",
-    "certora/harness/StableDebtTokenHarness.sol",
     "certora/harness/SimpleERC20.sol",
-    "src/core/instances/VariableDebtTokenInstance.sol",
-    "src/core/contracts/misc/AaveProtocolDataProvider.sol",
-    "src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol",
-    "src/core/contracts/protocol/configuration/ACLManager.sol",
-    "src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol",
-    "src/core/contracts/protocol/configuration/PriceOracleSentinel.sol",
-    "src/core/contracts/protocol/configuration/PoolAddressesProvider.sol",
+    "src/contracts/instances/VariableDebtTokenInstance.sol",
+    "src/contracts/helpers/AaveProtocolDataProvider.sol",
+    "src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol",
+    "src/contracts/protocol/configuration/ACLManager.sol",
+    "src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol",
+    "src/contracts/misc/PriceOracleSentinel.sol",
+    "src/contracts/protocol/configuration/PoolAddressesProvider.sol",
   ],
   "link": [
     "ATokenHarness:POOL=PoolHarness",
@@ -20,7 +19,6 @@
   ],
   "struct_link": [
     "PoolHarness:aTokenAddress=ATokenHarness",
-    "PoolHarness:stableDebtTokenAddress=StableDebtTokenHarness",
     "PoolHarness:variableDebtTokenAddress=VariableDebtTokenInstance",
     "PoolHarness:interestRateStrategyAddress=DefaultReserveInterestRateStrategyV2",
   ],
diff --git a/certora/conf/NEW-pool-simple-properties.conf b/certora/conf/NEW-pool-simple-properties.conf
index 6c81b8ad..da979e32 100644
--- a/certora/conf/NEW-pool-simple-properties.conf
+++ b/certora/conf/NEW-pool-simple-properties.conf
@@ -2,13 +2,12 @@
   "files": [
     "certora/harness/ATokenHarness.sol",
     "certora/harness/PoolHarness.sol",
-    "certora/harness/StableDebtTokenHarness.sol",
     "certora/harness/SimpleERC20.sol",
-    "src/core/instances/VariableDebtTokenInstance.sol",
-    "src/core/contracts/misc/AaveProtocolDataProvider.sol",
-    "src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol",
-    "src/core/contracts/protocol/libraries/types/DataTypes.sol",
-    "src/core/contracts/protocol/configuration/PoolAddressesProvider.sol",
+    "src/contracts/instances/VariableDebtTokenInstance.sol",
+    "src/contracts/helpers/AaveProtocolDataProvider.sol",
+    "src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol",
+    "src/contracts/protocol/libraries/types/DataTypes.sol",
+    "src/contracts/protocol/configuration/PoolAddressesProvider.sol",
   ],
   "link": [
     "ATokenHarness:POOL=PoolHarness",
@@ -17,7 +16,6 @@
   ],
   "struct_link": [
     "PoolHarness:aTokenAddress=ATokenHarness",
-    "PoolHarness:stableDebtTokenAddress=StableDebtTokenHarness",
     "PoolHarness:variableDebtTokenAddress=VariableDebtTokenInstance",
     "PoolHarness:interestRateStrategyAddress=DefaultReserveInterestRateStrategyV2",
   ],
diff --git a/certora/conf/StableDebtToken.conf b/certora/conf/StableDebtToken.conf
deleted file mode 100644
index 0d94747f..00000000
--- a/certora/conf/StableDebtToken.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-//===================================================================================
-//  IMPORTANT:
-//  This file can be DELETED, since Stable coins are removed.
-//  In the implementation all the function either revert or return 0
-//  ===================================================================================
-
-{
-  "cache": "StableToken",
-  "files": [
-    "certora/harness/StableDebtTokenHarness.sol:StableDebtTokenHarness"
-  ],
-  "loop_iter": "4",
-  "msg": "stableTokenCLI",
-  "optimistic_loop": true,
-  "process": "emv",
-  "solc": "solc8.19",
-//  "build_cache": true,
-  "verify": "StableDebtTokenHarness:certora/specs/StableDebtToken.spec"
-}
diff --git a/certora/harness/ATokenHarness.sol b/certora/harness/ATokenHarness.sol
index cc23245c..bcb5d32a 100644
--- a/certora/harness/ATokenHarness.sol
+++ b/certora/harness/ATokenHarness.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: agpl-3.0
 pragma solidity ^0.8.19;
 
-import {Pool} from '../munged/core/contracts/protocol/pool/Pool.sol';
-import {ATokenInstance} from '../munged/core/instances/ATokenInstance.sol';
-import {WadRayMath} from '../munged/core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {ScaledBalanceTokenBase} from '../munged/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol';
-import {IScaledBalanceToken} from '../munged/core/contracts/interfaces/IScaledBalanceToken.sol';
+import {Pool} from '../munged/contracts/protocol/pool/Pool.sol';
+import {ATokenInstance} from '../munged/contracts/instances/ATokenInstance.sol';
+import {WadRayMath} from '../munged/contracts/protocol/libraries/math/WadRayMath.sol';
+import {ScaledBalanceTokenBase} from '../munged/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol';
+import {IScaledBalanceToken} from '../munged/contracts/interfaces/IScaledBalanceToken.sol';
 
-/**
+/*
  * @title Certora harness for Aave ERC20 AToken
  *
  * @dev Certora's harness contract for the verification of Aave ERC20 AToken.
diff --git a/certora/harness/PoolHarness.sol b/certora/harness/PoolHarness.sol
index 70deadf9..96ad8637 100644
--- a/certora/harness/PoolHarness.sol
+++ b/certora/harness/PoolHarness.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {PoolInstance} from '../munged/core/instances/PoolInstance.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveLogic} from '../munged/core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {IPoolAddressesProvider} from '../munged/core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {PoolInstance} from '../munged/contracts/instances/PoolInstance.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveLogic} from '../munged/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {IPoolAddressesProvider} from '../munged/contracts/interfaces/IPoolAddressesProvider.sol';
 
-import {IERC20} from '../../src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {ReserveConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IERC20} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {ReserveConfiguration} from '../munged/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
 
 contract PoolHarness is PoolInstance {
   using ReserveLogic for DataTypes.ReserveData;
@@ -23,8 +23,7 @@ contract PoolHarness is PoolInstance {
 
   function getTotalDebt(address asset) public view returns (uint256) {
     uint256 totalVariable = IERC20(_reserves[asset].variableDebtTokenAddress).totalSupply();
-    uint256 totalStable = IERC20(_reserves[asset].stableDebtTokenAddress).totalSupply();
-    return totalVariable + totalStable;
+    return totalVariable;
   }
 
   function getTotalATokenSupply(address asset) public view returns (uint256) {
@@ -35,10 +34,6 @@ contract PoolHarness is PoolInstance {
     return _reserves[asset].liquidityIndex;
   }
 
-  function getReserveStableBorrowRate(address asset) public view returns (uint256) {
-    return _reserves[asset].currentStableBorrowRate;
-  }
-
   function getReserveVariableBorrowIndex(address asset) public view returns (uint256) {
     return _reserves[asset].variableBorrowIndex;
   }
diff --git a/certora/harness/ReserveConfigurationHarness.sol b/certora/harness/ReserveConfigurationHarness.sol
index d4edade2..b74bd81a 100644
--- a/certora/harness/ReserveConfigurationHarness.sol
+++ b/certora/harness/ReserveConfigurationHarness.sol
@@ -1,8 +1,9 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 pragma experimental ABIEncoderV2;
 
-import {ReserveConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveConfiguration} from '../munged/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
 
 contract ReserveConfigurationHarness {
   DataTypes.ReserveConfigurationMap public reservesConfig;
@@ -130,18 +131,6 @@ contract ReserveConfigurationHarness {
     return ReserveConfiguration.getBorrowingEnabled(reservesConfig);
   }
 
-  // Enables or disables stable rate borrowing on the reserve
-  function setStableRateBorrowingEnabled(bool enabled) public {
-    DataTypes.ReserveConfigurationMap memory configNew = reservesConfig;
-    ReserveConfiguration.setStableRateBorrowingEnabled(configNew, enabled);
-    reservesConfig.data = configNew.data;
-  }
-
-  // Gets the stable rate borrowing state of the reserve
-  function getStableRateBorrowingEnabled() public view returns (bool) {
-    return ReserveConfiguration.getStableRateBorrowingEnabled(reservesConfig);
-  }
-
   // Sets the reserve factor of the reserve
   function setReserveFactor(uint256 reserveFactor) public {
     DataTypes.ReserveConfigurationMap memory configNew = reservesConfig;
@@ -301,7 +290,7 @@ contract ReserveConfigurationHarness {
 
   // Executes a setter of a bool parameter according to the given id
   function executeBoolSetterById(uint256 id, bool val) public {
-    require(id >= 0 && id <= 5);
+    require(id >= 0 && id <= 4);
     if (id == 0) {
       setActive(val);
     } else if (id == 1) {
@@ -309,8 +298,6 @@ contract ReserveConfigurationHarness {
     } else if (id == 2) {
       setBorrowingEnabled(val);
     } else if (id == 3) {
-      setStableRateBorrowingEnabled(val);
-    } else if (id == 4) {
       setPaused(val);
     } else {
       setBorrowableInIsolation(val);
@@ -319,7 +306,7 @@ contract ReserveConfigurationHarness {
 
   // Executes a getter of a bool parameter according to the given id
   function executeBoolGetterById(uint256 id) public view returns (bool) {
-    require(id >= 0 && id <= 5);
+    require(id >= 0 && id <= 4);
     if (id == 0) {
       return getActive();
     } else if (id == 1) {
@@ -327,8 +314,6 @@ contract ReserveConfigurationHarness {
     } else if (id == 2) {
       return getBorrowingEnabled();
     } else if (id == 3) {
-      return getStableRateBorrowingEnabled();
-    } else if (id == 4) {
       return getPaused();
     } else {
       return getBorrowableInIsolation();
diff --git a/certora/harness/SimpleERC20.sol b/certora/harness/SimpleERC20.sol
index 81d12bad..68733603 100644
--- a/certora/harness/SimpleERC20.sol
+++ b/certora/harness/SimpleERC20.sol
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: agpl-3.0
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {IERC20} from '../munged/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../munged/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
 A simple ERC implementation used as the underlying_asset for the verification process.
diff --git a/certora/harness/StableDebtTokenHarness.sol b/certora/harness/StableDebtTokenHarness.sol
deleted file mode 100644
index 99ce3355..00000000
--- a/certora/harness/StableDebtTokenHarness.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-pragma solidity ^0.8.19;
-
-import {StableDebtTokenInstance} from '../munged/core/instances/StableDebtTokenInstance.sol';
-import {IncentivizedERC20} from '../munged/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
-import {IPool} from '../munged/core/contracts/interfaces/IPool.sol';
-
-contract StableDebtTokenHarness is StableDebtTokenInstance {
-  constructor(IPool pool) public StableDebtTokenInstance(pool) {}
-
-  function additionalData(address user) public view returns (uint128) {
-    return _userState[user].additionalData;
-  }
-
-  function debtTotalSupply() public view returns (uint256) {
-    return super.totalSupply();
-  }
-}
diff --git a/certora/harness/SymbolicPriceOracle.sol b/certora/harness/SymbolicPriceOracle.sol
index b90e21dd..d268e5d0 100644
--- a/certora/harness/SymbolicPriceOracle.sol
+++ b/certora/harness/SymbolicPriceOracle.sol
@@ -1,6 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {IPriceOracleGetter} from '../munged/interfaces/IPriceOracleGetter.sol';
+import {IPriceOracleGetter} from '../munged/contracts/interfaces/IPriceOracleGetter.sol';
 
 contract SymbolicPriceOracle is IPriceOracleGetter {
   address public base;
diff --git a/certora/harness/UserConfigurationHarness.sol b/certora/harness/UserConfigurationHarness.sol
index 4c82a29b..3f1637ea 100644
--- a/certora/harness/UserConfigurationHarness.sol
+++ b/certora/harness/UserConfigurationHarness.sol
@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 pragma experimental ABIEncoderV2;
 
-import {UserConfiguration} from '../munged/core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {DataTypes} from '../munged/core/contracts/protocol/libraries/types/DataTypes.sol';
-import {PoolStorage} from '../munged/core/contracts/protocol/pool/PoolStorage.sol';
+import {UserConfiguration} from '../munged/contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {DataTypes} from '../munged/contracts/protocol/libraries/types/DataTypes.sol';
+import {PoolStorage} from '../munged/contracts/protocol/pool/PoolStorage.sol';
 
 /*
 A wrapper contract for calling functions from the library UserConfiguration.
diff --git a/certora/harness/VariableDebtTokenHarness.sol b/certora/harness/VariableDebtTokenHarness.sol
index 33da454f..ca2696a6 100644
--- a/certora/harness/VariableDebtTokenHarness.sol
+++ b/certora/harness/VariableDebtTokenHarness.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.19;
 
-import {VariableDebtTokenInstance} from '../munged/core/instances/VariableDebtTokenInstance.sol';
-import {WadRayMath} from '../munged/core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {IPool} from '../munged/core/contracts/interfaces/IPool.sol';
+import {VariableDebtTokenInstance} from '../munged/contracts/instances/VariableDebtTokenInstance.sol';
+import {WadRayMath} from '../munged/contracts/protocol/libraries/math/WadRayMath.sol';
+import {IPool} from '../munged/contracts/interfaces/IPool.sol';
 
 contract VariableDebtTokenHarness is VariableDebtTokenInstance {
   using WadRayMath for uint256;
diff --git a/certora/specs/NEW-pool-base.spec b/certora/specs/NEW-pool-base.spec
index 9a9e86ba..68e386d8 100644
--- a/certora/specs/NEW-pool-base.spec
+++ b/certora/specs/NEW-pool-base.spec
@@ -64,11 +64,6 @@ methods {
   function _.getACLManager() external  => DISPATCHER(true);
   //function _.isBridge(address) external => DISPATCHER(true);
 
-  // StableDebt
-  function _.mint(address user, address onBehalfOf, uint256 amount, uint256 rate) external => DISPATCHER(true);
-  function _.burn(address user, uint256 amount) external => DISPATCHER(true);
-  function _.getSupplyData() external => DISPATCHER(true);
-
   // variableDebt
   function _.burn(address user, uint256 amount, uint256 index) external => DISPATCHER(true);
 
diff --git a/certora/specs/NEW-pool-no-summarizations.spec b/certora/specs/NEW-pool-no-summarizations.spec
index aad2c00c..826b0fb7 100644
--- a/certora/specs/NEW-pool-no-summarizations.spec
+++ b/certora/specs/NEW-pool-no-summarizations.spec
@@ -11,7 +11,6 @@ methods {
 
   //  function _.executeOperation(address[] a, uint256[]b, uint256[]c, address d, bytes e) external => DISPATCHER(true);
 
-  function _.getAverageStableRate() external => DISPATCHER(true);
   function _.isPoolAdmin(address a) external => DISPATCHER(true);
   function _.getConfiguration(address a) external => DISPATCHER(true);
 
@@ -37,11 +36,10 @@ function ghostUpdate() returns bool {
 }
 
 
-function calculateInterestRatesMock(DataTypes.CalculateInterestRatesParams params) returns (uint256, uint256, uint256) {
+function calculateInterestRatesMock(DataTypes.CalculateInterestRatesParams params) returns (uint256, uint256) {
   uint256 liquidityRate = 1;
-  uint256 stableBorrowRate = 1;
   uint256 variableBorrowRate = 1;
-  return (liquidityRate, stableBorrowRate, variableBorrowRate);
+  return (liquidityRate, variableBorrowRate);
 }
 
 
diff --git a/certora/specs/ReserveConfiguration.spec b/certora/specs/ReserveConfiguration.spec
index cb13162c..b927763b 100644
--- a/certora/specs/ReserveConfiguration.spec
+++ b/certora/specs/ReserveConfiguration.spec
@@ -19,8 +19,6 @@ methods {
   function getSiloedBorrowing() external returns (bool) envfree;
   function setBorrowingEnabled(bool) external envfree;
   function getBorrowingEnabled() external returns (bool) envfree;
-  function setStableRateBorrowingEnabled(bool) external envfree;
-  function getStableRateBorrowingEnabled() external returns (bool) envfree;
   function setReserveFactor(uint256) external envfree;
   function getReserveFactor() external returns (uint256) envfree;
   function setBorrowCap(uint256) external envfree;
@@ -104,12 +102,6 @@ rule setBorrowingEnabledIntegrity(bool enabled) {
   assert getBorrowingEnabled() == enabled;
 }
 
-// checks the integrity of set StableRateBorrowingEnabled function and correct retrieval of the corresponding getter.
-rule setStableRateBorrowingEnabledIntegrity(bool enabled) {
-  setStableRateBorrowingEnabled(enabled);
-  assert getStableRateBorrowingEnabled() == enabled;
-}
-
 // checks the integrity of set ReserveFactor function and correct retrieval of the corresponding getter.
 rule setReserveFactorIntegrity(uint256 reserveFactor) {
   setReserveFactor(reserveFactor);
diff --git a/certora/specs/StableDebtToken.spec b/certora/specs/StableDebtToken.spec
deleted file mode 100644
index 00937585..00000000
--- a/certora/specs/StableDebtToken.spec
+++ /dev/null
@@ -1,327 +0,0 @@
-/*===================================================================================
-  IMPORTANT:
-  This file can be DELETED, since Stable coins are removed.
-  In the implementation all the function either revert or return 0
-  ===================================================================================*/
-
-methods {
-  function _.calculateCompoundedInterest(uint256 r, uint40 t0, uint256 t1) internal =>
-    calculateCompoundedInterestSummary(r, t0, t1) expect uint256 ALL;
-  function additionalData(address) external returns uint128 envfree;
-  function getAverageStableRate() external returns uint256 envfree;
-  function _.handleAction(address, uint256, uint256) external => NONDET;
-
-  function _.rayMul(uint256 x, uint256 y) internal => rayMulSummariztion(x, y) expect uint256 ALL;
-  function _.rayDiv(uint256 x, uint256 y) internal => rayDivSummariztion(x, y) expect uint256 ALL;
-}
-
-function PLUS256(uint256 x, uint256 y) returns uint256 {
-  return (assert_uint256( (x+y) % 2^256) );
-}
-
-definition RAY() returns uint = 1000000000000000000000000000;
-
-definition disAllowedFunctions(method f) returns bool =
-  f.selector == sig:transfer(address, uint256).selector ||
-  f.selector == sig:allowance(address, address).selector ||
-  f.selector == sig:approve(address, uint256).selector ||
-  f.selector == sig:transferFrom(address, address, uint256).selector ||
-  f.selector == sig:increaseAllowance(address, uint256).selector ||
-  f.selector == sig:decreaseAllowance(address, uint256).selector;
-
-ghost mapping(uint256 => mapping(uint256 => uint256)) calculateCompoundedInterestSummaryValues;
-function calculateCompoundedInterestSummary(uint256 rate, uint40 t0, uint256 t1) returns uint256 {
-  uint256 deltaT = assert_uint256( (t1-t0) % 2^256 );
-
-  if (deltaT == 0) {
-    return RAY();
-  }
-  if (rate == RAY()) {
-    return RAY();
-  }
-  if (rate >= RAY()) {
-    require calculateCompoundedInterestSummaryValues[rate][deltaT] >= rate;
-  }
-  else {
-    require calculateCompoundedInterestSummaryValues[rate][deltaT] < rate;
-  }
-  return calculateCompoundedInterestSummaryValues[rate][deltaT];
-}
-
-ghost mapping(uint256 => mapping(uint256 => uint256)) rayMulSummariztionValues;
-function rayMulSummariztion(uint256 x, uint256 y) returns uint256 {
-  if ((x == 0) || (y == 0)) {
-    return 0;
-  }
-  if (x == RAY()) {
-    return y;
-  }
-  if (y == RAY()) {
-    return x;
-  }
-
-  if (y > x) {
-    if (y > RAY()) {
-      require rayMulSummariztionValues[y][x] >= x;
-    }
-    if (x > RAY()) {
-      require rayMulSummariztionValues[y][x] >= y;
-    }
-    return rayMulSummariztionValues[y][x];
-  }
-  else {
-    if (x > RAY()) {
-      require rayMulSummariztionValues[x][y] >= y;
-    }
-    if (y > RAY()) {
-      require rayMulSummariztionValues[x][y] >= x;
-    }
-    return rayMulSummariztionValues[x][y];
-  }
-}
-
-ghost mapping(uint256 => mapping(uint256 => uint256)) rayDivSummariztionValues;
-function rayDivSummariztion(uint256 x, uint256 y) returns uint256 {
-  if (x == 0)	{
-    return 0;
-  }
-  if (y == RAY()) {
-    return x;
-  }
-  if (y == x)	{
-    return RAY();
-  }
-  require y > RAY() => rayDivSummariztionValues[x][y] <= x;
-  return rayDivSummariztionValues[x][y];
-}
-
-
-ghost symbolicCompundInterest(uint256, uint40) returns uint256 {
-  axiom forall uint256 x. forall uint40 t. symbolicCompundInterest(x, t) >= 1;
-}
-
-
-ghost sumAllBalance() returns mathint {
-  init_state axiom sumAllBalance() == 0;
-}
-hook Sstore _userState[KEY address a].balance uint128 balance (uint128 old_balance) {
-  havoc sumAllBalance assuming sumAllBalance@new() == sumAllBalance@old() + balance - old_balance;
-}
-hook Sload uint128 balance _userState[KEY address a].balance  {
-  require sumAllBalance() >= to_mathint(balance);
-}
-
-invariant principalLessThanBalance(env e, address user)
-  principalBalanceOf(e, user) <= balanceOf(e, user)
-  filtered { f -> !disAllowedFunctions(f) }
-
-/**
-  Burning user u amount of x tokens, decreases his balanceOf the user by x.
-  (balance is decreased by x and not scaled x because of the summarization to one ray)
-*/
-rule integrityBurn(address a, uint256 x) {
-  env e;
-  require getIncentivesController(e) == 0;
-  uint256 index;
-  uint256 balancebefore = balanceOf(e, a);
-  burn(e,a,x);
-
-  uint256 balanceAfter = balanceOf(e, a);
-  assert to_mathint(balanceAfter) == balancebefore - x;
-}
-
-/**
-  Mint to user u amount of x tokens, increases his balanceOf the user by x.
-  (balance is increased by x and not scaled x because of the summarization to one ray)
-*/
-rule integrityMint(address a, uint256 x) {
-  env e;
-  address delegatedUser;
-  require getIncentivesController(e) == 0;
-  uint256 index;
-  uint256 balancebefore = balanceOf(e,a);
-  mint(e, delegatedUser, a, x, index);
-
-  uint256 balanceAfter = balanceOf(e,a);
-  assert to_mathint(balanceAfter) == balancebefore+x;
-}
-
-// lastUpdated timestamp must be in the past.
-rule integrityTimeStamp(address user, method f)
-  filtered { f ->  !f.isView && !disAllowedFunctions(f) }
-{
-  env e;
-  require assert_uint256(getUserLastUpdated(e, user)) <= e.block.timestamp;
-  calldataarg arg;
-  f(e,arg);
-  assert assert_uint256(getUserLastUpdated(e, user)) <= e.block.timestamp;
-}
-
-rule integrityDelegationWithSig(address delegator, address delegatee, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) {
-  env e;
-  uint256 oldNonce = nonces(e, delegator);
-  delegationWithSig(e, delegator, delegatee, value, deadline, v, r, s);
-  assert to_mathint(nonces(e, delegator)) == oldNonce + 1 &&
-    borrowAllowance(e, delegator, delegatee) == value;
-}
-
-/*
-  Burn is additive, can performed either all at once or gradually
-  burn(from,to,x,index); burn(from,to,y,index) ~ burn(from,to,x+y,index) at the same initial state
-*/
-rule additiveBurn(address a, uint256 x,  uint256 y) {
-  env e;
-  storage initialStorage = lastStorage;
-  burn(e, a, x);
-  burn(e, a, y);
-  uint256 balanceScenario1 = balanceOf(e, a);
-  uint256 t = PLUS256(x,y);
-  burn(e, a, t) at initialStorage;
-
-  uint256 balanceScenario2 = balanceOf(e, a);
-  assert balanceScenario1 == balanceScenario2, "burn is not additive";
-}
-
-// minting and then buring Variable Debt Token should have no effect on the users balance
-rule inverseMintBurn(address a, address delegatedUser, uint256 amount, uint256 rate) {
-  env e;
-  uint256 balancebefore = balanceOf(e, a);
-  mint(e, delegatedUser, a, amount, rate);
-  burn(e, a, amount);
-  uint256 balanceAfter = balanceOf(e, a);
-  assert balancebefore == balanceAfter, "burn is not the inverse of mint";
-}
-
-// Only the pool with burn or mint operation can change the total supply. (assuming the getReserveNormalizedVariableDebt is not changed)
-rule whoChangeTotalSupply(method f)
-  filtered { f ->  !f.isView && !disAllowedFunctions(f) }
-{
-  env e;
-  uint256 oldTotalSupply = totalSupply(e);
-  calldataarg args;
-  f(e, args);
-  uint256 newTotalSupply = totalSupply(e);
-  assert oldTotalSupply != newTotalSupply =>
-    (e.msg.sender == POOL(e) &&
-      (f.selector == sig:burn(address, uint256).selector ||
-      f.selector == sig:mint(address, address, uint256, uint256).selector));
-}
-
-// only delegationWithSig operation can change the nonce.
-rule nonceChangePermits(method f)
-  filtered { f ->  !f.isView && !disAllowedFunctions(f) }
-{
-  env e;
-  address user;
-  uint256 oldNonce = nonces(e, user);
-  calldataarg args;
-  f(e, args);
-  uint256 newNonce = nonces(e, user);
-  assert oldNonce != newNonce => f.selector == sig:delegationWithSig(address, address, uint256, uint256, uint8, bytes32, bytes32).selector;
-}
-
-/*
-  Mint is additive, can performed either all at once or gradually
-  mint(u,x,index); mint(u,y,index) ~ mint(u,x+y,index) at the same initial state
-*/
-rule additiveMint(address a, uint256 x, uint256 y) {
-  env e;
-  address delegatedUser;
-  require getIncentivesController(e) == 0;
-  require getUserStableRate(e, a) == 0;
-  uint256 index;
-  storage initialStorage = lastStorage;
-  mint(e, delegatedUser, a, x, index);
-  mint(e, delegatedUser, a, y, index);
-  uint256 balanceScenario1 = balanceOf(e, a);
-
-  uint256 t = PLUS256(x,y);
-  mint(e, delegatedUser, a, t ,index) at initialStorage;
-
-  uint256 balanceScenario2 = balanceOf(e, a);
-  assert balanceScenario1 == balanceScenario2, "mint is not additive";
-}
-
-/*
-  Each operation of Stable Debt Token can change at most one user's balance.
-*/
-rule balanceOfChange(address a, address b, method f)
-  filtered { f ->  !f.isView && !disAllowedFunctions(f) }
-{
-  env e;
-  require a != b;
-  uint256 balanceABefore = balanceOf(e, a);
-  uint256 balanceBBefore = balanceOf(e, b);
-
-  calldataarg arg;
-  f(e, arg);
-
-  uint256 balanceAAfter = balanceOf(e, a);
-  uint256 balanceBAfter = balanceOf(e, b);
-
-  assert (balanceABefore == balanceAAfter || balanceBBefore == balanceBAfter);
-}
-
-// Buring zero amount of tokens should have no effect.
-rule burnZeroDoesntChangeBalance(address u) {
-  env e;
-  uint256 balanceBefore = balanceOf(e, u);
-  burn(e, u, 0);
-  uint256 balanceAfter = balanceOf(e, u);
-  assert balanceBefore == balanceAfter;
-}
-
-/*
-  Burning one user atokens should have no effect on other users that are not involved in the action.
-*/
-rule burnNoChangeToOther(address user, uint256 amount, address other) {
-  require other != user;
-  env e;
-  uint256 otherDataBefore = additionalData(other);
-  uint256 otherBalanceBefore = balanceOf(e, other);
-
-  burn(e, user, amount);
-
-  uint256 otherDataAfter = additionalData(other);
-  uint256 otherBalanceAfter = balanceOf(e, other);
-
-  assert otherDataBefore == otherDataAfter &&
-    otherBalanceBefore == otherBalanceAfter;
-}
-
-/*
-  Minting ATokens for a user should have no effect on other users that are not involved in the action.
-*/
-rule mintNoChangeToOther(address user, address onBehalfOf, uint256 amount, uint256 rate, address other) {
-  require other != user && other != onBehalfOf;
-
-  env e;
-  uint128 userDataBefore = additionalData(user);
-  uint128 otherDataBefore = additionalData(other);
-  uint256 userBalanceBefore = balanceOf(e, user);
-  uint256 otherBalanceBefore = balanceOf(e, other);
-
-  mint(e, user, onBehalfOf, amount, rate);
-
-  uint128 userDataAfter = additionalData(user);
-  uint128 otherDataAfter = additionalData(other);
-  uint256 userBalanceAfter = balanceOf(e, user);
-  uint256 otherBalanceAfter = balanceOf(e, other);
-
-  if (user != onBehalfOf) {
-    assert userBalanceBefore == userBalanceAfter && userDataBefore == userDataAfter;
-  }
-
-  assert otherBalanceBefore == otherBalanceAfter && otherDataBefore == otherDataAfter;
-}
-
-/*
-  Ensuring that the defined disallowed functions revert in any case.
-*/
-rule disallowedFunctionalities(method f) filtered { f -> disAllowedFunctions(f) }
-{
-  env e; calldataarg args;
-  f@withrevert(e, args);
-  assert lastReverted;
-}
-
diff --git a/changelog/3.2.md b/changelog/3.2.md
new file mode 100644
index 00000000..fe50aea5
--- /dev/null
+++ b/changelog/3.2.md
@@ -0,0 +1,102 @@
+# Aave 3.2
+
+Aave 3.2 focuses on two main areas of the aave protocol:
+
+- the final deprecation of stable borrowing
+- improvements on the eModes
+
+## Stable Rate offboarding
+
+While previous upgrades allowed graceful offboarding of stable borrowing, now with no stable borrow positions being left the protcol can remove all the now obsolete stable rate related logic.
+
+### Migration guide
+
+The upgrade is 100% backwards compatible.
+There are no changes to any methods, nor are there changes to emitted events.
+Parameters emitted in events that relate to stable rate are nulled.
+
+## Emodes: Removal of the eMode oracle
+
+The eMode oracle has never been used and it's usefulnes is debatable.
+Therefore to allow for storage optimization within the eMode configuration and reduce unnecessary code paths - the eMode oracle was removed.
+
+#### Indexers
+
+For backwards compatibility the existing `EModeCategoryAdded` will be emitted, but with `oracle` being nullified.
+
+## Emodes: Liquid eModes
+
+The new Liquid eMode feature of Aave v3.2 removes the previous constraint: **an asset listed on Aave can be eligible for different eModes, and then it only depends on the user to choose which eMode he wants to enter to.**
+
+For example, with liquid eModes, a possible configuration not doable before would be:
+
+- eMode 1, with wstETH, weETH and WETH.
+- eMode 2, with wstETH and WETH.
+- eMode 3, with weETH and WETH.
+- eMode 4, with WETH and GHO.
+
+So then, user A holding the wstETH and weETH collaterals, could borrow WETH at high LTV.
+User B holding only wstETH could borrow WETH at high (but different) LTV.
+User C holding only weETH could similarly borrow WETH at a different LTV than the previous two eModes.
+User D could have a position with WETH collateral and GHO borrowings.
+
+This doesn’t stop there, as more sophisticated configuration strategies could be adopted, like:
+
+- eMode for only WETH and stablecoins.
+- eMode for onboarding less mature LSTs, without requiring them being together with all major LSTs.
+
+**For extra configuration flexibility, liquid eModes also allow now to flag an asset as only borrowable, only collateral, or both, in the context of an eMode.**
+For example, in a hypothetic eMode with only wstETH and WETH, the normal configuration would be wstETH as only collateral and WETH as only borrowable, fully focusing on the wstETH leverage use-case.
+
+### BREAKING CHANGES
+
+- DataTypes.EModeCategory will return the same data as now, but is flagged deprecated and will be removed at a later point.
+
+- the new version of `PoolDataProvider` no longer exposes `PoolDataProvider.getReserveEModeCategory(address asset)` as there no longer is a `1:1` relation between assets and eModes.
+- `reserveConfig.getEModeCategory()` will return the current eMode, but will no longer be updated and is flagged deprecated.
+
+### Migration guide
+
+For existing users, the upgrade is 100% backwards compatible and no migration or similar is required.
+Entering and leaving an eMode still works via `setUserEMode(categoryId)` and `getUserEMode(address user)` like in previous versions of the protocol.
+
+#### Indexers
+
+As collateral/borrowable flags are newly introduced, two new events are being emitted:
+
+- `event AssetCollateralInEModeChanged(address indexed asset, uint8 categoryId, bool collateral);`
+- `event AssetBorrowableInEModeChanged(address indexed asset, uint8 categoryId, bool borrowable);`
+
+#### Getters
+
+In aave 3.1 all eMode parameters were exposed via a single `getEModeCategoryData` getter.
+When checking existing integrations, we noticed that in most cases this approach is suboptimal, given that users only rely on a subset of the data.
+Therefore in addition to the **deprecated** `getEModeCategoryData` getter there are now independent getters for the respective values:
+
+- `getEModeCategoryCollateralConfig(categoryId)`, returning the eMode ltv,lt,lb
+- `getEModeCategoryLabel(categoryId)`, returning the eMode label
+- `getEModeCategoryCollateralBitmap(categoryId)`, returning the collateral bitmap
+- `getEModeCategoryBorrowableBitmap(categoryId)`, returning the borrowable bitmap
+
+#### Identifying eModes for an asset
+
+In the previous version of the eModes feature it was possible to query a reserve configration to receive it's unique eMode.
+The relevant bits on the reseve configuration have been nullified.
+
+To identify eModes of a selected asset, there is currently multiple options:
+
+- onchain one can iterate trough eModes and select the "correct one" based on your application specific needs.
+
+```sol
+for (uint8 i = 1; i < 256; i++) {
+    DataTypes.CollateralConfig memory cfg = pool.getEModeCategoryCollateralConfig(i);
+    // check if it is an active eMode
+    if (cfg.liquidationThreshold != 0) {
+        // check if it's an eMode you are interested in
+        EModeConfiguration.isCollateralAsset(pool.getEModeCategoryCollateralBitmap(i), someReserveIndex);
+        EModeConfiguration.isBorrowableAsset(pool.getEModeCategoryBorrowableBitmap(i), someReserveIndex);
+    }
+}
+```
+
+- an offchain system could listen to `AssetCollateralInEModeChanged` & `AssetBorrowableInEModeChanged` events and feed the onchain contract with an appropriate categoryId
diff --git a/changelog/3.2_3.1_gas-diff.md b/changelog/3.2_3.1_gas-diff.md
new file mode 100644
index 00000000..59555afb
--- /dev/null
+++ b/changelog/3.2_3.1_gas-diff.md
@@ -0,0 +1,255 @@
+```diff
+diff --git a/reports/gas.old b/reports/gas.new
+index 27edd2c..d023564 100644
+--- a/reports/gas.old
++++ b/reports/gas.new
+@@ -1,28 +1,27 @@
+ | Deployment Cost | Deployment Size | | | | |
+ | 465623 | 2115 | | | | |
+ | Function Name | min | avg | median | max | # calls |
+-| ADDRESSES_PROVIDER | 898 | 3118 | 965 | 5465 | 2960 |
++| ADDRESSES_PROVIDER | 898 | 4362 | 5398 | 5465 | 3204 |
+-| DOMAIN_SEPARATOR | 1071 | 3102 | 3071 | 7571 | 260 |
++| DOMAIN_SEPARATOR | 1071 | 4688 | 4156 | 7571 | 5 |
+-| EMISSION_MANAGER | 940 | 940 | 940 | 940 | 711 |
++| EMISSION_MANAGER | 940 | 940 | 940 | 940 | 657 |
+-| FLASHLOAN_PREMIUM_TOTAL | 1002 | 2032 | 3002 | 7524 | 1426 |
++| FLASHLOAN_PREMIUM_TOTAL | 1002 | 2033 | 3002 | 7524 | 1318 |
+-| FLASHLOAN_PREMIUM_TO_PROTOCOL | 1095 | 1099 | 1095 | 7595 | 1423 |
++| FLASHLOAN_PREMIUM_TO_PROTOCOL | 1051 | 1075 | 1073 | 7573 | 1315 |
+-| MAX_GRACE_PERIOD | 5418 | 5418 | 5418 | 5418 | 1792 |
++| MAX_GRACE_PERIOD | 5374 | 5374 | 5374 | 5374 | 1792 |
+-| MAX_NUMBER_RESERVES | 922 | 922 | 922 | 922 | 1 |
++| MAX_NUMBER_RESERVES | 900 | 900 | 900 | 900 | 512 |
+-| MAX_STABLE_RATE_BORROW_SIZE_PERCENT | 1001 | 1001 | 1001 | 1001 | 1 |
+-| POOL | 940 | 2117 | 940 | 5440 | 107 |
++| POOL | 940 | 940 | 940 | 940 | 151 |
+-| RESERVE_TREASURY_ADDRESS | 1033 | 3279 | 3033 | 7533 | 2582 |
++| RESERVE_TREASURY_ADDRESS | 1033 | 1399 | 1033 | 7533 | 11254 |
+-| UNDERLYING_ASSET_ADDRESS | 1011 | 1245 | 1011 | 3055 | 875 |
++| UNDERLYING_ASSET_ADDRESS | 1011 | 1048 | 1055 | 3055 | 18525 |
+-| approve | 51281 | 51337 | 51305 | 51653 | 3093 |
++| approve | 51293 | 51357 | 51341 | 51653 | 39 |
+-| backUnbacked | 139070 | 153427 | 150732 | 173679 | 9 |
++| backUnbacked | 125314 | 140965 | 138917 | 159923 | 9 |
+-| balanceOf | 1033 | 3698 | 3360 | 22860 | 26304 |
++| balanceOf | 1297 | 5838 | 5387 | 22882 | 13022 |
+-| borrow(address,uint256,uint256,uint16,address) | 85039 | 259204 | 263334 | 310883 | 2928 |
++| borrow(address,uint256,uint256,uint16,address) | 74012 | 236273 | 249909 | 289117 | 3979 |
+-| borrow(bytes32) | 243318 | 243318 | 243318 | 243318 | 3 |
++| borrow(bytes32) | 229784 | 229784 | 229784 | 229784 | 3 |
+-| borrowAllowance | 1398 | 1424 | 1424 | 1450 | 10 |
++| borrowAllowance | 1450 | 1450 | 1450 | 1450 | 5 |
+-| configureEModeCategory | 34510 | 34532 | 34532 | 34555 | 512 |
++| configureEModeCategory | 34265 | 34276 | 34276 | 34287 | 512 |
+-| configureReserveAsCollateral | 44067 | 64132 | 72201 | 122702 | 778 |
++| configureReserveAsCollateral | 44089 | 64560 | 57776 | 122574 | 2308 |
+-| decimals | 948 | 1020 | 970 | 7470 | 801 |
++| decimals | 948 | 980 | 970 | 7470 | 18578 |
+ | decreaseAllowance | 34424 | 34424 | 34424 | 34424 | 1 |
+-| delegationWithSig | 29263 | 56423 | 45286 | 84345 | 14 |
++| delegationWithSig | 29263 | 56402 | 45264 | 84300 | 7 |
+-| deposit | 185121 | 234784 | 238060 | 247660 | 4362 |
++| deposit | 91045 | 215439 | 232166 | 235786 | 64 |
+-| disableLiquidationGracePeriod | 43659 | 55023 | 66191 | 66191 | 513 |
++| disableLiquidationGracePeriod | 43570 | 54942 | 66117 | 66117 | 513 |
+-| dropReserve | 32591 | 35807 | 32679 | 114160 | 775 |
++| dropReserve | 32635 | 35738 | 32657 | 105160 | 775 |
+-| flashLoan | 59460 | 177954 | 155739 | 374408 | 266 |
++| flashLoan | 59293 | 166429 | 135219 | 374226 | 267 |
+-| flashLoanSimple | 50968 | 322401 | 191286 | 664969 | 11 |
++| flashLoanSimple | 50944 | 311942 | 179440 | 642995 | 11 |
+-| getAssetIndex | 3098 | 10053 | 9606 | 16527 | 9694 |
++| getAssetIndex | 3708 | 11517 | 14698 | 21619 | 90 |
+-| getAverageStableRate | 5340 | 5340 | 5340 | 5340 | 1 |
+-| getBorrowLogic | 5417 | 5428 | 5428 | 5439 | 2 |
++| getBorrowLogic | 5395 | 5417 | 5417 | 5439 | 2 |
+-| getClaimer | 1244 | 7718 | 7744 | 7744 | 514 |
++| getClaimer | 1244 | 3410 | 1244 | 7744 | 3 |
+-| getConfiguration | 1298 | 1981 | 1320 | 7820 | 32304 |
++| getConfiguration | 1342 | 1917 | 1364 | 7864 | 56492 |
+-| getConfiguratorLogic | 5353 | 5353 | 5353 | 5353 | 1 |
++| getConfiguratorLogic | 5397 | 5397 | 5397 | 5397 | 1 |
+ | getDistributionEnd | 1411 | 1411 | 1411 | 1411 | 1 |
+-| getEModeCategoryData | 2532 | 6296 | 6793 | 11032 | 55 |
++| getEModeCategoryData | 13446 | 13446 | 13446 | 13446 | 3 |
+-| getEModeLogic | 5392 | 5403 | 5403 | 5414 | 2 |
++| getEModeLogic | 5392 | 5425 | 5425 | 5459 | 2 |
+-| getFlashLoanLogic | 5394 | 5405 | 5405 | 5416 | 2 |
++| getFlashLoanLogic | 5416 | 5438 | 5438 | 5461 | 2 |
+-| getIncentivesController | 1044 | 1082 | 1067 | 7588 | 787 |
++| getIncentivesController | 1044 | 1066 | 1088 | 7588 | 18392 |
+-| getLiquidationGracePeriod | 29229 | 29229 | 29229 | 29229 | 2258 |
++| getLiquidationGracePeriod | 29185 | 29204 | 29207 | 29207 | 2270 |
+-| getLiquidationLogic | 5439 | 5439 | 5439 | 5439 | 2 |
++| getLiquidationLogic | 5439 | 5450 | 5450 | 5461 | 2 |
+-| getPendingLtv | 1215 | 1215 | 1215 | 1215 | 771 |
++| getPendingLtv | 1259 | 1259 | 1259 | 1259 | 771 |
+-| getPoolLogic | 5416 | 5438 | 5438 | 5460 | 2 |
++| getPoolLogic | 5393 | 5415 | 5415 | 5438 | 2 |
++| getEModeCategoryBorrowableBitmap | 1287 | 7705 | 7787 | 7787 | 1827 |
++| getEModeCategoryCollateralBitmap | 1297 | 7732 | 7797 | 7797 | 2624 |
++| getEModeCategoryCollateralConfig | 1511 | 2351 | 1511 | 8011 | 110 |
++| getEModeCategoryLabel | 1954 | 2271 | 2212 | 3954 | 25 |
+ | getPreviousIndex | 1270 | 1270 | 1270 | 1270 | 39 |
+ | getReserveAddressById | 1281 | 1281 | 1281 | 1281 | 1 |
+-| getReserveData | 5007 | 7533 | 5029 | 29529 | 11478 |
++| getReserveData | 4889 | 12060 | 10933 | 29433 | 24876 |
+-| getReserveDataExtended | 4122 | 16316 | 4122 | 28622 | 1547 |
++| getReserveDataExtended | 4186 | 4852 | 4186 | 6186 | 6 |
+-| getReserveNormalizedIncome | 0 | 3480 | 1465 | 10427 | 28339 |
++| getReserveNormalizedIncome | 1443 | 1928 | 1487 | 10449 | 12324 |
+-| getReserveNormalizedVariableDebt | 1487 | 1681 | 1509 | 11607 | 7456 |
++| getReserveNormalizedVariableDebt | 1465 | 1675 | 1509 | 11607 | 7709 |
+-| getReservesCount | 1028 | 1028 | 1028 | 1028 | 1 |
++| getReservesCount | 1006 | 1006 | 1006 | 1006 | 2 |
+-| getReservesList | 3804 | 14119 | 16304 | 16304 | 1632 |
++| getReservesList | 3814 | 14280 | 11814 | 104107 | 4195 |
+-| getRewardsByAsset | 2399 | 10619 | 10899 | 10899 | 2419 |
++| getRewardsByAsset | 2399 | 5698 | 3672 | 10899 | 201 |
+-| getScaledUserBalanceAndSupply | 1449 | 5068 | 3449 | 9949 | 21 |
++| getScaledUserBalanceAndSupply | 1449 | 4192 | 3449 | 9949 | 39 |
+-| getSupplyData | 941 | 4320 | 5441 | 5441 | 24634 |
+-| getSupplyLogic | 5395 | 5406 | 5406 | 5417 | 2 |
++| getSupplyLogic | 5395 | 5427 | 5427 | 5459 | 2 |
+-| getTotalSupplyAndAvgRate | 5467 | 5467 | 5467 | 5467 | 1 |
+-| getTotalSupplyLastUpdated | 5380 | 5380 | 5380 | 5380 | 1 |
+-| getUserAccountData | 20331 | 23740 | 24831 | 33184 | 1037 |
++| getUserAccountData | 12857 | 22690 | 23001 | 38126 | 2575 |
+-| getUserConfiguration | 1322 | 1379 | 1322 | 3322 | 1822 |
+-| getUserEMode | 1275 | 1275 | 1275 | 1275 | 1036 |
+-| getUserLastUpdated | 1063 | 1066 | 1063 | 5563 | 1303 |
+-| getUserRewards | 7469 | 8705 | 8749 | 17526 | 267 |
+-| getUserStableRate | 1053 | 1056 | 1053 | 5553 | 1303 |
+-| getVirtualUnderlyingBalance | 1298 | 1298 | 1298 | 1298 | 2161 |
++| getUserConfiguration | 1322 | 1367 | 1322 | 3322 | 1821 |
++| getUserEMode | 1253 | 1253 | 1253 | 1253 | 1296 |
++| getUserRewards | 5237 | 7340 | 7469 | 10837 | 19 |
++| getVirtualUnderlyingBalance | 1276 | 1276 | 1276 | 1343 | 2159 |
+-| initReserve | 33566 | 33566 | 33566 | 33566 | 1024 |
++| initReserve | 33292 | 33324 | 33324 | 33356 | 1024 |
+-| initReserves | 43976 | 1109034 | 67095 | 266376563 | 777 |
++| initReserves | 45710 | 32954623 | 1608767 | 216346556 | 2049 |
+-| liquidationCall(address,address,address,uint256,bool) | 93735 | 277164 | 373019 | 436593 | 3511 |
++| liquidationCall(address,address,address,uint256,bool) | 80781 | 265740 | 351321 | 411059 | 3772 |
+-| liquidationCall(bytes32,bytes32) | 436101 | 436101 | 436101 | 436101 | 1 |
++| liquidationCall(bytes32,bytes32) | 403478 | 403478 | 403478 | 403478 | 1 |
+-| mintToTreasury(address[]) | 99379 | 100961 | 100961 | 102543 | 4 |
++| mintToTreasury(address[]) | 99355 | 100937 | 100937 | 102519 | 4 |
+-| mintUnbacked | 39431 | 157624 | 142643 | 206928 | 17 |
+-| name | 1883 | 2336 | 1883 | 8383 | 1130 |
+-| nonces | 1193 | 3233 | 3271 | 3271 | 266 |
++| mintUnbacked | 39409 | 145643 | 130769 | 193113 | 17 |
++| name | 1625 | 2060 | 1945 | 8383 | 18717 |
++| nonces | 1193 | 2463 | 3271 | 3271 | 10 |
+-| principalBalanceOf | 1054 | 1058 | 1054 | 5554 | 1304 |
+-| rebalanceStableBorrowRate(address,address) | 66731 | 77785 | 76855 | 90701 | 4 |
+-| rebalanceStableBorrowRate(bytes32) | 88567 | 88567 | 88567 | 88567 | 1 |
+-| repay(address,uint256,uint256,address) | 72862 | 145786 | 183147 | 202671 | 12 |
+-| repay(bytes32) | 171079 | 171079 | 171079 | 171079 | 1 |
++| repay(address,uint256,uint256,address) | 60515 | 129404 | 167787 | 187188 | 13 |
+-| repayWithATokens(address,uint256,uint256) | 169667 | 197449 | 198790 | 209791 | 261 |
++| repayWithATokens(address,uint256,uint256) | 155169 | 181413 | 182340 | 193364 | 261 |
+-| repayWithATokens(bytes32) | 174264 | 174264 | 174264 | 174264 | 1 |
+-| repayWithPermit(address,uint256,uint256,address,uint256,uint8,bytes32,bytes32) | 172046 | 202393 | 206845 | 235069 | 768 |
++| repayWithPermit(address,uint256,uint256,address,uint256,uint8,bytes32,bytes32) | 155747 | 185446 | 182899 | 218983 | 768 |
+-| repayWithPermit(bytes32,bytes32,bytes32) | 206026 | 223388 | 232772 | 234406 | 256 |
++| repayWithPermit(bytes32,bytes32,bytes32) | 187610 | 205991 | 197025 | 217816 | 256 |
+-| rescueTokens | 39115 | 70330 | 70428 | 70493 | 515 |
++| repay(bytes32) | 157379 | 157379 | 157379 | 157379 | 1 |
++| repayWithATokens(bytes32) | 160457 | 160457 | 160457 | 160457 | 1 |
++| rescueTokens | 39115 | 70351 | 70450 | 70515 | 515 |
+-| scaledBalanceOf | 1307 | 3892 | 3307 | 7807 | 17058 |
+-| scaledTotalSupply | 988 | 6174 | 7532 | 7532 | 24923 |
+-| setAssetEModeCategory | 43877 | 48416 | 43877 | 79492 | 296 |
+-| setBorrowCap | 43786 | 44831 | 43786 | 70877 | 268 |
+-| setBorrowableInIsolation | 67664 | 70079 | 70466 | 70466 | 13 |
+-| setConfiguration | 32805 | 32816 | 32816 | 32827 | 512 |
+-| setDebtCeiling | 43831 | 48208 | 43831 | 121793 | 274 |
+-| setEModeCategory | 45031 | 53891 | 45031 | 135403 | 295 |
++| scaledBalanceOf | 1307 | 3796 | 3307 | 7807 | 21200 |
++| scaledTotalSupply | 988 | 6101 | 7532 | 7532 | 23280 |
++| setAssetBorrowableInEMode | 94407 | 111508 | 111507 | 124758 | 1801 |
++| setAssetCollateralInEMode | 44103 | 99490 | 107690 | 107690 | 2853 |
++| setBorrowCap | 43764 | 44722 | 43764 | 70919 | 267 |
++| setBorrowableInIsolation | 67662 | 70075 | 70464 | 70464 | 13 |
++| setConfiguration | 32783 | 32794 | 32794 | 32805 | 512 |
++| setDebtCeiling | 43743 | 48113 | 43743 | 121555 | 274 |
++| setEModeCategory | 44850 | 102968 | 108880 | 108892 | 2849 |
+-| setLiquidationGracePeriod | 32857 | 37965 | 37379 | 43790 | 1536 |
+-| setLiquidationProtocolFee | 43996 | 60580 | 69836 | 70926 | 8 |
+-| setPoolPause(bool) | 41133 | 43634 | 43639 | 43645 | 512 |
+-| setPoolPause(bool,uint40) | 43789 | 88304 | 105603 | 134276 | 515 |
+-| setReserveActive | 40884 | 44328 | 40884 | 118172 | 269 |
+-| setReserveBorrowing | 43811 | 44179 | 43811 | 68496 | 260 |
+-| setReserveFactor | 43744 | 44228 | 43744 | 168324 | 258 |
+-| setReserveFlashLoaning | 68469 | 69188 | 68471 | 70625 | 3 |
+-| setReserveFreeze | 47022 | 73134 | 74781 | 99799 | 784 |
+-| setReserveInterestRateData | 44304 | 44449 | 44532 | 44532 | 256 |
+-| setReserveInterestRateStrategyAddress(address,address) | 32846 | 34595 | 33195 | 42729 | 1538 |
+-| setReserveInterestRateStrategyAddress(address,address,bytes) | 44536 | 46606 | 44536 | 204894 | 260 |
+-| setReservePause(address,bool) | 43900 | 57019 | 69938 | 69938 | 513 |
+-| setReservePause(address,bool,uint40) | 41267 | 65950 | 73872 | 78984 | 3086 |
+-| setReserveStableRateBorrowing | 43878 | 55083 | 43878 | 70726 | 447 |
+-| setSiloedBorrowing | 110540 | 120362 | 124195 | 126351 | 3 |
+-| setSupplyCap | 43766 | 57641 | 70845 | 70881 | 528 |
+-| setUnbackedMintCap | 70847 | 70847 | 70847 | 70847 | 7 |
+-| setUserEMode | 48307 | 69273 | 66533 | 124479 | 17 |
+-| setUserUseReserveAsCollateral(address,bool) | 91258 | 106982 | 102533 | 146832 | 42 |
+-| setUserUseReserveAsCollateral(bytes32) | 104249 | 104249 | 104249 | 104249 | 1 |
++| setLiquidationGracePeriod | 32850 | 37953 | 37372 | 43783 | 1536 |
++| setLiquidationProtocolFee | 43996 | 60620 | 69900 | 70990 | 8 |
++| setPoolPause(bool) | 43546 | 43975 | 43558 | 116350 | 515 |
++| setPoolPause(bool,uint40) | 43789 | 88446 | 74811 | 134413 | 512 |
++| setReserveActive | 40906 | 43807 | 40906 | 118044 | 267 |
++| setReserveBorrowing | 43855 | 62331 | 68490 | 68492 | 1024 |
++| setReserveFactor | 43788 | 44208 | 43788 | 151867 | 258 |
++| setReserveFlashLoaning | 68489 | 68494 | 68491 | 70645 | 513 |
++| setReserveFreeze | 47044 | 73136 | 74867 | 99885 | 782 |
++| setReserveInterestRateData | 44360 | 44843 | 44576 | 131113 | 257 |
++| setReserveInterestRateStrategyAddress(address,address) | 32846 | 34588 | 33195 | 42729 | 1538 |
++| setReserveInterestRateStrategyAddress(address,address,bytes) | 44491 | 61354 | 44491 | 190210 | 300 |
++| setReservePause(address,bool) | 43834 | 44174 | 44062 | 67780 | 258 |
++| setReservePause(address,bool,uint40) | 41289 | 65779 | 73951 | 76263 | 3084 |
++| setSiloedBorrowing | 102106 | 111970 | 115825 | 117981 | 3 |
++| setSupplyCap | 43721 | 45734 | 43721 | 70876 | 279 |
++| setUnbackedMintCap | 70911 | 70911 | 70911 | 70911 | 7 |
++| setUserEMode | 40484 | 73767 | 67458 | 121154 | 2583 |
++| setUserUseReserveAsCollateral(address,bool) | 80336 | 96351 | 93552 | 129626 | 42 |
++| setUserUseReserveAsCollateral(bytes32) | 95351 | 95351 | 95351 | 95351 | 1 |
+-| supply(address,uint256,address,uint16) | 67576 | 224075 | 242895 | 255446 | 3134 |
++| supply(address,uint256,address,uint16) | 56642 | 219107 | 226317 | 243572 | 5603 |
+-| supply(bytes32) | 248862 | 248862 | 248862 | 248862 | 7 |
++| supply(bytes32) | 236988 | 236988 | 236988 | 236988 | 7 |
+-| supplyWithPermit(address,uint256,address,uint16,uint256,uint8,bytes32,bytes32) | 154205 | 228834 | 253878 | 278406 | 768 |
++| supplyWithPermit(address,uint256,address,uint16,uint256,uint8,bytes32,bytes32) | 142365 | 216981 | 242026 | 266578 | 768 |
+-| supplyWithPermit(bytes32,bytes32,bytes32) | 274396 | 274465 | 274438 | 274588 | 256 |
++| supplyWithPermit(bytes32,bytes32,bytes32) | 262610 | 262681 | 262658 | 262802 | 256 |
+-| swapBorrowRateMode(address,uint256) | 71875 | 82362 | 72110 | 108180 | 7 |
+-| swapBorrowRateMode(bytes32) | 110034 | 110034 | 110034 | 110034 | 1 |
+-| symbol | 1690 | 2535 | 1904 | 8448 | 1098 |
++| symbol | 1646 | 2124 | 2010 | 8448 | 18692 |
+-| totalSupply | 907 | 8067 | 11570 | 15570 | 5078 |
++| totalSupply | 1024 | 8836 | 11592 | 15592 | 5958 |
+-| transfer | 27662 | 142942 | 149371 | 177944 | 273 |
++| transfer | 27662 | 143985 | 149393 | 167091 | 273 |
+-| transferFrom | 138680 | 138800 | 138800 | 138920 | 2 |
++| transferFrom | 138702 | 138822 | 138822 | 138942 | 2 |
+-| updateAToken | 41834 | 42242 | 41834 | 146921 | 257 |
+-| updateBridgeProtocolFee | 32528 | 33708 | 32595 | 78343 | 526 |
+-| updateFlashloanPremiumToProtocol | 40448 | 40537 | 40448 | 63402 | 258 |
+-| updateFlashloanPremiumTotal | 40447 | 40536 | 40447 | 63412 | 258 |
+-| updateFlashloanPremiums | 32898 | 32909 | 32909 | 32920 | 512 |
+-| updateStableDebtToken | 41688 | 42073 | 41688 | 140830 | 257 |
+-| updateVariableDebtToken | 41710 | 42095 | 41710 | 140832 | 257 |
++| updateAToken | 41767 | 42175 | 41767 | 146804 | 257 |
++| updateBridgeProtocolFee | 32528 | 33697 | 32573 | 78365 | 526 |
++| updateFlashloanPremiumToProtocol | 40448 | 40537 | 40448 | 63357 | 258 |
++| updateFlashloanPremiumTotal | 40402 | 40491 | 40402 | 63322 | 258 |
++| updateFlashloanPremiums | 32853 | 32864 | 32864 | 32875 | 512 |
++| updateVariableDebtToken | 41622 | 42007 | 41622 | 140688 | 257 |
+-| withdraw(address,uint256,address) | 77252 | 147744 | 154662 | 224961 | 23 |
++| withdraw(address,uint256,address) | 66318 | 134721 | 141942 | 204789 | 23 |
+-| withdraw(bytes32) | 150631 | 157711 | 157711 | 164791 | 2 |
++| withdraw(bytes32) | 138760 | 145839 | 145839 | 152919 | 2 |
+```
diff --git a/foundry.toml b/foundry.toml
index e5ae0500..a2c225e2 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -5,7 +5,7 @@ script = 'scripts'
 optimizer = true
 optimizer_runs = 200
 solc = '0.8.20'
-evm_version = 'paris'
+evm_version = 'shanghai'
 bytecode_hash = 'none'
 ignored_warnings_from = ["src/periphery/contracts/treasury/RevenueSplitter.sol"]
 out = 'out'
@@ -40,6 +40,7 @@ bnb_testnet = "${RPC_BNB_TESTNET}"
 bnb = "${RPC_BNB}"
 gnosis = "${RPC_GNOSIS}"
 base = "${RPC_BASE}"
+metis = "${RPC_METIS}"
 
 [etherscan]
 mainnet = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 1 }
@@ -47,14 +48,15 @@ optimism = { key = "${ETHERSCAN_API_KEY_OPTIMISM}", chainId = 10 }
 avalanche = { key = "${ETHERSCAN_API_KEY_AVALANCHE}", chainId = 43114 }
 polygon = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 137 }
 arbitrum = { key = "${ETHERSCAN_API_KEY_ARBITRUM}", chainId = 42161 }
-fantom = { key = "${ETHERSCAN_API_KEY_FANTOM}", chainId = 250 }
+# fantom = { key = "${ETHERSCAN_API_KEY_FANTOM}", chainId = 250 }
 scroll = { key = "${ETHERSCAN_API_KEY_SCROLL}", chainId = 534352, url = 'https://api.scrollscan.com/api\?' }
-celo = { key = "${ETHERSCAN_API_KEY_CELO}", chainId = 42220 }
-sepolia = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 11155111 }
-mumbai = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80001 }
-amoy = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80002 }
-bnb_testnet = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 97, url = 'https://api-testnet.bscscan.com/api' }
+# celo = { key = "${ETHERSCAN_API_KEY_CELO}", chainId = 42220 }
+# sepolia = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 11155111 }
+# mumbai = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80001 }
+# amoy = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80002 }
+# bnb_testnet = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 97, url = 'https://api-testnet.bscscan.com/api' }
 bnb = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 56, url = 'https://api.bscscan.com/api' }
 base = { key = "${ETHERSCAN_API_KEY_BASE}", chain = 8453 }
 gnosis = { key = "${ETHERSCAN_API_KEY_GNOSIS}", chainId = 100 }
+metis = { key = "", chainId = 1088, url = 'https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan/api' }
 # See more config options https://github.com/gakonst/foundry/tree/master/config
diff --git a/package.json b/package.json
index e2047c8f..7404519d 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "prettier-plugin-solidity": "^1.1.1"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "^0.16.4",
+    "@bgd-labs/aave-cli": "^1.0.0",
     "catapulta-verify": "^1.1.1"
   }
 }
diff --git a/report/cmd_line b/report/cmd_line
index 531e7eed..32f76312 100644
--- a/report/cmd_line
+++ b/report/cmd_line
@@ -1 +1 @@
-genhtml ./lcov.info.p -o report --branch-coverage
+genhtml ./lcov.info.p -o report --branch-coverage --rc derive_function_end_line=0 --parallel
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-b.html b/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-b.html
deleted file mode 100644
index 54f9b9fb..00000000
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-b.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">111</td>
-            <td class="headerCovTableEntry">111</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="ACLManager.sol.gcov.html">ACLManager.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html">PoolAddressesProvider.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html">PoolAddressesProviderRegistry.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html">PriceOracleSentinel.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-f.html b/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-f.html
deleted file mode 100644
index fc55300b..00000000
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-f.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">111</td>
-            <td class="headerCovTableEntry">111</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html">PoolAddressesProviderRegistry.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html">PriceOracleSentinel.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="ACLManager.sol.gcov.html">ACLManager.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html">PoolAddressesProvider.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-l.html b/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-l.html
deleted file mode 100644
index 0c13c5fc..00000000
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index-sort-l.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">111</td>
-            <td class="headerCovTableEntry">111</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html">PriceOracleSentinel.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="ACLManager.sol.gcov.html">ACLManager.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html">PoolAddressesProviderRegistry.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html">PoolAddressesProvider.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html b/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html
deleted file mode 100644
index bd9350ec..00000000
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">111</td>
-            <td class="headerCovTableEntry">111</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="ACLManager.sol.gcov.html">ACLManager.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html">PoolAddressesProvider.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverNumDflt">56</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html">PoolAddressesProviderRegistry.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverNumDflt">26</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html">PriceOracleSentinel.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func-c.html b/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func-c.html
deleted file mode 100644
index c983b9c9..00000000
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func-c.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (<a href="VersionedInitializable.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VersionedInitializable.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L59">VersionedInitializable.isConstructor</a></td>
-              
-              <td class="coverFnHi">15381</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func.html b/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func.html
deleted file mode 100644
index 971352cb..00000000
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.func.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (<a href="VersionedInitializable.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VersionedInitializable.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L59">VersionedInitializable.isConstructor</a></td>
-              
-              <td class="coverFnHi">15381</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-b.html b/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-b.html
deleted file mode 100644
index 3d12b7bd..00000000
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-b.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Helpers.sol.gcov.html">Helpers.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-f.html b/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-f.html
deleted file mode 100644
index 69c76388..00000000
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-f.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Helpers.sol.gcov.html">Helpers.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-l.html b/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-l.html
deleted file mode 100644
index d2bec174..00000000
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index-sort-l.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Helpers.sol.gcov.html">Helpers.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html b/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html
deleted file mode 100644
index 985d097b..00000000
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Helpers.sol.gcov.html">Helpers.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func.html b/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func.html
deleted file mode 100644
index 4c169418..00000000
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (<a href="BorrowLogic.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.1&nbsp;%</td>
-            <td class="headerCovTableEntry">67</td>
-            <td class="headerCovTableEntry">59</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BorrowLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L66">BorrowLogic.executeBorrow</a></td>
-              
-              <td class="coverFnHi">9117</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L280">BorrowLogic.executeRebalanceStableBorrowRate</a></td>
-              
-              <td class="coverFnHi">5</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L179">BorrowLogic.executeRepay</a></td>
-              
-              <td class="coverFnHi">5029</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L311">BorrowLogic.executeSwapBorrowRateMode</a></td>
-              
-              <td class="coverFnHi">8</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func-c.html b/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func-c.html
deleted file mode 100644
index 7a6e66bf..00000000
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func-c.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (<a href="EModeLogic.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EModeLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L84">EModeLogic.getEModeConfiguration</a></td>
-              
-              <td class="coverFnHi">10</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L40">EModeLogic.executeSetUserEMode</a></td>
-              
-              <td class="coverFnHi">17</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L104">EModeLogic.isInEModeCategory</a></td>
-              
-              <td class="coverFnHi">25421</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func.html b/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func.html
deleted file mode 100644
index 0117170a..00000000
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.func.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (<a href="EModeLogic.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EModeLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L40">EModeLogic.executeSetUserEMode</a></td>
-              
-              <td class="coverFnHi">17</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L84">EModeLogic.getEModeConfiguration</a></td>
-              
-              <td class="coverFnHi">10</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L104">EModeLogic.isInEModeCategory</a></td>
-              
-              <td class="coverFnHi">25421</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-b.html b/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-b.html
deleted file mode 100644
index 4190f8d8..00000000
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-b.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/pool/src/core/contracts/protocol/pool</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.1&nbsp;%</td>
-            <td class="headerCovTableEntry">365</td>
-            <td class="headerCovTableEntry">358</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
-            <td class="headerCovTableEntry">124</td>
-            <td class="headerCovTableEntry">121</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">DefaultReserveInterestRateStrategyV2.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="L2Pool.sol.gcov.html">L2Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Pool.sol.gcov.html">Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=99 height=10 alt="99.1%"><img src="../../../../../../../../../snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">108</td>
-              <td class="coverNumDflt">107</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">98.4&nbsp;%</td>
-              <td class="coverNumDflt">61</td>
-              <td class="coverNumDflt">60</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html">PoolConfigurator.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=97 height=10 alt="96.8%"><img src="../../../../../../../../../snow.png" width=3 height=10 alt="96.8%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">96.8&nbsp;%</td>
-              <td class="coverNumDflt">190</td>
-              <td class="coverNumDflt">184</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">94.9&nbsp;%</td>
-              <td class="coverNumDflt">39</td>
-              <td class="coverNumDflt">37</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-f.html b/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-f.html
deleted file mode 100644
index 33c1c9f7..00000000
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-f.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/pool/src/core/contracts/protocol/pool</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.1&nbsp;%</td>
-            <td class="headerCovTableEntry">365</td>
-            <td class="headerCovTableEntry">358</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
-            <td class="headerCovTableEntry">124</td>
-            <td class="headerCovTableEntry">121</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html">PoolConfigurator.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=97 height=10 alt="96.8%"><img src="../../../../../../../../../snow.png" width=3 height=10 alt="96.8%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">96.8&nbsp;%</td>
-              <td class="coverNumDflt">190</td>
-              <td class="coverNumDflt">184</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">94.9&nbsp;%</td>
-              <td class="coverNumDflt">39</td>
-              <td class="coverNumDflt">37</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Pool.sol.gcov.html">Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=99 height=10 alt="99.1%"><img src="../../../../../../../../../snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">108</td>
-              <td class="coverNumDflt">107</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">98.4&nbsp;%</td>
-              <td class="coverNumDflt">61</td>
-              <td class="coverNumDflt">60</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="L2Pool.sol.gcov.html">L2Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">DefaultReserveInterestRateStrategyV2.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-l.html b/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-l.html
deleted file mode 100644
index cb465de1..00000000
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index-sort-l.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/pool/src/core/contracts/protocol/pool</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.1&nbsp;%</td>
-            <td class="headerCovTableEntry">365</td>
-            <td class="headerCovTableEntry">358</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
-            <td class="headerCovTableEntry">124</td>
-            <td class="headerCovTableEntry">121</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html">PoolConfigurator.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=97 height=10 alt="96.8%"><img src="../../../../../../../../../snow.png" width=3 height=10 alt="96.8%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">96.8&nbsp;%</td>
-              <td class="coverNumDflt">190</td>
-              <td class="coverNumDflt">184</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">94.9&nbsp;%</td>
-              <td class="coverNumDflt">39</td>
-              <td class="coverNumDflt">37</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Pool.sol.gcov.html">Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=99 height=10 alt="99.1%"><img src="../../../../../../../../../snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">108</td>
-              <td class="coverNumDflt">107</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">98.4&nbsp;%</td>
-              <td class="coverNumDflt">61</td>
-              <td class="coverNumDflt">60</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="L2Pool.sol.gcov.html">L2Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">DefaultReserveInterestRateStrategyV2.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html b/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html
deleted file mode 100644
index 01f7d7cf..00000000
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/pool/src/core/contracts/protocol/pool</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.1&nbsp;%</td>
-            <td class="headerCovTableEntry">365</td>
-            <td class="headerCovTableEntry">358</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
-            <td class="headerCovTableEntry">124</td>
-            <td class="headerCovTableEntry">121</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">DefaultReserveInterestRateStrategyV2.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverNumDflt">43</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="L2Pool.sol.gcov.html">L2Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="Pool.sol.gcov.html">Pool.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=99 height=10 alt="99.1%"><img src="../../../../../../../../../snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">108</td>
-              <td class="coverNumDflt">107</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">98.4&nbsp;%</td>
-              <td class="coverNumDflt">61</td>
-              <td class="coverNumDflt">60</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html">PoolConfigurator.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=97 height=10 alt="96.8%"><img src="../../../../../../../../../snow.png" width=3 height=10 alt="96.8%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">96.8&nbsp;%</td>
-              <td class="coverNumDflt">190</td>
-              <td class="coverNumDflt">184</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">94.9&nbsp;%</td>
-              <td class="coverNumDflt">39</td>
-              <td class="coverNumDflt">37</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func-c.html b/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func-c.html
deleted file mode 100644
index 9132f3db..00000000
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func-c.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - StableDebtToken.sol<span style="font-size: 80%;"> (<a href="StableDebtToken.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">63.2&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">12</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">19</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StableDebtToken.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L120">StableDebtToken.allowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L124">StableDebtToken.approve</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L136">StableDebtToken.decreaseAllowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L83">StableDebtToken.getTotalSupplyAndAvgRate</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L93">StableDebtToken.getTotalSupplyLastUpdated</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L132">StableDebtToken.increaseAllowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L116">StableDebtToken.transfer</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L128">StableDebtToken.transferFrom</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L73">StableDebtToken.burn</a></td>
-              
-              <td class="coverFnHi">3</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L63">StableDebtToken.mint</a></td>
-              
-              <td class="coverFnHi">7</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L43">StableDebtToken.getAverageStableRate</a></td>
-              
-              <td class="coverFnHi">8</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L88">StableDebtToken.totalSupply</a></td>
-              
-              <td class="coverFnHi">17</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L103">StableDebtToken.UNDERLYING_ASSET_ADDRESS</a></td>
-              
-              <td class="coverFnHi">1016</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L108">StableDebtToken._EIP712BaseId</a></td>
-              
-              <td class="coverFnHi">3474</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L48">StableDebtToken.getUserLastUpdated</a></td>
-              
-              <td class="coverFnHi">4023</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L53">StableDebtToken.getUserStableRate</a></td>
-              
-              <td class="coverFnHi">4023</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L98">StableDebtToken.principalBalanceOf</a></td>
-              
-              <td class="coverFnHi">4024</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L58">StableDebtToken.balanceOf</a></td>
-              
-              <td class="coverFnHi">34689</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L78">StableDebtToken.getSupplyData</a></td>
-              
-              <td class="coverFnHi">51684</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func.html b/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func.html
deleted file mode 100644
index 4db63dd8..00000000
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.func.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - StableDebtToken.sol<span style="font-size: 80%;"> (<a href="StableDebtToken.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">63.2&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">12</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">19</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StableDebtToken.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L103">StableDebtToken.UNDERLYING_ASSET_ADDRESS</a></td>
-              
-              <td class="coverFnHi">1016</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L108">StableDebtToken._EIP712BaseId</a></td>
-              
-              <td class="coverFnHi">3474</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L120">StableDebtToken.allowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L124">StableDebtToken.approve</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L58">StableDebtToken.balanceOf</a></td>
-              
-              <td class="coverFnHi">34689</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L73">StableDebtToken.burn</a></td>
-              
-              <td class="coverFnHi">3</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L136">StableDebtToken.decreaseAllowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L43">StableDebtToken.getAverageStableRate</a></td>
-              
-              <td class="coverFnHi">8</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L78">StableDebtToken.getSupplyData</a></td>
-              
-              <td class="coverFnHi">51684</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L83">StableDebtToken.getTotalSupplyAndAvgRate</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L93">StableDebtToken.getTotalSupplyLastUpdated</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L48">StableDebtToken.getUserLastUpdated</a></td>
-              
-              <td class="coverFnHi">4023</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L53">StableDebtToken.getUserStableRate</a></td>
-              
-              <td class="coverFnHi">4023</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L132">StableDebtToken.increaseAllowance</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L63">StableDebtToken.mint</a></td>
-              
-              <td class="coverFnHi">7</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L98">StableDebtToken.principalBalanceOf</a></td>
-              
-              <td class="coverFnHi">4024</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L88">StableDebtToken.totalSupply</a></td>
-              
-              <td class="coverFnHi">17</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L116">StableDebtToken.transfer</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="StableDebtToken.sol.gcov.html#L128">StableDebtToken.transferFrom</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.gcov.html b/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.gcov.html
deleted file mode 100644
index b19a9048..00000000
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol.gcov.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/StableDebtToken.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - StableDebtToken.sol<span style="font-size: 80%;"> (source / <a href="StableDebtToken.sol.func-c.html">functions</a>)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">63.2&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">12</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
-            <td class="headerCovTableEntry">19</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <table cellpadding=0 cellspacing=0 border=0>
-            <tr>
-              <td><br></td>
-            </tr>
-            <tr>
-              <td>
-<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
-<pre class="source">
-<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
-<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
-<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IAaveIncentivesController} from '../../interfaces/IAaveIncentivesController.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IInitializableDebtToken} from '../../interfaces/IInitializableDebtToken.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IStableDebtToken} from '../../interfaces/IStableDebtToken.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {IPool} from '../../interfaces/IPool.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {EIP712Base} from './base/EIP712Base.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {DebtTokenBase} from './base/DebtTokenBase.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {IncentivizedERC20} from './base/IncentivizedERC20.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : </span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :  * @title StableDebtToken</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :  * @author Aave</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :  * @notice Implements a stable debt token to track the borrowing positions of users</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :  * at stable rate mode</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :  * @dev Transfer and approve functionalities are disabled since its a non-transferable token</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :  */</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             : abstract contract StableDebtToken is DebtTokenBase, IncentivizedERC20, IStableDebtToken {</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :   /**</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :    * @dev Constructor.</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :    * @param pool The address of the Pool contract</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :    */</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :   constructor(</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :     IPool pool</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   ) DebtTokenBase() IncentivizedERC20(pool, 'STABLE_DEBT_TOKEN_IMPL', 'STABLE_DEBT_TOKEN_IMPL', 0) {</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     // Intentionally left blank</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   }</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             : </span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   /// @inheritdoc IInitializableDebtToken</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :   function initialize(</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     IPool initializingPool,</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :     address underlyingAsset,</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     IAaveIncentivesController incentivesController,</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     uint8 debtTokenDecimals,</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :     string memory debtTokenName,</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :     string memory debtTokenSymbol,</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     bytes calldata params</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :   ) external virtual;</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             : </span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC tlaBgGNC">           8 :   function getAverageStableRate() external pure virtual override returns (uint256) {</span></span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   }</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC tlaBgGNC">        4023 :   function getUserLastUpdated(address) external pure virtual override returns (uint40) {</span></span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :   }</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             : </span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC tlaBgGNC">        4023 :   function getUserStableRate(address) external pure virtual override returns (uint256) {</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             : </span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC tlaBgGNC">       34689 :   function balanceOf(address) public pure virtual override returns (uint256) {</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :   }</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             : </span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC tlaBgGNC">           7 :   function mint(</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :     address,</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :     address,</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :     uint256,</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :     uint256</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :   ) external virtual override onlyPool returns (bool, uint256, uint256) {</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          14 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             : </span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           3 :   function burn(address, uint256) external virtual override onlyPool returns (uint256, uint256) {</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           6 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">       51684 :   function getSupplyData() external pure override returns (uint256, uint256, uint256, uint40) {</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">      103368 :     return (0, 0, 0, 0);</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :   }</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">           1 :   function getTotalSupplyAndAvgRate() external pure override returns (uint256, uint256) {</span></span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">           2 :     return (0, 0);</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             : </span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">          17 :   function totalSupply() public pure virtual override returns (uint256) {</span></span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :   }</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             : </span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC tlaBgGNC">           1 :   function getTotalSupplyLastUpdated() external pure override returns (uint40) {</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :   }</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             : </span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC tlaBgGNC">        4024 :   function principalBalanceOf(address) external pure virtual override returns (uint256) {</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return 0;</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :   /// @inheritdoc IStableDebtToken</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC tlaBgGNC">        1016 :   function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">        2032 :     return _underlyingAsset;</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :   }</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             : </span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   /// @inheritdoc EIP712Base</span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">        3474 :   function _EIP712BaseId() internal view override returns (string memory) {</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       10422 :     return name();</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :   }</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             : </span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :   /**</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :    * @dev Being non transferrable, the debt token does not implement any of the</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :    * standard ERC20 functions for transfer and allowance.</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :    */</span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           1 :   function transfer(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :   }</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             : </span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">           1 :   function allowance(address, address) external view virtual override returns (uint256) {</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :   }</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             : </span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           1 :   function approve(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :   }</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           1 :   function transferFrom(address, address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           1 :   function increaseAllowance(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :   }</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             : </span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">           1 :   function decreaseAllowance(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   }</span>
-<span id="L141"><span class="lineNum">     141</span>                 :             : }</span>
-        </pre>
-              </td>
-            </tr>
-          </table>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.gcov.html b/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.gcov.html
deleted file mode 100644
index f4dc8848..00000000
--- a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.gcov.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/StableDebtTokenInstance.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - StableDebtTokenInstance.sol<span style="font-size: 80%;"> (source / <a href="StableDebtTokenInstance.sol.func-c.html">functions</a>)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <table cellpadding=0 cellspacing=0 border=0>
-            <tr>
-              <td><br></td>
-            </tr>
-            <tr>
-              <td>
-<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
-<pre class="source">
-<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
-<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
-<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {StableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../contracts/protocol/tokenization/StableDebtToken.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : </span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : contract StableDebtTokenInstance is StableDebtToken {</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             :   uint256 public constant DEBT_TOKEN_REVISION = 1;</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : </span>
-<span id="L9"><span class="lineNum">       9</span>                 :             :   constructor(IPool pool) StableDebtToken(pool) {}</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : </span>
-<span id="L11"><span class="lineNum">      11</span>                 :             :   /// @inheritdoc VersionedInitializable</span>
-<span id="L12"><span class="lineNum">      12</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function getRevision() internal pure virtual override returns (uint256) {</span></span>
-<span id="L13"><span class="lineNum">      13</span>                 :<span class="tlaUNC">           0 :     return DEBT_TOKEN_REVISION;</span></span>
-<span id="L14"><span class="lineNum">      14</span>                 :             :   }</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : </span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :   /// @inheritdoc IInitializableDebtToken</span>
-<span id="L17"><span class="lineNum">      17</span>                 :<span class="tlaGNC tlaBgGNC">        3476 :   function initialize(</span></span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :     IPool initializingPool,</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :     address underlyingAsset,</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :     IAaveIncentivesController incentivesController,</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :     uint8 debtTokenDecimals,</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :     string memory debtTokenName,</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :     string memory debtTokenSymbol,</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :     bytes calldata params</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :   ) external override initializer {</span>
-<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC">        6950 :     require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);</span></span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        6948 :     _setName(debtTokenName);</span></span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        6948 :     _setSymbol(debtTokenSymbol);</span></span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">        6948 :     _setDecimals(debtTokenDecimals);</span></span>
-<span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        6948 :     _underlyingAsset = underlyingAsset;</span></span>
-<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">        6948 :     _incentivesController = incentivesController;</span></span>
-<span id="L33"><span class="lineNum">      33</span>                 :             : </span>
-<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">        6948 :     _domainSeparator = _calculateDomainSeparator();</span></span>
-<span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">        6948 :     emit Initialized(</span></span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :       underlyingAsset,</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :       address(POOL),</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :       address(incentivesController),</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :       debtTokenDecimals,</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :       debtTokenName,</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :       debtTokenSymbol,</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :       params</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     );</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :   }</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             : }</span>
-        </pre>
-              </td>
-            </tr>
-          </table>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/coverage.svg b/report/coverage.svg
deleted file mode 100644
index 238f1ed5..00000000
--- a/report/coverage.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="108" height="20" role="img" aria-label="coverage: 98.3%"><title>coverage: 98.3%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="108" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="47" height="20" fill="#4c1"/><rect width="108" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="835" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">98.3%</text><text x="835" y="140" transform="scale(.1)" fill="#fff" textLength="370">98.3%</text></g></svg>
\ No newline at end of file
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func-c.html b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func-c.html
similarity index 65%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func-c.html
rename to report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func-c.html
index e6bcdf57..4984f5b9 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (<a href="AaveParaSwapFeeClaimer.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (<a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AaveParaSwapFeeClaimer.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AaveParaSwapFeeClaimer.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveParaSwapFeeClaimer.sol.gcov.html#L16">AaveParaSwapFeeClaimer.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -103,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func.html b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func.html
similarity index 64%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func.html
rename to report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func.html
index 57faaedc..3e9f0163 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.func.html
+++ b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (<a href="AaveParaSwapFeeClaimer.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (<a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AaveParaSwapFeeClaimer.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveParaSwapFeeClaimer.sol.gcov.html#L16">AaveParaSwapFeeClaimer.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AaveParaSwapFeeClaimer.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -103,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.gcov.html b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.gcov.html
similarity index 76%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.gcov.html
rename to report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.gcov.html
index ff9ddb78..ff368042 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (source / <a href="AaveParaSwapFeeClaimer.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - AaveParaSwapFeeClaimer.sol<span style="font-size: 80%;"> (source / <a href="AaveParaSwapFeeClaimer.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -74,7 +74,7 @@
 <span id="L3"><span class="lineNum">       3</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L4"><span class="lineNum">       4</span>                 :             : </span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {IFeeClaimer} from './interfaces/IFeeClaimer.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : </span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             :  * @title AaveParaSwapFeeClaimer</span>
@@ -87,26 +87,26 @@
 <span id="L16"><span class="lineNum">      16</span>                 :             :   IFeeClaimer public immutable paraswapFeeClaimer;</span>
 <span id="L17"><span class="lineNum">      17</span>                 :             : </span>
 <span id="L18"><span class="lineNum">      18</span>                 :             :   constructor(address _aaveCollector, IFeeClaimer _paraswapFeeClaimer) {</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :     require(address(_paraswapFeeClaimer) != address(0), 'PARASWAP_FEE_CLAIMER_REQUIRED');</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :     require(_aaveCollector != address(0), 'COLLECTOR_REQUIRED');</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :     aaveCollector = _aaveCollector;</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :     paraswapFeeClaimer = _paraswapFeeClaimer;</span>
+<span id="L19"><span class="lineNum">      19</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     require(address(_paraswapFeeClaimer) != address(0), 'PARASWAP_FEE_CLAIMER_REQUIRED');</span></span>
+<span id="L20"><span class="lineNum">      20</span>                 :<span class="tlaUNC">           0 :     require(_aaveCollector != address(0), 'COLLECTOR_REQUIRED');</span></span>
+<span id="L21"><span class="lineNum">      21</span>                 :<span class="tlaUNC">           0 :     aaveCollector = _aaveCollector;</span></span>
+<span id="L22"><span class="lineNum">      22</span>                 :<span class="tlaUNC">           0 :     paraswapFeeClaimer = _paraswapFeeClaimer;</span></span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :   }</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             : </span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   /**</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :    * @dev returns claimable balance for a specified asset</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :    * @param asset The asset to fetch claimable balance of</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :    */</span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC tlaBgGNC">           5 :   function getClaimable(address asset) public view returns (uint256) {</span></span>
-<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC">          15 :     return paraswapFeeClaimer.getBalance(IERC20(asset), address(this));</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   function getClaimable(address asset) external view returns (uint256) {</span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC tlaBgGNC">           5 :     return paraswapFeeClaimer.getBalance(IERC20(asset), address(this));</span></span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :   }</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             : </span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :   /**</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :    * @dev returns claimable balances for specified assets</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :    * @param assets The assets to fetch claimable balances of</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :    */</span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">           1 :   function batchGetClaimable(address[] memory assets) public view returns (uint256[] memory) {</span></span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">           3 :     return paraswapFeeClaimer.batchGetBalance(assets, address(this));</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   function batchGetClaimable(address[] memory assets) external view returns (uint256[] memory) {</span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">           1 :     return paraswapFeeClaimer.batchGetBalance(assets, address(this));</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /**</span>
@@ -114,8 +114,8 @@
 <span id="L43"><span class="lineNum">      43</span>                 :             :    * @notice will revert when there's nothing to claim</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :    * @param asset The asset to claim rewards of</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :    */</span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           1 :   function claimToCollector(IERC20 asset) external {</span></span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           2 :     paraswapFeeClaimer.withdrawAllERC20(asset, aaveCollector);</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   function claimToCollector(IERC20 asset) external {</span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           1 :     paraswapFeeClaimer.withdrawAllERC20(asset, aaveCollector);</span></span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :   }</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             : </span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :   /**</span>
@@ -123,8 +123,8 @@
 <span id="L52"><span class="lineNum">      52</span>                 :             :    * @notice will revert when there's nothing to claim on a single supplied asset</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :    * @param assets The assets to claim rewards of</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :    */</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           1 :   function batchClaimToCollector(address[] memory assets) external {</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           2 :     paraswapFeeClaimer.batchWithdrawAllERC20(assets, aaveCollector);</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   function batchClaimToCollector(address[] memory assets) external {</span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           1 :     paraswapFeeClaimer.batchWithdrawAllERC20(assets, aaveCollector);</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             : }</span>
         </pre>
@@ -134,8 +134,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func-c.html b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func-c.html
similarity index 66%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func-c.html
rename to report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func-c.html
index dcbd91b9..84c9b528 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntryHi">92.3&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseParaSwapAdapter.sol.gcov.html#L50">BaseParaSwapAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func.html b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func.html
similarity index 66%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func.html
rename to report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func.html
index c3716a1f..f53ebc8b 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.func.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntryHi">92.3&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseParaSwapAdapter.sol.gcov.html#L50">BaseParaSwapAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.gcov.html
similarity index 81%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.gcov.html
index a3f06783..50495699 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntryHi">92.3&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,16 +72,16 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {FlashLoanSimpleReceiverBase} from 'aave-v3-core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {IPriceOracleGetter} from 'aave-v3-core/contracts/interfaces/IPriceOracleGetter.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {FlashLoanSimpleReceiverBase} from '../../misc/flashloan/base/FlashLoanSimpleReceiverBase.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {IPriceOracleGetter} from '../../interfaces/IPriceOracleGetter.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';</span>
 <span id="L14"><span class="lineNum">      14</span>                 :             : </span>
 <span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :  * @title BaseParaSwapAdapter</span>
@@ -123,7 +123,7 @@
 <span id="L52"><span class="lineNum">      52</span>                 :             :   constructor(</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     IPoolAddressesProvider addressesProvider</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) FlashLoanSimpleReceiverBase(addressesProvider) {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :     ORACLE = IPriceOracleGetter(addressesProvider.getPriceOracle());</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     ORACLE = IPriceOracleGetter(addressesProvider.getPriceOracle());</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   }</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :   /**</span>
@@ -131,41 +131,41 @@
 <span id="L60"><span class="lineNum">      60</span>                 :             :    * @param asset address</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :    * @return eth price for the asset</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :    */</span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC tlaBgGNC">          30 :   function _getPrice(address asset) internal view returns (uint256) {</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">          90 :     return ORACLE.getAssetPrice(asset);</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   function _getPrice(address asset) internal view returns (uint256) {</span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC tlaBgGNC">          30 :     return ORACLE.getAssetPrice(asset);</span></span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             : </span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   /**</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :    * @dev Get the decimals of an asset</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :    * @return number of decimals of the asset</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :    */</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          30 :   function _getDecimals(IERC20Detailed asset) internal view returns (uint8) {</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          90 :     uint8 decimals = asset.decimals();</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   function _getDecimals(IERC20Detailed asset) internal view returns (uint8) {</span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          30 :     uint8 decimals = asset.decimals();</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     // Ensure 10**decimals won't overflow a uint256</span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          60 :     require(decimals &lt;= 77, 'TOO_MANY_DECIMALS_ON_TOKEN');</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          60 :     return decimals;</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          30 :     require(decimals &lt;= 77, 'TOO_MANY_DECIMALS_ON_TOKEN');</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          30 :     return decimals;</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   }</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :   /**</span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :    * @dev Get the aToken associated to the asset</span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :    * @return address of the aToken</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :    */</span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          21 :   function _getReserveData(</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   function _getReserveData(</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :     address asset</span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   ) internal view returns (DataTypes.ReserveDataLegacy memory) {</span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">          63 :     return POOL.getReserveData(asset);</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">          21 :     return POOL.getReserveData(asset);</span></span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :   }</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             : </span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          20 :   function _pullATokenAndWithdraw(</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   function _pullATokenAndWithdraw(</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :     address reserve,</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :     address user,</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :     uint256 amount,</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :     PermitSignature memory permitSignature</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :   ) internal {</span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">          18 :     IERC20WithPermit reserveAToken = IERC20WithPermit(</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           6 :     IERC20WithPermit reserveAToken = IERC20WithPermit(</span></span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :       _getReserveData(address(reserve)).aTokenAddress</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :     );</span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">          12 :     _pullATokenAndWithdraw(reserve, reserveAToken, user, amount, permitSignature);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           6 :     _pullATokenAndWithdraw(reserve, reserveAToken, user, amount, permitSignature);</span></span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : </span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :   /**</span>
@@ -184,8 +184,8 @@
 <span id="L113"><span class="lineNum">     113</span>                 :             :     PermitSignature memory permitSignature</span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :   ) internal {</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :     // If deadline is set to zero, assume there is no signature for permit</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">          28 :     if (permitSignature.deadline != 0) {</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">          10 :       reserveAToken.permit(</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">          14 :     if (permitSignature.deadline != 0) {</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           5 :       reserveAToken.permit(</span></span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :         user,</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :         address(this),</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :         permitSignature.amount,</span>
@@ -197,10 +197,10 @@
 <span id="L126"><span class="lineNum">     126</span>                 :             :     }</span>
 <span id="L127"><span class="lineNum">     127</span>                 :             : </span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     // transfer from user to adapter</span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">          28 :     reserveAToken.safeTransferFrom(user, address(this), amount);</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">          14 :     reserveAToken.safeTransferFrom(user, address(this), amount);</span></span>
 <span id="L130"><span class="lineNum">     130</span>                 :             : </span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :     // withdraw reserve</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">          28 :     require(POOL.withdraw(reserve, amount, address(this)) == amount, 'UNEXPECTED_AMOUNT_WITHDRAWN');</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">          14 :     require(POOL.withdraw(reserve, amount, address(this)) == amount, 'UNEXPECTED_AMOUNT_WITHDRAWN');</span></span>
 <span id="L133"><span class="lineNum">     133</span>                 :             :   }</span>
 <span id="L134"><span class="lineNum">     134</span>                 :             : </span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :   /**</span>
@@ -208,8 +208,8 @@
 <span id="L137"><span class="lineNum">     137</span>                 :             :    * - Funds should never remain in this contract more time than during transactions</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             :    * - Only callable by the owner</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             :    */</span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           1 :   function rescueTokens(IERC20 token) external onlyOwner {</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           2 :     token.safeTransfer(owner(), token.balanceOf(address(this)));</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :   function rescueTokens(IERC20 token) external onlyOwner {</span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           1 :     token.safeTransfer(owner(), token.balanceOf(address(this)));</span></span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :   }</span>
 <span id="L143"><span class="lineNum">     143</span>                 :             : }</span>
         </pre>
@@ -219,8 +219,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func-c.html b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func-c.html
similarity index 59%
rename from report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func-c.html
rename to report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func-c.html
index 34e84f9b..af5a5341 100644
--- a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/VariableDebtTokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="VariableDebtTokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryMed">82.8&nbsp;%</td>
+            <td class="headerCovTableEntry">29</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VariableDebtTokenInstance.sol.func.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapBuyAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L10">VariableDebtTokenInstance.getRevision</a></td>
+              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L22">BaseParaSwapBuyAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L15">VariableDebtTokenInstance.initialize</a></td>
+              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L42">BaseParaSwapBuyAdapter._buyOnParaSwap</a></td>
               
-              <td class="coverFnHi">3478</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func.html b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func.html
similarity index 59%
rename from report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func.html
rename to report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func.html
index b9085eeb..310f2da3 100644
--- a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/StableDebtTokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - StableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="StableDebtTokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryMed">82.8&nbsp;%</td>
+            <td class="headerCovTableEntry">29</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StableDebtTokenInstance.sol.func-c.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapBuyAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="StableDebtTokenInstance.sol.gcov.html#L10">StableDebtTokenInstance.getRevision</a></td>
+              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L22">BaseParaSwapBuyAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="StableDebtTokenInstance.sol.gcov.html#L15">StableDebtTokenInstance.initialize</a></td>
+              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L42">BaseParaSwapBuyAdapter._buyOnParaSwap</a></td>
               
-              <td class="coverFnHi">3476</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.gcov.html
similarity index 75%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.gcov.html
index 221a762a..5500645a 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapBuyAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapBuyAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntryMed">82.8&nbsp;%</td>
+            <td class="headerCovTableEntry">29</td>
             <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
             <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,11 +72,11 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';</span>
@@ -97,8 +97,8 @@
 <span id="L26"><span class="lineNum">      26</span>                 :             :     IParaSwapAugustusRegistry augustusRegistry</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   ) BaseParaSwapAdapter(addressesProvider) {</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :     // Do something on Augustus registry to check the right contract was passed</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :     require(!augustusRegistry.isValidAugustus(address(0)), 'Not a valid Augustus address');</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     AUGUSTUS_REGISTRY = augustusRegistry;</span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     require(!augustusRegistry.isValidAugustus(address(0)), 'Not a valid Augustus address');</span></span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaUNC">           0 :     AUGUSTUS_REGISTRY = augustusRegistry;</span></span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :   }</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             : </span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :   /**</span>
@@ -110,49 +110,49 @@
 <span id="L39"><span class="lineNum">      39</span>                 :             :    * @param maxAmountToSwap Max amount to be swapped</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :    * @param amountToReceive Amount to be received from the swap</span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :    * @return amountSold The amount sold during the swap</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :    */</span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC tlaBgGNC">           6 :   function _buyOnParaSwap(</span></span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     uint256 toAmountOffset,</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     bytes memory paraswapData,</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :     IERC20Detailed assetToSwapFrom,</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :     IERC20Detailed assetToSwapTo,</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :     uint256 maxAmountToSwap,</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     uint256 amountToReceive</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :   ) internal returns (uint256 amountSold) {</span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">          18 :     (bytes memory buyCalldata, IParaSwapAugustus augustus) = abi.decode(</span></span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :       paraswapData,</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :       (bytes, IParaSwapAugustus)</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :     );</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">          12 :     require(AUGUSTUS_REGISTRY.isValidAugustus(address(augustus)), 'INVALID_AUGUSTUS');</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :             : </span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :     {</span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">          18 :       uint256 fromAssetDecimals = _getDecimals(assetToSwapFrom);</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">          18 :       uint256 toAssetDecimals = _getDecimals(assetToSwapTo);</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :             : </span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">          18 :       uint256 fromAssetPrice = _getPrice(address(assetToSwapFrom));</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">          18 :       uint256 toAssetPrice = _getPrice(address(assetToSwapTo));</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :             : </span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">          18 :       uint256 expectedMaxAmountToSwap = amountToReceive</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :         .mul(toAssetPrice.mul(10 ** fromAssetDecimals))</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :         .div(fromAssetPrice.mul(10 ** toAssetDecimals))</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :         .percentMul(PercentageMath.PERCENTAGE_FACTOR.add(MAX_SLIPPAGE_PERCENT));</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             : </span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">          12 :       require(maxAmountToSwap &lt;= expectedMaxAmountToSwap, 'maxAmountToSwap exceed max slippage');</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :     }</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             : </span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          18 :     uint256 balanceBeforeAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          12 :     require(balanceBeforeAssetFrom &gt;= maxAmountToSwap, 'INSUFFICIENT_BALANCE_BEFORE_SWAP');</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          18 :     uint256 balanceBeforeAssetTo = assetToSwapTo.balanceOf(address(this));</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :             : </span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">          18 :     address tokenTransferProxy = augustus.getTokenTransferProxy();</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">          12 :     assetToSwapFrom.safeApprove(tokenTransferProxy, 0);</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">          12 :     assetToSwapFrom.safeApprove(tokenTransferProxy, maxAmountToSwap);</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :    * @return amountBought The amount bought during the swap</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :    */</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   function _buyOnParaSwap(</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :     uint256 toAmountOffset,</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :     bytes memory paraswapData,</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :     IERC20Detailed assetToSwapFrom,</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :     IERC20Detailed assetToSwapTo,</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :     uint256 maxAmountToSwap,</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :     uint256 amountToReceive</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :   ) internal returns (uint256 amountSold, uint256 amountBought) {</span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC tlaBgGNC">           6 :     (bytes memory buyCalldata, IParaSwapAugustus augustus) = abi.decode(</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :       paraswapData,</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :       (bytes, IParaSwapAugustus)</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :     );</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             : </span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           6 :     require(AUGUSTUS_REGISTRY.isValidAugustus(address(augustus)), 'INVALID_AUGUSTUS');</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :             : </span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :     {</span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           6 :       uint256 fromAssetDecimals = _getDecimals(assetToSwapFrom);</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           6 :       uint256 toAssetDecimals = _getDecimals(assetToSwapTo);</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :             : </span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           6 :       uint256 fromAssetPrice = _getPrice(address(assetToSwapFrom));</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           6 :       uint256 toAssetPrice = _getPrice(address(assetToSwapTo));</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             : </span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           6 :       uint256 expectedMaxAmountToSwap = amountToReceive</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :         .mul(toAssetPrice.mul(10 ** fromAssetDecimals))</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :         .div(fromAssetPrice.mul(10 ** toAssetDecimals))</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :         .percentMul(PercentageMath.PERCENTAGE_FACTOR.add(MAX_SLIPPAGE_PERCENT));</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             : </span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           6 :       require(maxAmountToSwap &lt;= expectedMaxAmountToSwap, 'maxAmountToSwap exceed max slippage');</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :     }</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             : </span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           6 :     uint256 balanceBeforeAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           6 :     require(balanceBeforeAssetFrom &gt;= maxAmountToSwap, 'INSUFFICIENT_BALANCE_BEFORE_SWAP');</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           6 :     uint256 balanceBeforeAssetTo = assetToSwapTo.balanceOf(address(this));</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             : </span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           6 :     address tokenTransferProxy = augustus.getTokenTransferProxy();</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           6 :     assetToSwapFrom.safeApprove(tokenTransferProxy, maxAmountToSwap);</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             : </span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">          12 :     if (toAmountOffset != 0) {</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">           6 :     if (toAmountOffset != 0) {</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :       // Ensure 256 bit (32 bytes) toAmountOffset value is within bounds of the</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :       // calldata, not overlapping with the first 4 bytes (function selector).</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           2 :       require(</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           1 :       require(</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :         toAmountOffset &gt;= 4 &amp;&amp; toAmountOffset &lt;= buyCalldata.length.sub(32),</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :         'TO_AMOUNT_OFFSET_OUT_OF_RANGE'</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :       );</span>
@@ -160,27 +160,30 @@
 <span id="L89"><span class="lineNum">      89</span>                 :             :       // In memory, buyCalldata consists of a 256 bit length field, followed by</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :       // the actual bytes data, that is why 32 is added to the byte offset.</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :       assembly {</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :         mstore(add(buyCalldata, add(toAmountOffset, 32)), amountToReceive)</span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         mstore(add(buyCalldata, add(toAmountOffset, 32)), amountToReceive)</span></span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :       }</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :     }</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">          15 :     (bool success, ) = address(augustus).call(buyCalldata);</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">          10 :     if (!success) {</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC tlaBgGNC">           5 :     (bool success, ) = address(augustus).call(buyCalldata);</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           5 :     if (!success) {</span></span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :       // Copy revert reason from call</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :       assembly {</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :         returndatacopy(0, 0, returndatasize())</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :         revert(0, returndatasize())</span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         returndatacopy(0, 0, returndatasize())</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaUNC">           0 :         revert(0, returndatasize())</span></span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :       }</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :     }</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">          15 :     uint256 balanceAfterAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">          10 :     amountSold = balanceBeforeAssetFrom - balanceAfterAssetFrom;</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          10 :     require(amountSold &lt;= maxAmountToSwap, 'WRONG_BALANCE_AFTER_SWAP');</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">          15 :     uint256 amountReceived = assetToSwapTo.balanceOf(address(this)).sub(balanceBeforeAssetTo);</span></span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">          10 :     require(amountReceived &gt;= amountToReceive, 'INSUFFICIENT_AMOUNT_RECEIVED');</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :             : </span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">          10 :     emit Bought(address(assetToSwapFrom), address(assetToSwapTo), amountSold, amountReceived);</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :   }</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             : }</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :     // Reset allowance</span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC tlaBgGNC">           5 :     assetToSwapFrom.safeApprove(tokenTransferProxy, 0);</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             : </span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           5 :     uint256 balanceAfterAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           5 :     amountSold = balanceBeforeAssetFrom - balanceAfterAssetFrom;</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           5 :     require(amountSold &lt;= maxAmountToSwap, 'WRONG_BALANCE_AFTER_SWAP');</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           5 :     amountBought = assetToSwapTo.balanceOf(address(this)).sub(balanceBeforeAssetTo);</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           5 :     require(amountBought &gt;= amountToReceive, 'INSUFFICIENT_AMOUNT_RECEIVED');</span></span>
+<span id="L112"><span class="lineNum">     112</span>                 :             : </span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           5 :     emit Bought(address(assetToSwapFrom), address(assetToSwapTo), amountSold, amountBought);</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :   }</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -188,8 +191,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func-c.html b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func-c.html
similarity index 59%
rename from report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func-c.html
rename to report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func-c.html
index 405abeaf..c8215b33 100644
--- a/report/core/instances/src/core/instances/StableDebtTokenInstance.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/StableDebtTokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - StableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="StableDebtTokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryMed">80.8&nbsp;%</td>
+            <td class="headerCovTableEntry">26</td>
+            <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StableDebtTokenInstance.sol.func.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapSellAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="StableDebtTokenInstance.sol.gcov.html#L10">StableDebtTokenInstance.getRevision</a></td>
+              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L23">BaseParaSwapSellAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="StableDebtTokenInstance.sol.gcov.html#L15">StableDebtTokenInstance.initialize</a></td>
+              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L43">BaseParaSwapSellAdapter._sellOnParaSwap</a></td>
               
-              <td class="coverFnHi">3476</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func.html b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func.html
similarity index 59%
rename from report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func.html
rename to report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func.html
index 2b0b5821..0c5f7eb6 100644
--- a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.func.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/VariableDebtTokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="VariableDebtTokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryMed">80.8&nbsp;%</td>
+            <td class="headerCovTableEntry">26</td>
+            <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VariableDebtTokenInstance.sol.func-c.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapSellAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L10">VariableDebtTokenInstance.getRevision</a></td>
+              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L23">BaseParaSwapSellAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L15">VariableDebtTokenInstance.initialize</a></td>
+              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L43">BaseParaSwapSellAdapter._sellOnParaSwap</a></td>
               
-              <td class="coverFnHi">3478</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.gcov.html
similarity index 79%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.gcov.html
index 485592d0..98a66965 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapSellAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (source / <a href="BaseParaSwapSellAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntryMed">80.8&nbsp;%</td>
+            <td class="headerCovTableEntry">26</td>
             <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
             <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,11 +72,11 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';</span>
@@ -98,8 +98,8 @@
 <span id="L27"><span class="lineNum">      27</span>                 :             :     IParaSwapAugustusRegistry augustusRegistry</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :   ) BaseParaSwapAdapter(addressesProvider) {</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :     // Do something on Augustus registry to check the right contract was passed</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     require(!augustusRegistry.isValidAugustus(address(0)));</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     AUGUSTUS_REGISTRY = augustusRegistry;</span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     require(!augustusRegistry.isValidAugustus(address(0)));</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaUNC">           0 :     AUGUSTUS_REGISTRY = augustusRegistry;</span></span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :   }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   /**</span>
@@ -113,7 +113,7 @@
 <span id="L42"><span class="lineNum">      42</span>                 :             :    * @param minAmountToReceive Minimum amount to be received from the swap</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :    * @return amountReceived The amount received from the swap</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :    */</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC tlaBgGNC">           9 :   function _sellOnParaSwap(</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function _sellOnParaSwap(</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :     uint256 fromAmountOffset,</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :     bytes memory swapCalldata,</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :     IParaSwapAugustus augustus,</span>
@@ -122,35 +122,35 @@
 <span id="L51"><span class="lineNum">      51</span>                 :             :     uint256 amountToSwap,</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :     uint256 minAmountToReceive</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :   ) internal returns (uint256 amountReceived) {</span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">          18 :     require(AUGUSTUS_REGISTRY.isValidAugustus(address(augustus)), 'INVALID_AUGUSTUS');</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC tlaBgGNC">           9 :     require(AUGUSTUS_REGISTRY.isValidAugustus(address(augustus)), 'INVALID_AUGUSTUS');</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :     {</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">          27 :       uint256 fromAssetDecimals = _getDecimals(assetToSwapFrom);</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">          27 :       uint256 toAssetDecimals = _getDecimals(assetToSwapTo);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           9 :       uint256 fromAssetDecimals = _getDecimals(assetToSwapFrom);</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           9 :       uint256 toAssetDecimals = _getDecimals(assetToSwapTo);</span></span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">          27 :       uint256 fromAssetPrice = _getPrice(address(assetToSwapFrom));</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">          27 :       uint256 toAssetPrice = _getPrice(address(assetToSwapTo));</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           9 :       uint256 fromAssetPrice = _getPrice(address(assetToSwapFrom));</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           9 :       uint256 toAssetPrice = _getPrice(address(assetToSwapTo));</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">          27 :       uint256 expectedMinAmountOut = amountToSwap</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           9 :       uint256 expectedMinAmountOut = amountToSwap</span></span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :         .mul(fromAssetPrice.mul(10 ** toAssetDecimals))</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :         .div(toAssetPrice.mul(10 ** fromAssetDecimals))</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :         .percentMul(PercentageMath.PERCENTAGE_FACTOR - MAX_SLIPPAGE_PERCENT);</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             : </span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">          18 :       require(expectedMinAmountOut &lt;= minAmountToReceive, 'MIN_AMOUNT_EXCEEDS_MAX_SLIPPAGE');</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           9 :       require(expectedMinAmountOut &lt;= minAmountToReceive, 'MIN_AMOUNT_EXCEEDS_MAX_SLIPPAGE');</span></span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     }</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          27 :     uint256 balanceBeforeAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          18 :     require(balanceBeforeAssetFrom &gt;= amountToSwap, 'INSUFFICIENT_BALANCE_BEFORE_SWAP');</span></span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          27 :     uint256 balanceBeforeAssetTo = assetToSwapTo.balanceOf(address(this));</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           9 :     uint256 balanceBeforeAssetFrom = assetToSwapFrom.balanceOf(address(this));</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           9 :     require(balanceBeforeAssetFrom &gt;= amountToSwap, 'INSUFFICIENT_BALANCE_BEFORE_SWAP');</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           9 :     uint256 balanceBeforeAssetTo = assetToSwapTo.balanceOf(address(this));</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          27 :     address tokenTransferProxy = augustus.getTokenTransferProxy();</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">          18 :     assetToSwapFrom.safeApprove(tokenTransferProxy, 0);</span></span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">          18 :     assetToSwapFrom.safeApprove(tokenTransferProxy, amountToSwap);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           9 :     address tokenTransferProxy = augustus.getTokenTransferProxy();</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           9 :     assetToSwapFrom.safeApprove(tokenTransferProxy, 0);</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           9 :     assetToSwapFrom.safeApprove(tokenTransferProxy, amountToSwap);</span></span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">          18 :     if (fromAmountOffset != 0) {</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           9 :     if (fromAmountOffset != 0) {</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :       // Ensure 256 bit (32 bytes) fromAmount value is within bounds of the</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :       // calldata, not overlapping with the first 4 bytes (function selector).</span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">           6 :       require(</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">           3 :       require(</span></span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :         fromAmountOffset &gt;= 4 &amp;&amp; fromAmountOffset &lt;= swapCalldata.length.sub(32),</span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :         'FROM_AMOUNT_OFFSET_OUT_OF_RANGE'</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :       );</span>
@@ -158,27 +158,28 @@
 <span id="L87"><span class="lineNum">      87</span>                 :             :       // In memory, swapCalldata consists of a 256 bit length field, followed by</span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :       // the actual bytes data, that is why 32 is added to the byte offset.</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :       assembly {</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :         mstore(add(swapCalldata, add(fromAmountOffset, 32)), amountToSwap)</span>
+<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         mstore(add(swapCalldata, add(fromAmountOffset, 32)), amountToSwap)</span></span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :       }</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :     }</span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">          18 :     (bool success, ) = address(augustus).call(swapCalldata);</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">          12 :     if (!success) {</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC tlaBgGNC">           6 :     (bool success, ) = address(augustus).call(swapCalldata);</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           6 :     if (!success) {</span></span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :       // Copy revert reason from call</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :       assembly {</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :         returndatacopy(0, 0, returndatasize())</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :         revert(0, returndatasize())</span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         returndatacopy(0, 0, returndatasize())</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaUNC">           0 :         revert(0, returndatasize())</span></span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :       }</span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :     }</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">          12 :     require(</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :       assetToSwapFrom.balanceOf(address(this)) == balanceBeforeAssetFrom - amountToSwap,</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :       'WRONG_BALANCE_AFTER_SWAP'</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :     );</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">          12 :     amountReceived = assetToSwapTo.balanceOf(address(this)).sub(balanceBeforeAssetTo);</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          12 :     require(amountReceived &gt;= minAmountToReceive, 'INSUFFICIENT_AMOUNT_RECEIVED');</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             : </span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">          12 :     emit Swapped(address(assetToSwapFrom), address(assetToSwapTo), amountToSwap, amountReceived);</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   }</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             : }</span>
+<span id="L101"><span class="lineNum">     101</span>                 :             : </span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC tlaBgGNC">           6 :     require(</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :       assetToSwapFrom.balanceOf(address(this)) == balanceBeforeAssetFrom - amountToSwap,</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :       'WRONG_BALANCE_AFTER_SWAP'</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :     );</span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           6 :     amountReceived = assetToSwapTo.balanceOf(address(this)).sub(balanceBeforeAssetTo);</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           6 :     require(amountReceived &gt;= minAmountToReceive, 'INSUFFICIENT_AMOUNT_RECEIVED');</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :             : </span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           6 :     emit Swapped(address(assetToSwapFrom), address(assetToSwapTo), amountToSwap, amountReceived);</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -186,8 +187,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func-c.html b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func-c.html
similarity index 64%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func-c.html
rename to report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func-c.html
index 8a0f181f..399ff583 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
             <td class="headerCovTableEntry">34</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntryMed">75.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
             <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapLiquiditySwapAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapLiquiditySwapAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html#L21">ParaSwapLiquiditySwapAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -96,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func.html b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func.html
similarity index 64%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func.html
rename to report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func.html
index 1bcf5d38..e628152b 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.func.html
+++ b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
             <td class="headerCovTableEntry">34</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntryMed">75.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
             <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapLiquiditySwapAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html#L21">ParaSwapLiquiditySwapAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapLiquiditySwapAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -96,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.gcov.html
similarity index 86%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.gcov.html
index 63a5e17b..7f70f051 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapLiquiditySwapAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapLiquiditySwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapLiquiditySwapAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
             <td class="headerCovTableEntry">34</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntryMed">75.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
             <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,11 +72,11 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {BaseParaSwapSellAdapter} from './BaseParaSwapSellAdapter.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';</span>
@@ -96,7 +96,7 @@
 <span id="L25"><span class="lineNum">      25</span>                 :             :     IParaSwapAugustusRegistry augustusRegistry,</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :     address owner</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   ) BaseParaSwapSellAdapter(addressesProvider, augustusRegistry) {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :     transferOwnership(owner);</span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     transferOwnership(owner);</span></span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :   }</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             : </span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :   /**</span>
@@ -116,32 +116,32 @@
 <span id="L45"><span class="lineNum">      45</span>                 :             :    *   address augustus Address of ParaSwap's AugustusSwapper contract</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :    *   PermitSignature permitParams Struct containing the permit signatures, set to all zeroes if not used</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :    */</span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC tlaBgGNC">           3 :   function executeOperation(</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   function executeOperation(</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :     address asset,</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :     uint256 amount,</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :     uint256 premium,</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :     address initiator,</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     bytes calldata params</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) external override nonReentrant returns (bool) {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           6 :     require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC tlaBgGNC">           3 :     require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           6 :     uint256 flashLoanAmount = amount;</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           6 :     uint256 premiumLocal = premium;</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           6 :     address initiatorLocal = initiator;</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           9 :     IERC20Detailed assetToSwapFrom = IERC20Detailed(asset);</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           6 :     (</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           3 :     uint256 flashLoanAmount = amount;</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           3 :     uint256 premiumLocal = premium;</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           3 :     address initiatorLocal = initiator;</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           3 :     IERC20Detailed assetToSwapFrom = IERC20Detailed(asset);</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           3 :     (</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :       IERC20Detailed assetToSwapTo,</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :       uint256 minAmountToReceive,</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :       uint256 swapAllBalanceOffset,</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :       bytes memory swapCalldata,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :       IParaSwapAugustus augustus,</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :       PermitSignature memory permitParams</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           6 :     ) = abi.decode(</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           3 :     ) = abi.decode(</span></span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :         params,</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :         (IERC20Detailed, uint256, uint256, bytes, IParaSwapAugustus, PermitSignature)</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :       );</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             : </span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           6 :     _swapLiquidity(</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           3 :     _swapLiquidity(</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :       swapAllBalanceOffset,</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :       swapCalldata,</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :       augustus,</span>
@@ -154,7 +154,7 @@
 <span id="L83"><span class="lineNum">      83</span>                 :             :       minAmountToReceive</span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :     );</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : </span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">           4 :     return true;</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">           2 :     return true;</span></span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
 <span id="L88"><span class="lineNum">      88</span>                 :             : </span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   /**</span>
@@ -170,7 +170,7 @@
 <span id="L99"><span class="lineNum">      99</span>                 :             :    * @param augustus Address of ParaSwap's AugustusSwapper contract</span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :    * @param permitParams Struct containing the permit signatures, set to all zeroes if not used</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :    */</span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           3 :   function swapAndDeposit(</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :   function swapAndDeposit(</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :     IERC20Detailed assetToSwapFrom,</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :     IERC20Detailed assetToSwapTo,</span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :     uint256 amountToSwap,</span>
@@ -180,17 +180,17 @@
 <span id="L109"><span class="lineNum">     109</span>                 :             :     IParaSwapAugustus augustus,</span>
 <span id="L110"><span class="lineNum">     110</span>                 :             :     PermitSignature calldata permitParams</span>
 <span id="L111"><span class="lineNum">     111</span>                 :             :   ) external nonReentrant {</span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">           9 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">           3 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
 <span id="L113"><span class="lineNum">     113</span>                 :             :       _getReserveData(address(assetToSwapFrom)).aTokenAddress</span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :     );</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             : </span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">           6 :     if (swapAllBalanceOffset != 0) {</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           3 :       uint256 balance = aToken.balanceOf(msg.sender);</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           2 :       require(balance &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">           2 :       amountToSwap = balance;</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">           3 :     if (swapAllBalanceOffset != 0) {</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           1 :       uint256 balance = aToken.balanceOf(msg.sender);</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           1 :       require(balance &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">           1 :       amountToSwap = balance;</span></span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :     }</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             : </span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">           6 :     _pullATokenAndWithdraw(</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">           3 :     _pullATokenAndWithdraw(</span></span>
 <span id="L123"><span class="lineNum">     123</span>                 :             :       address(assetToSwapFrom),</span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :       aToken,</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             :       msg.sender,</span>
@@ -198,7 +198,7 @@
 <span id="L127"><span class="lineNum">     127</span>                 :             :       permitParams</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     );</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           9 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           3 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :       swapAllBalanceOffset,</span>
 <span id="L132"><span class="lineNum">     132</span>                 :             :       swapCalldata,</span>
 <span id="L133"><span class="lineNum">     133</span>                 :             :       augustus,</span>
@@ -208,9 +208,9 @@
 <span id="L137"><span class="lineNum">     137</span>                 :             :       minAmountToReceive</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             :     );</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             : </span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           4 :     assetToSwapTo.safeApprove(address(POOL), 0);</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           4 :     assetToSwapTo.safeApprove(address(POOL), amountReceived);</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">           4 :     POOL.deposit(address(assetToSwapTo), amountReceived, msg.sender, 0);</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           2 :     assetToSwapTo.safeApprove(address(POOL), 0);</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           2 :     assetToSwapTo.safeApprove(address(POOL), amountReceived);</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">           2 :     POOL.deposit(address(assetToSwapTo), amountReceived, msg.sender, 0);</span></span>
 <span id="L143"><span class="lineNum">     143</span>                 :             :   }</span>
 <span id="L144"><span class="lineNum">     144</span>                 :             : </span>
 <span id="L145"><span class="lineNum">     145</span>                 :             :   /**</span>
@@ -226,7 +226,7 @@
 <span id="L155"><span class="lineNum">     155</span>                 :             :    * @param assetToSwapTo Address of the underlying asset to be swapped to and deposited</span>
 <span id="L156"><span class="lineNum">     156</span>                 :             :    * @param minAmountToReceive Min amount to be received from the swap</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             :    */</span>
-<span id="L158"><span class="lineNum">     158</span>                 :<span class="tlaGNC">           3 :   function _swapLiquidity(</span></span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :   function _swapLiquidity(</span>
 <span id="L159"><span class="lineNum">     159</span>                 :             :     uint256 swapAllBalanceOffset,</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             :     bytes memory swapCalldata,</span>
 <span id="L161"><span class="lineNum">     161</span>                 :             :     IParaSwapAugustus augustus,</span>
@@ -238,21 +238,21 @@
 <span id="L167"><span class="lineNum">     167</span>                 :             :     IERC20Detailed assetToSwapTo,</span>
 <span id="L168"><span class="lineNum">     168</span>                 :             :     uint256 minAmountToReceive</span>
 <span id="L169"><span class="lineNum">     169</span>                 :             :   ) internal {</span>
-<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           9 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           3 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
 <span id="L171"><span class="lineNum">     171</span>                 :             :       _getReserveData(address(assetToSwapFrom)).aTokenAddress</span>
 <span id="L172"><span class="lineNum">     172</span>                 :             :     );</span>
-<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           6 :     uint256 amountToSwap = flashLoanAmount;</span></span>
+<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           3 :     uint256 amountToSwap = flashLoanAmount;</span></span>
 <span id="L174"><span class="lineNum">     174</span>                 :             : </span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           9 :     uint256 balance = aToken.balanceOf(initiator);</span></span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">           6 :     if (swapAllBalanceOffset != 0) {</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">           3 :       uint256 balanceToSwap = balance.sub(premium);</span></span>
-<span id="L178"><span class="lineNum">     178</span>                 :<span class="tlaGNC">           2 :       require(balanceToSwap &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           2 :       amountToSwap = balanceToSwap;</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           3 :     uint256 balance = aToken.balanceOf(initiator);</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">           3 :     if (swapAllBalanceOffset != 0) {</span></span>
+<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">           1 :       uint256 balanceToSwap = balance.sub(premium);</span></span>
+<span id="L178"><span class="lineNum">     178</span>                 :<span class="tlaGNC">           1 :       require(balanceToSwap &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           1 :       amountToSwap = balanceToSwap;</span></span>
 <span id="L180"><span class="lineNum">     180</span>                 :             :     } else {</span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           4 :       require(balance &gt;= amountToSwap.add(premium), 'INSUFFICIENT_ATOKEN_BALANCE');</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           2 :       require(balance &gt;= amountToSwap.add(premium), 'INSUFFICIENT_ATOKEN_BALANCE');</span></span>
 <span id="L182"><span class="lineNum">     182</span>                 :             :     }</span>
 <span id="L183"><span class="lineNum">     183</span>                 :             : </span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">           9 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">           3 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
 <span id="L185"><span class="lineNum">     185</span>                 :             :       swapAllBalanceOffset,</span>
 <span id="L186"><span class="lineNum">     186</span>                 :             :       swapCalldata,</span>
 <span id="L187"><span class="lineNum">     187</span>                 :             :       augustus,</span>
@@ -262,11 +262,11 @@
 <span id="L191"><span class="lineNum">     191</span>                 :             :       minAmountToReceive</span>
 <span id="L192"><span class="lineNum">     192</span>                 :             :     );</span>
 <span id="L193"><span class="lineNum">     193</span>                 :             : </span>
-<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">           4 :     assetToSwapTo.safeApprove(address(POOL), 0);</span></span>
-<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">           4 :     assetToSwapTo.safeApprove(address(POOL), amountReceived);</span></span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">           4 :     POOL.deposit(address(assetToSwapTo), amountReceived, initiator, 0);</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">           2 :     assetToSwapTo.safeApprove(address(POOL), 0);</span></span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">           2 :     assetToSwapTo.safeApprove(address(POOL), amountReceived);</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">           2 :     POOL.deposit(address(assetToSwapTo), amountReceived, initiator, 0);</span></span>
 <span id="L197"><span class="lineNum">     197</span>                 :             : </span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           4 :     _pullATokenAndWithdraw(</span></span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           2 :     _pullATokenAndWithdraw(</span></span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :       address(assetToSwapFrom),</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             :       aToken,</span>
 <span id="L201"><span class="lineNum">     201</span>                 :             :       initiator,</span>
@@ -275,8 +275,8 @@
 <span id="L204"><span class="lineNum">     204</span>                 :             :     );</span>
 <span id="L205"><span class="lineNum">     205</span>                 :             : </span>
 <span id="L206"><span class="lineNum">     206</span>                 :             :     // Repay flash loan</span>
-<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">           4 :     assetToSwapFrom.safeApprove(address(POOL), 0);</span></span>
-<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">           4 :     assetToSwapFrom.safeApprove(address(POOL), flashLoanAmount.add(premium));</span></span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">           2 :     assetToSwapFrom.safeApprove(address(POOL), 0);</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">           2 :     assetToSwapFrom.safeApprove(address(POOL), flashLoanAmount.add(premium));</span></span>
 <span id="L209"><span class="lineNum">     209</span>                 :             :   }</span>
 <span id="L210"><span class="lineNum">     210</span>                 :             : }</span>
         </pre>
@@ -286,8 +286,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func-c.html b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func-c.html
similarity index 61%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func-c.html
rename to report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func-c.html
index 09b21b97..542c078b 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapRepayAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapRepayAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntryHi">93.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">40</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,26 +53,33 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapRepayAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapRepayAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L31">ParaSwapRepayAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L147">ParaSwapRepayAdapter._swapAndRepay</a></td>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L155">ParaSwapRepayAdapter._swapAndRepay</a></td>
               
               <td class="coverFnHi">2</td>
               
@@ -93,7 +100,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L200">ParaSwapRepayAdapter.getDebtRepayAmount</a></td>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L216">ParaSwapRepayAdapter.getDebtRepayAmount</a></td>
               
               <td class="coverFnHi">6</td>
               
@@ -103,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func.html b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func.html
similarity index 61%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func.html
rename to report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func.html
index fc79c5bb..9a5fa9b0 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.func.html
+++ b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapRepayAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapRepayAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntryHi">93.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">40</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,26 +53,33 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapRepayAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L31">ParaSwapRepayAdapter.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapRepayAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L147">ParaSwapRepayAdapter._swapAndRepay</a></td>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L155">ParaSwapRepayAdapter._swapAndRepay</a></td>
               
               <td class="coverFnHi">2</td>
               
@@ -86,7 +93,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L200">ParaSwapRepayAdapter.getDebtRepayAmount</a></td>
+              <td class="coverFn"><a href="ParaSwapRepayAdapter.sol.gcov.html#L216">ParaSwapRepayAdapter.getDebtRepayAmount</a></td>
               
               <td class="coverFnHi">6</td>
               
@@ -103,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.gcov.html
similarity index 80%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.gcov.html
index fe75f161..10eff6f6 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapRepayAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapRepayAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapRepayAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapRepayAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntryHi">93.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">40</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,13 +72,13 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {BaseParaSwapBuyAdapter} from './BaseParaSwapBuyAdapter.sol';</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             : import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';</span>
 <span id="L13"><span class="lineNum">      13</span>                 :             : import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';</span>
@@ -106,7 +106,7 @@
 <span id="L35"><span class="lineNum">      35</span>                 :             :     IParaSwapAugustusRegistry augustusRegistry,</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :     address owner</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :   ) BaseParaSwapBuyAdapter(addressesProvider, augustusRegistry) {</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     transferOwnership(owner);</span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     transferOwnership(owner);</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /**</span>
@@ -131,23 +131,23 @@
 <span id="L60"><span class="lineNum">      60</span>                 :             :    *                    * IParaSwapAugustus augustus Address of Augustus Swapper</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :    *   PermitSignature permitParams Struct containing the permit signatures, set to all zeroes if not used</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :    */</span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC tlaBgGNC">           2 :   function executeOperation(</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   function executeOperation(</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     address asset,</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     uint256 amount,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     uint256 premium,</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :     address initiator,</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     bytes calldata params</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   ) external override nonReentrant returns (bool) {</span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">           4 :     require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     require(msg.sender == address(POOL), 'CALLER_MUST_BE_POOL');</span></span>
 <span id="L71"><span class="lineNum">      71</span>                 :             : </span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           4 :     uint256 collateralAmount = amount;</span></span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           4 :     address initiatorLocal = initiator;</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           2 :     uint256 collateralAmount = amount;</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           2 :     address initiatorLocal = initiator;</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           6 :     IERC20Detailed collateralAsset = IERC20Detailed(asset);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           2 :     IERC20Detailed collateralAsset = IERC20Detailed(asset);</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             : </span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           4 :     _swapAndRepay(params, premium, initiatorLocal, collateralAsset, collateralAmount);</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           2 :     _swapAndRepay(params, premium, initiatorLocal, collateralAsset, collateralAmount);</span></span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           4 :     return true;</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           2 :     return true;</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   /**</span>
@@ -164,7 +164,7 @@
 <span id="L93"><span class="lineNum">      93</span>                 :             :    * @param paraswapData Data for Paraswap Adapter</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :    * @param permitSignature struct containing the permit signature</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :    */</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           4 :   function swapAndRepay(</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   function swapAndRepay(</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :     IERC20Detailed collateralAsset,</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :     IERC20Detailed debtAsset,</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :     uint256 collateralAmount,</span>
@@ -174,7 +174,7 @@
 <span id="L103"><span class="lineNum">     103</span>                 :             :     bytes calldata paraswapData,</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :     PermitSignature calldata permitSignature</span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :   ) external nonReentrant {</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           8 :     debtRepayAmount = getDebtRepayAmount(</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           4 :     debtRepayAmount = getDebtRepayAmount(</span></span>
 <span id="L107"><span class="lineNum">     107</span>                 :             :       debtAsset,</span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :       debtRateMode,</span>
 <span id="L109"><span class="lineNum">     109</span>                 :             :       buyAllBalanceOffset,</span>
@@ -183,9 +183,9 @@
 <span id="L112"><span class="lineNum">     112</span>                 :             :     );</span>
 <span id="L113"><span class="lineNum">     113</span>                 :             : </span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :     // Pull aTokens from user</span>
-<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">           8 :     _pullATokenAndWithdraw(address(collateralAsset), msg.sender, collateralAmount, permitSignature);</span></span>
+<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">           4 :     _pullATokenAndWithdraw(address(collateralAsset), msg.sender, collateralAmount, permitSignature);</span></span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :     //buy debt asset using collateral asset</span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">          12 :     uint256 amountSold = _buyOnParaSwap(</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           4 :     (uint256 amountSold, uint256 amountBought) = _buyOnParaSwap(</span></span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :       buyAllBalanceOffset,</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :       paraswapData,</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :       collateralAsset,</span>
@@ -194,107 +194,123 @@
 <span id="L123"><span class="lineNum">     123</span>                 :             :       debtRepayAmount</span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :     );</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             : </span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           9 :     uint256 collateralBalanceLeft = collateralAmount - amountSold;</span></span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           3 :     uint256 collateralBalanceLeft = collateralAmount - amountSold;</span></span>
 <span id="L127"><span class="lineNum">     127</span>                 :             : </span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     //deposit collateral back in the pool, if left after the swap(buy)</span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">           6 :     if (collateralBalanceLeft &gt; 0) {</span></span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           2 :       IERC20(collateralAsset).safeApprove(address(POOL), 0);</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           2 :       IERC20(collateralAsset).safeApprove(address(POOL), collateralBalanceLeft);</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           2 :       POOL.deposit(address(collateralAsset), collateralBalanceLeft, msg.sender, 0);</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">           3 :     if (collateralBalanceLeft &gt; 0) {</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           1 :       IERC20(collateralAsset).safeApprove(address(POOL), collateralBalanceLeft);</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           1 :       POOL.deposit(address(collateralAsset), collateralBalanceLeft, msg.sender, 0);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           1 :       IERC20(collateralAsset).safeApprove(address(POOL), 0);</span></span>
 <span id="L133"><span class="lineNum">     133</span>                 :             :     }</span>
 <span id="L134"><span class="lineNum">     134</span>                 :             : </span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :     // Repay debt. Approves 0 first to comply with tokens that implement the anti frontrunning approval fix</span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           6 :     IERC20(debtAsset).safeApprove(address(POOL), 0);</span></span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">           6 :     IERC20(debtAsset).safeApprove(address(POOL), debtRepayAmount);</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">           6 :     POOL.repay(address(debtAsset), debtRepayAmount, debtRateMode, msg.sender);</span></span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :   }</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             : </span>
-<span id="L141"><span class="lineNum">     141</span>                 :             :   /**</span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :    * @dev Perform the repay of the debt, pulls the initiator collateral and swaps to repay the flash loan</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :    * @param premium Fee of the flash loan</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :    * @param initiator Address of the user</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :    * @param collateralAsset Address of token to be swapped</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :    * @param collateralAmount Amount of the reserve to be swapped(flash loan amount)</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :    */</span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           3 :     IERC20(debtAsset).safeApprove(address(POOL), debtRepayAmount);</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">           3 :     POOL.repay(address(debtAsset), debtRepayAmount, debtRateMode, msg.sender);</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">           3 :     IERC20(debtAsset).safeApprove(address(POOL), 0);</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :             : </span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :     {</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :       //transfer excess of debtAsset back to the user, if any</span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">           3 :       uint256 debtAssetExcess = amountBought - debtRepayAmount;</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           3 :       if (debtAssetExcess &gt; 0) {</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         IERC20(debtAsset).safeTransfer(msg.sender, debtAssetExcess);</span></span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :       }</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :     }</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :   }</span>
 <span id="L148"><span class="lineNum">     148</span>                 :             : </span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">           2 :   function _swapAndRepay(</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :     bytes calldata params,</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :     uint256 premium,</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :     address initiator,</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :     IERC20Detailed collateralAsset,</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :     uint256 collateralAmount</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :   ) private {</span>
-<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">           4 :     (</span></span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :       IERC20Detailed debtAsset,</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :       uint256 debtRepayAmount,</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :       uint256 buyAllBalanceOffset,</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :       uint256 rateMode,</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :       bytes memory paraswapData,</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :       PermitSignature memory permitSignature</span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">           4 :     ) = abi.decode(params, (IERC20Detailed, uint256, uint256, uint256, bytes, PermitSignature));</span></span>
-<span id="L164"><span class="lineNum">     164</span>                 :             : </span>
-<span id="L165"><span class="lineNum">     165</span>                 :<span class="tlaGNC">           4 :     debtRepayAmount = getDebtRepayAmount(</span></span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :       debtAsset,</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :       rateMode,</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :       buyAllBalanceOffset,</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :       debtRepayAmount,</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :       initiator</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :     );</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :   /**</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :    * @dev Perform the repay of the debt, pulls the initiator collateral and swaps to repay the flash loan</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :    * @param premium Fee of the flash loan</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :    * @param initiator Address of the user</span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :    * @param collateralAsset Address of token to be swapped</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :    * @param collateralAmount Amount of the reserve to be swapped(flash loan amount)</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :    */</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             : </span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :   function _swapAndRepay(</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :     bytes calldata params,</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :     uint256 premium,</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :     address initiator,</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :     IERC20Detailed collateralAsset,</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :     uint256 collateralAmount</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :   ) private {</span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     (</span></span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :       IERC20Detailed debtAsset,</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :       uint256 debtRepayAmount,</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :       uint256 buyAllBalanceOffset,</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :       uint256 rateMode,</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :       bytes memory paraswapData,</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :       PermitSignature memory permitSignature</span>
+<span id="L171"><span class="lineNum">     171</span>                 :<span class="tlaGNC">           2 :     ) = abi.decode(params, (IERC20Detailed, uint256, uint256, uint256, bytes, PermitSignature));</span></span>
 <span id="L172"><span class="lineNum">     172</span>                 :             : </span>
-<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           6 :     uint256 amountSold = _buyOnParaSwap(</span></span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :       buyAllBalanceOffset,</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :       paraswapData,</span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :       collateralAsset,</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :       debtAsset,</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :       collateralAmount,</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :       debtRepayAmount</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :     );</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             : </span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :     // Repay debt. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.</span>
-<span id="L183"><span class="lineNum">     183</span>                 :<span class="tlaGNC">           4 :     IERC20(debtAsset).safeApprove(address(POOL), 0);</span></span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">           4 :     IERC20(debtAsset).safeApprove(address(POOL), debtRepayAmount);</span></span>
-<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">           4 :     POOL.repay(address(debtAsset), debtRepayAmount, rateMode, initiator);</span></span>
-<span id="L186"><span class="lineNum">     186</span>                 :             : </span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           6 :     uint256 neededForFlashLoanRepay = amountSold.add(premium);</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :             : </span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :     // Pull aTokens from user</span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">           4 :     _pullATokenAndWithdraw(</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :       address(collateralAsset),</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :       initiator,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :       neededForFlashLoanRepay,</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :       permitSignature</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :     );</span>
+<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           2 :     debtRepayAmount = getDebtRepayAmount(</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :       debtAsset,</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :       rateMode,</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :       buyAllBalanceOffset,</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :       debtRepayAmount,</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :       initiator</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :     );</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             : </span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           2 :     (uint256 amountSold, uint256 amountBought) = _buyOnParaSwap(</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :       buyAllBalanceOffset,</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :       paraswapData,</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :       collateralAsset,</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :       debtAsset,</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :       collateralAmount,</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :       debtRepayAmount</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :     );</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             : </span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :     // Repay debt. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.</span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">           2 :     IERC20(debtAsset).safeApprove(address(POOL), debtRepayAmount);</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">           2 :     POOL.repay(address(debtAsset), debtRepayAmount, rateMode, initiator);</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">           2 :     IERC20(debtAsset).safeApprove(address(POOL), 0);</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :             : </span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">           2 :     uint256 neededForFlashLoanRepay = amountSold.add(premium);</span></span>
 <span id="L196"><span class="lineNum">     196</span>                 :             : </span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :     // Repay flashloan. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.</span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           4 :     IERC20(collateralAsset).safeApprove(address(POOL), 0);</span></span>
-<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">           4 :     IERC20(collateralAsset).safeApprove(address(POOL), collateralAmount.add(premium));</span></span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :   }</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             : </span>
-<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">           6 :   function getDebtRepayAmount(</span></span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :     IERC20Detailed debtAsset,</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :     uint256 rateMode,</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :     uint256 buyAllBalanceOffset,</span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :     uint256 debtRepayAmount,</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :     address initiator</span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :   ) private view returns (uint256) {</span>
-<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">          18 :     DataTypes.ReserveDataLegacy memory debtReserveData = _getReserveData(address(debtAsset));</span></span>
-<span id="L210"><span class="lineNum">     210</span>                 :             : </span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">          18 :     address debtToken = DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.STABLE</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :       ? debtReserveData.stableDebtTokenAddress</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :       : debtReserveData.variableDebtTokenAddress;</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             : </span>
-<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">          18 :     uint256 currentDebt = IERC20(debtToken).balanceOf(initiator);</span></span>
-<span id="L216"><span class="lineNum">     216</span>                 :             : </span>
-<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">          12 :     if (buyAllBalanceOffset != 0) {</span></span>
-<span id="L218"><span class="lineNum">     218</span>                 :<span class="tlaGNC">           2 :       require(currentDebt &lt;= debtRepayAmount, 'INSUFFICIENT_AMOUNT_TO_REPAY');</span></span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">           2 :       debtRepayAmount = currentDebt;</span></span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :     } else {</span>
-<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">          10 :       require(debtRepayAmount &lt;= currentDebt, 'INVALID_DEBT_REPAY_AMOUNT');</span></span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :     }</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             : </span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">          12 :     return debtRepayAmount;</span></span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :   }</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             : }</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :     // Pull aTokens from user</span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           2 :     _pullATokenAndWithdraw(</span></span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :       address(collateralAsset),</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :       initiator,</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :       neededForFlashLoanRepay,</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :       permitSignature</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :     );</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             : </span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :     {</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :       //transfer excess of debtAsset back to the user, if any</span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">           2 :       uint256 debtAssetExcess = amountBought - debtRepayAmount;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">           2 :       if (debtAssetExcess &gt; 0) {</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         IERC20(debtAsset).safeTransfer(initiator, debtAssetExcess);</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :             :       }</span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :     }</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             : </span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :     // Repay flashloan. Approves for 0 first to comply with tokens that implement the anti frontrunning approval fix.</span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     IERC20(collateralAsset).safeApprove(address(POOL), 0);</span></span>
+<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">           2 :     IERC20(collateralAsset).safeApprove(address(POOL), collateralAmount.add(premium));</span></span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :   }</span>
+<span id="L217"><span class="lineNum">     217</span>                 :             : </span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :   function getDebtRepayAmount(</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :     IERC20Detailed debtAsset,</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :     uint256 rateMode,</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :     uint256 buyAllBalanceOffset,</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :     uint256 debtRepayAmount,</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :     address initiator</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :   ) private view returns (uint256) {</span>
+<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">           6 :     require(</span></span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :       DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.VARIABLE,</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :       'INVALID_RATE_MODE'</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :     );</span>
+<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">           6 :     DataTypes.ReserveDataLegacy memory debtReserveData = _getReserveData(address(debtAsset));</span></span>
+<span id="L230"><span class="lineNum">     230</span>                 :             : </span>
+<span id="L231"><span class="lineNum">     231</span>                 :<span class="tlaGNC">           6 :     uint256 currentDebt = IERC20(debtReserveData.variableDebtTokenAddress).balanceOf(initiator);</span></span>
+<span id="L232"><span class="lineNum">     232</span>                 :             : </span>
+<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">           6 :     if (buyAllBalanceOffset != 0) {</span></span>
+<span id="L234"><span class="lineNum">     234</span>                 :<span class="tlaGNC">           1 :       require(currentDebt &lt;= debtRepayAmount, 'INSUFFICIENT_AMOUNT_TO_REPAY');</span></span>
+<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">           1 :       debtRepayAmount = currentDebt;</span></span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :     } else {</span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           5 :       require(debtRepayAmount &lt;= currentDebt, 'INVALID_DEBT_REPAY_AMOUNT');</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :     }</span>
+<span id="L239"><span class="lineNum">     239</span>                 :             : </span>
+<span id="L240"><span class="lineNum">     240</span>                 :<span class="tlaGNC">           6 :     return debtRepayAmount;</span></span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :   }</span>
+<span id="L242"><span class="lineNum">     242</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -302,8 +318,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func-c.html b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func-c.html
similarity index 62%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func-c.html
rename to report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func-c.html
index df9d9ee1..54ef062d 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func-c.html
+++ b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
             <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
             <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
             <td></td>
@@ -53,30 +53,37 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapWithdrawSwapAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ParaSwapWithdrawSwapAdapter.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L22">ParaSwapWithdrawSwapAdapter.executeOperation</a></td>
+              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L14">ParaSwapWithdrawSwapAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L22">ParaSwapWithdrawSwapAdapter.executeOperation</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L44">ParaSwapWithdrawSwapAdapter.withdrawAndSwap</a></td>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func.html b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func.html
similarity index 62%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func.html
rename to report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func.html
index 0afef10a..d0cff844 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.func.html
+++ b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (<a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
             <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
             <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
             <td></td>
@@ -53,30 +53,37 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapWithdrawSwapAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ParaSwapWithdrawSwapAdapter.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L22">ParaSwapWithdrawSwapAdapter.executeOperation</a></td>
+              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L14">ParaSwapWithdrawSwapAdapter.</a></td>
               
               <td class="coverFnLo">0</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L22">ParaSwapWithdrawSwapAdapter.executeOperation</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html#L44">ParaSwapWithdrawSwapAdapter.withdrawAndSwap</a></td>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.gcov.html b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.gcov.html
similarity index 82%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.gcov.html
rename to report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.gcov.html
index b6e48189..749fd6ec 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol.gcov.html
+++ b/report/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapWithdrawSwapAdapter.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/paraswap-adapters">extensions/paraswap-adapters</a> - ParaSwapWithdrawSwapAdapter.sol<span style="font-size: 80%;"> (source / <a href="ParaSwapWithdrawSwapAdapter.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
             <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
             <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,12 +72,12 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: AGPL-3.0</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {BaseParaSwapSellAdapter} from './BaseParaSwapSellAdapter.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {ReentrancyGuard} from '../../dependencies/openzeppelin/ReentrancyGuard.sol';</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             : </span>
@@ -89,17 +89,17 @@
 <span id="L18"><span class="lineNum">      18</span>                 :             :     IParaSwapAugustusRegistry augustusRegistry,</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :     address owner</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :   ) BaseParaSwapSellAdapter(addressesProvider, augustusRegistry) {</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :     transferOwnership(owner);</span>
+<span id="L21"><span class="lineNum">      21</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     transferOwnership(owner);</span></span>
 <span id="L22"><span class="lineNum">      22</span>                 :             :   }</span>
 <span id="L23"><span class="lineNum">      23</span>                 :             : </span>
-<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function executeOperation(</span></span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   function executeOperation(</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :     address,</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :     uint256,</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :     uint256,</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :     address,</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :     bytes calldata</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :   ) external override nonReentrant returns (bool) {</span>
-<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaUNC">           0 :     revert('NOT_SUPPORTED');</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC tlaBgGNC">           1 :     revert('NOT_SUPPORTED');</span></span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :   }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   /**</span>
@@ -114,7 +114,7 @@
 <span id="L43"><span class="lineNum">      43</span>                 :             :    * @param augustus Address of ParaSwap's AugustusSwapper contract</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :    * @param permitParams Struct containing the permit signatures, set to all zeroes if not used</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :    */</span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC tlaBgGNC">           3 :   function withdrawAndSwap(</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   function withdrawAndSwap(</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :     IERC20Detailed assetToSwapFrom,</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :     IERC20Detailed assetToSwapTo,</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :     uint256 amountToSwap,</span>
@@ -124,17 +124,17 @@
 <span id="L53"><span class="lineNum">      53</span>                 :             :     IParaSwapAugustus augustus,</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :     PermitSignature calldata permitParams</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :   ) external nonReentrant {</span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           9 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           3 :     IERC20WithPermit aToken = IERC20WithPermit(</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :       _getReserveData(address(assetToSwapFrom)).aTokenAddress</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :     );</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           6 :     if (swapAllBalanceOffset != 0) {</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           3 :       uint256 balance = aToken.balanceOf(msg.sender);</span></span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           2 :       require(balance &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           2 :       amountToSwap = balance;</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           3 :     if (swapAllBalanceOffset != 0) {</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           1 :       uint256 balance = aToken.balanceOf(msg.sender);</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           1 :       require(balance &lt;= amountToSwap, 'INSUFFICIENT_AMOUNT_TO_SWAP');</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           1 :       amountToSwap = balance;</span></span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     }</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             : </span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           6 :     _pullATokenAndWithdraw(</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           3 :     _pullATokenAndWithdraw(</span></span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :       address(assetToSwapFrom),</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :       aToken,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :       msg.sender,</span>
@@ -142,7 +142,7 @@
 <span id="L71"><span class="lineNum">      71</span>                 :             :       permitParams</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :     );</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             : </span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           9 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           3 :     uint256 amountReceived = _sellOnParaSwap(</span></span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :       swapAllBalanceOffset,</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :       swapCalldata,</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :       augustus,</span>
@@ -152,7 +152,7 @@
 <span id="L81"><span class="lineNum">      81</span>                 :             :       minAmountToReceive</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :     );</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           4 :     assetToSwapTo.safeTransfer(msg.sender, amountReceived);</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           2 :     assetToSwapTo.safeTransfer(msg.sender, amountReceived);</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :   }</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             : }</span>
         </pre>
@@ -162,8 +162,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-b.html b/report/extensions/paraswap-adapters/index-sort-b.html
similarity index 53%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-b.html
rename to report/extensions/paraswap-adapters/index-sort-b.html
index 7cb4d794..6b861fa6 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-b.html
+++ b/report/extensions/paraswap-adapters/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/paraswap-adapters</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.3&nbsp;%</td>
-            <td class="headerCovTableEntry">140</td>
-            <td class="headerCovTableEntry">139</td>
+            <td class="headerCovTableEntryMed">87.8&nbsp;%</td>
+            <td class="headerCovTableEntry">164</td>
+            <td class="headerCovTableEntry">144</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">74.1&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,117 +96,117 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html">AaveParaSwapFeeClaimer.sol</a></td>
+              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol">AaveParaSwapFeeClaimer.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=50 height=10 alt="50.0%"><img src="../../snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html">BaseParaSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol">BaseParaSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.3%"><img src="../../snow.png" width=8 height=10 alt="92.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">92.3&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">12</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html">BaseParaSwapBuyAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol">BaseParaSwapBuyAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.8%"><img src="../../snow.png" width=17 height=10 alt="82.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
+              <td class="coverPerMed">82.8&nbsp;%</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html">BaseParaSwapSellAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol">BaseParaSwapSellAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=81 height=10 alt="80.8%"><img src="../../snow.png" width=19 height=10 alt="80.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">21</td>
+              <td class="coverPerMed">80.8&nbsp;%</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverNumDflt">21</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">ParaSwapLiquiditySwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol">ParaSwapLiquiditySwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=97 height=10 alt="97.1%"><img src="../../snow.png" width=3 height=10 alt="97.1%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
               <td class="coverNumDflt">34</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerMed">75.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html">ParaSwapRepayAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol">ParaSwapRepayAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.0%"><img src="../../snow.png" width=7 height=10 alt="93.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverPerHi">93.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">40</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">ParaSwapWithdrawSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol">ParaSwapWithdrawSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=90 height=10 alt="90.0%"><img src="../../snow.png" width=10 height=10 alt="90.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
               <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
               <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-f.html b/report/extensions/paraswap-adapters/index-sort-f.html
similarity index 53%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-f.html
rename to report/extensions/paraswap-adapters/index-sort-f.html
index b5b7b613..ff9f0d9f 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-f.html
+++ b/report/extensions/paraswap-adapters/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/paraswap-adapters</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.3&nbsp;%</td>
-            <td class="headerCovTableEntry">140</td>
-            <td class="headerCovTableEntry">139</td>
+            <td class="headerCovTableEntryMed">87.8&nbsp;%</td>
+            <td class="headerCovTableEntry">164</td>
+            <td class="headerCovTableEntry">144</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">74.1&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,13 +96,13 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">ParaSwapWithdrawSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol">BaseParaSwapBuyAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.8%"><img src="../../snow.png" width=17 height=10 alt="82.8%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerMed">82.8&nbsp;%</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -111,93 +111,93 @@
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html">BaseParaSwapBuyAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol">BaseParaSwapSellAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=81 height=10 alt="80.8%"><img src="../../snow.png" width=19 height=10 alt="80.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
+              <td class="coverPerMed">80.8&nbsp;%</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverNumDflt">21</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html">BaseParaSwapSellAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol">ParaSwapWithdrawSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=90 height=10 alt="90.0%"><img src="../../snow.png" width=10 height=10 alt="90.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">21</td>
-              <td class="coverNumDflt">21</td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">ParaSwapLiquiditySwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol">ParaSwapLiquiditySwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=97 height=10 alt="97.1%"><img src="../../snow.png" width=3 height=10 alt="97.1%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
               <td class="coverNumDflt">34</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerMed">75.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html">AaveParaSwapFeeClaimer.sol</a></td>
+              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol">AaveParaSwapFeeClaimer.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=50 height=10 alt="50.0%"><img src="../../snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html">ParaSwapRepayAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol">ParaSwapRepayAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.0%"><img src="../../snow.png" width=7 height=10 alt="93.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverPerHi">93.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">40</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html">BaseParaSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol">BaseParaSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.3%"><img src="../../snow.png" width=8 height=10 alt="92.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">92.3&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">12</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
           </table>
@@ -205,8 +205,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-l.html b/report/extensions/paraswap-adapters/index-sort-l.html
similarity index 53%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-l.html
rename to report/extensions/paraswap-adapters/index-sort-l.html
index 2f902766..810ddf3c 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index-sort-l.html
+++ b/report/extensions/paraswap-adapters/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/paraswap-adapters</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.3&nbsp;%</td>
-            <td class="headerCovTableEntry">140</td>
-            <td class="headerCovTableEntry">139</td>
+            <td class="headerCovTableEntryMed">87.8&nbsp;%</td>
+            <td class="headerCovTableEntry">164</td>
+            <td class="headerCovTableEntry">144</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">74.1&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,117 +96,117 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">ParaSwapWithdrawSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol">AaveParaSwapFeeClaimer.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=50 height=10 alt="50.0%"><img src="../../snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
               <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html">AaveParaSwapFeeClaimer.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol">BaseParaSwapSellAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=81 height=10 alt="80.8%"><img src="../../snow.png" width=19 height=10 alt="80.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.8&nbsp;%</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverNumDflt">21</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html">BaseParaSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol">BaseParaSwapBuyAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.8%"><img src="../../snow.png" width=17 height=10 alt="82.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerMed">82.8&nbsp;%</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html">BaseParaSwapSellAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol">ParaSwapWithdrawSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=90 height=10 alt="90.0%"><img src="../../snow.png" width=10 height=10 alt="90.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">21</td>
-              <td class="coverNumDflt">21</td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html">BaseParaSwapBuyAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol">BaseParaSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.3%"><img src="../../snow.png" width=8 height=10 alt="92.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">24</td>
+              <td class="coverPerHi">92.3&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">12</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">ParaSwapLiquiditySwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol">ParaSwapRepayAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.0%"><img src="../../snow.png" width=7 height=10 alt="93.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
-              <td class="coverNumDflt">34</td>
+              <td class="coverPerHi">93.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">40</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html">ParaSwapRepayAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol">ParaSwapLiquiditySwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=97 height=10 alt="97.1%"><img src="../../snow.png" width=3 height=10 alt="97.1%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">34</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">75.0&nbsp;%</td>
               <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">3</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html b/report/extensions/paraswap-adapters/index.html
similarity index 53%
rename from report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html
rename to report/extensions/paraswap-adapters/index.html
index 37ddb722..28ebe49c 100644
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html
+++ b/report/extensions/paraswap-adapters/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/paraswap-adapters</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/paraswap-adapters</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.3&nbsp;%</td>
-            <td class="headerCovTableEntry">140</td>
-            <td class="headerCovTableEntry">139</td>
+            <td class="headerCovTableEntryMed">87.8&nbsp;%</td>
+            <td class="headerCovTableEntry">164</td>
+            <td class="headerCovTableEntry">144</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntryLo">74.1&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,117 +96,117 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html">AaveParaSwapFeeClaimer.sol</a></td>
+              <td class="coverFile"><a href="AaveParaSwapFeeClaimer.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol">AaveParaSwapFeeClaimer.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=50 height=10 alt="50.0%"><img src="../../snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html">BaseParaSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol">BaseParaSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.3%"><img src="../../snow.png" width=8 height=10 alt="92.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">92.3&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">12</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html">BaseParaSwapBuyAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapBuyAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol">BaseParaSwapBuyAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.8%"><img src="../../snow.png" width=17 height=10 alt="82.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">24</td>
+              <td class="coverPerMed">82.8&nbsp;%</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html">BaseParaSwapSellAdapter.sol</a></td>
+              <td class="coverFile"><a href="BaseParaSwapSellAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol">BaseParaSwapSellAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=81 height=10 alt="80.8%"><img src="../../snow.png" width=19 height=10 alt="80.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">21</td>
+              <td class="coverPerMed">80.8&nbsp;%</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverNumDflt">21</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html">ParaSwapLiquiditySwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapLiquiditySwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol">ParaSwapLiquiditySwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=97 height=10 alt="97.1%"><img src="../../snow.png" width=3 height=10 alt="97.1%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
               <td class="coverNumDflt">34</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerMed">75.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html">ParaSwapRepayAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapRepayAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol">ParaSwapRepayAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.0%"><img src="../../snow.png" width=7 height=10 alt="93.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverPerHi">93.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">40</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html">ParaSwapWithdrawSwapAdapter.sol</a></td>
+              <td class="coverFile"><a href="ParaSwapWithdrawSwapAdapter.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol">ParaSwapWithdrawSwapAdapter.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=90 height=10 alt="90.0%"><img src="../../snow.png" width=10 height=10 alt="90.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
               <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
               <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func-c.html b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func-c.html
new file mode 100644
index 00000000..78256aa9
--- /dev/null
+++ b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func-c.html
@@ -0,0 +1,238 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC20AaveLMUpgradeable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC20AaveLMUpgradeable.sol<span style="font-size: 80%;"> (<a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">92.5&nbsp;%</td>
+            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">86</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">20</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ERC20AaveLMUpgradeable.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L39">ERC20AaveLMUpgradeable.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L109">ERC20AaveLMUpgradeable.getCurrentRewardsIndex</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L149">ERC20AaveLMUpgradeable.rewardTokens</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L143">ERC20AaveLMUpgradeable.getReferenceAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L103">ERC20AaveLMUpgradeable.isRegisteredRewardToken</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L43">ERC20AaveLMUpgradeable.__ERC20AaveLM_init</a></td>
+              
+              <td class="coverFnHi">85</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L47">ERC20AaveLMUpgradeable.__ERC20AaveLM_init_unchained</a></td>
+              
+              <td class="coverFnHi">85</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L71">ERC20AaveLMUpgradeable.claimRewards</a></td>
+              
+              <td class="coverFnHi">1000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L76">ERC20AaveLMUpgradeable.claimRewardsToSelf</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L90">ERC20AaveLMUpgradeable.collectAndUpdateRewards</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L119">ERC20AaveLMUpgradeable.getTotalClaimableRewards</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L57">ERC20AaveLMUpgradeable.claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">3000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L251">ERC20AaveLMUpgradeable._claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">4000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L137">ERC20AaveLMUpgradeable.getUnclaimedRewards</a></td>
+              
+              <td class="coverFnHi">4356</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L294">ERC20AaveLMUpgradeable._registerRewardToken</a></td>
+              
+              <td class="coverFnHi">9003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L81">ERC20AaveLMUpgradeable.refreshRewardTokens</a></td>
+              
+              <td class="coverFnHi">9003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L180">ERC20AaveLMUpgradeable._updateUser</a></td>
+              
+              <td class="coverFnHi">12589</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L159">ERC20AaveLMUpgradeable._update</a></td>
+              
+              <td class="coverFnHi">12595</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L132">ERC20AaveLMUpgradeable.getClaimableRewards</a></td>
+              
+              <td class="coverFnHi">13361</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L202">ERC20AaveLMUpgradeable._getPendingRewards</a></td>
+              
+              <td class="coverFnHi">19949</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L221">ERC20AaveLMUpgradeable._getClaimableRewards</a></td>
+              
+              <td class="coverFnHi">19950</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L31">ERC20AaveLMUpgradeable._getERC20AaveLMStorage</a></td>
+              
+              <td class="coverFnHi">119662</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func.html b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func.html
new file mode 100644
index 00000000..f908498b
--- /dev/null
+++ b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.func.html
@@ -0,0 +1,238 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC20AaveLMUpgradeable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC20AaveLMUpgradeable.sol<span style="font-size: 80%;"> (<a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">92.5&nbsp;%</td>
+            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">86</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">20</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ERC20AaveLMUpgradeable.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L39">ERC20AaveLMUpgradeable.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L43">ERC20AaveLMUpgradeable.__ERC20AaveLM_init</a></td>
+              
+              <td class="coverFnHi">85</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L47">ERC20AaveLMUpgradeable.__ERC20AaveLM_init_unchained</a></td>
+              
+              <td class="coverFnHi">85</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L251">ERC20AaveLMUpgradeable._claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">4000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L221">ERC20AaveLMUpgradeable._getClaimableRewards</a></td>
+              
+              <td class="coverFnHi">19950</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L31">ERC20AaveLMUpgradeable._getERC20AaveLMStorage</a></td>
+              
+              <td class="coverFnHi">119662</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L202">ERC20AaveLMUpgradeable._getPendingRewards</a></td>
+              
+              <td class="coverFnHi">19949</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L294">ERC20AaveLMUpgradeable._registerRewardToken</a></td>
+              
+              <td class="coverFnHi">9003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L159">ERC20AaveLMUpgradeable._update</a></td>
+              
+              <td class="coverFnHi">12595</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L180">ERC20AaveLMUpgradeable._updateUser</a></td>
+              
+              <td class="coverFnHi">12589</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L71">ERC20AaveLMUpgradeable.claimRewards</a></td>
+              
+              <td class="coverFnHi">1000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L57">ERC20AaveLMUpgradeable.claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">3000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L76">ERC20AaveLMUpgradeable.claimRewardsToSelf</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L90">ERC20AaveLMUpgradeable.collectAndUpdateRewards</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L132">ERC20AaveLMUpgradeable.getClaimableRewards</a></td>
+              
+              <td class="coverFnHi">13361</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L109">ERC20AaveLMUpgradeable.getCurrentRewardsIndex</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L143">ERC20AaveLMUpgradeable.getReferenceAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L119">ERC20AaveLMUpgradeable.getTotalClaimableRewards</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L137">ERC20AaveLMUpgradeable.getUnclaimedRewards</a></td>
+              
+              <td class="coverFnHi">4356</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L103">ERC20AaveLMUpgradeable.isRegisteredRewardToken</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L81">ERC20AaveLMUpgradeable.refreshRewardTokens</a></td>
+              
+              <td class="coverFnHi">9003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC20AaveLMUpgradeable.sol.gcov.html#L149">ERC20AaveLMUpgradeable.rewardTokens</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.gcov.html b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.gcov.html
new file mode 100644
index 00000000..2cf34616
--- /dev/null
+++ b/report/extensions/static-a-token/ERC20AaveLMUpgradeable.sol.gcov.html
@@ -0,0 +1,391 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC20AaveLMUpgradeable.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC20AaveLMUpgradeable.sol<span style="font-size: 80%;"> (source / <a href="ERC20AaveLMUpgradeable.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">92.5&nbsp;%</td>
+            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">86</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">20</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
+<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.17;</span>
+<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {ERC20Upgradeable} from 'openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20} from 'openzeppelin-contracts/contracts/interfaces/IERC20.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {SafeCast} from 'solidity-utils/contracts/oz-common/SafeCast.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : </span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IRewardsController} from '../../rewards/interfaces/IRewardsController.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {IERC20AaveLM} from './interfaces/IERC20AaveLM.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : </span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : /**</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             :  * @title ERC20AaveLMUpgradeable.sol</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             :  * @notice Wrapper smart contract that supports tracking and claiming liquidity mining rewards from the Aave system</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             :  * @dev ERC20 extension, so ERC20 initialization should be done by the children contract/s</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @author BGD labs</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  */</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             : abstract contract ERC20AaveLMUpgradeable is ERC20Upgradeable, IERC20AaveLM {</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :   using SafeCast for uint256;</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             : </span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :   /// @custom:storage-location erc7201:aave-dao.storage.ERC20AaveLM</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   struct ERC20AaveLMStorage {</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :     address _referenceAsset; // a/v token to track rewards on INCENTIVES_CONTROLLER</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :     address[] _rewardTokens;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :     mapping(address user =&gt; RewardIndexCache cache) _startIndex;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :     mapping(address user =&gt; mapping(address reward =&gt; UserRewardsData cache)) _userRewardsData;</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   }</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             : </span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   // keccak256(abi.encode(uint256(keccak256(&quot;aave-dao.storage.ERC20AaveLM&quot;)) - 1)) &amp; ~bytes32(uint256(0xff))</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   bytes32 private constant ERC20AaveLMStorageLocation =</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :     0x4fad66563f105be0bff96185c9058c4934b504d3ba15ca31e86294f0b01fd200;</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             : </span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :   function _getERC20AaveLMStorage() private pure returns (ERC20AaveLMStorage storage $) {</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :     assembly {</span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC tlaBgGNC">      119662 :       $.slot := ERC20AaveLMStorageLocation</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :     }</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   }</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             : </span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   IRewardsController public immutable INCENTIVES_CONTROLLER;</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             : </span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :   constructor(IRewardsController rewardsController) {</span>
+<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     INCENTIVES_CONTROLLER = rewardsController;</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :   }</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             : </span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function __ERC20AaveLM_init(address referenceAsset_) internal onlyInitializing {</span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC tlaBgGNC">          85 :     __ERC20AaveLM_init_unchained(referenceAsset_);</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   }</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   function __ERC20AaveLM_init_unchained(address referenceAsset_) internal onlyInitializing {</span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">          85 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">          85 :     $._referenceAsset = referenceAsset_;</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             : </span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">          85 :     if (INCENTIVES_CONTROLLER != IRewardsController(address(0))) {</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">          85 :       refreshRewardTokens();</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :     }</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   }</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             : </span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :   function claimRewardsOnBehalf(</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :     address onBehalfOf,</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :     address receiver,</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :     address[] memory rewards</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   ) external {</span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">        3000 :     address msgSender = _msgSender();</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">        3000 :     if (msgSender != onBehalfOf &amp;&amp; msgSender != INCENTIVES_CONTROLLER.getClaimer(onBehalfOf)) {</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">        1000 :       revert InvalidClaimer(msgSender);</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :     }</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             : </span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">        2000 :     _claimRewardsOnBehalf(onBehalfOf, receiver, rewards);</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   }</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             : </span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :   function claimRewards(address receiver, address[] memory rewards) external {</span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">        1000 :     _claimRewardsOnBehalf(_msgSender(), receiver, rewards);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   }</span>
+<span id="L76"><span class="lineNum">      76</span>                 :             : </span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :   function claimRewardsToSelf(address[] memory rewards) external {</span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">        1001 :     _claimRewardsOnBehalf(_msgSender(), _msgSender(), rewards);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             : </span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function refreshRewardTokens() public override {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        9088 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        9088 :     address[] memory rewards = INCENTIVES_CONTROLLER.getRewardsByAsset($._referenceAsset);</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">        9088 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        9003 :       _registerRewardToken(rewards[i]);</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :     }</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :   }</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             : </span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function collectAndUpdateRewards(address reward) public returns (uint256) {</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        2517 :     if (reward == address(0)) {</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       return 0;</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :     }</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             : </span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC tlaBgGNC">        2517 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">        2517 :     address[] memory assets = new address[](1);</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">        2517 :     assets[0] = address($._referenceAsset);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             : </span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">        2517 :     return INCENTIVES_CONTROLLER.claimRewards(assets, type(uint256).max, address(this), reward);</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   function isRegisteredRewardToken(address reward) public view override returns (bool) {</span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">        9006 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">        9006 :     return $._startIndex[reward].isRegistered;</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             : </span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :   function getCurrentRewardsIndex(address reward) public view returns (uint256) {</span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">       37953 :     if (address(reward) == address(0)) {</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       return 0;</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :     }</span>
+<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC tlaBgGNC">       37953 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">       37953 :     (, uint256 nextIndex) = INCENTIVES_CONTROLLER.getAssetIndex($._referenceAsset, reward);</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">       37953 :     return nextIndex;</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :   }</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             : </span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   function getTotalClaimableRewards(address reward) external view returns (uint256) {</span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        1001 :     if (reward == address(0)) {</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       return 0;</span></span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :     }</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             : </span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC tlaBgGNC">        1001 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">        1001 :     address[] memory assets = new address[](1);</span></span>
+<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">        1001 :     assets[0] = $._referenceAsset;</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">        1001 :     uint256 freshRewards = INCENTIVES_CONTROLLER.getUserRewards(assets, address(this), reward);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        1001 :     return IERC20(reward).balanceOf(address(this)) + freshRewards;</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :   }</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             : </span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :   function getClaimableRewards(address user, address reward) external view returns (uint256) {</span>
+<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">       13361 :     return _getClaimableRewards(user, reward, balanceOf(user), getCurrentRewardsIndex(reward));</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :   }</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             : </span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :   function getUnclaimedRewards(address user, address reward) external view returns (uint256) {</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">        4356 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">        4356 :     return $._userRewardsData[user][reward].unclaimedRewards;</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :   }</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             : </span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :   function getReferenceAsset() external view returns (address) {</span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">           2 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           2 :     return $._referenceAsset;</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :   }</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             : </span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :   ///@inheritdoc IERC20AaveLM</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :   function rewardTokens() external view returns (address[] memory) {</span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           1 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">           1 :     return $._rewardTokens;</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   }</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             : </span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :   /**</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :    * @notice Updates rewards for senders and receiver in a transfer (not updating rewards for address(0))</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :    * @param from The address of the sender of tokens</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :    * @param to The address of the receiver of tokens</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :    */</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :   function _update(address from, address to, uint256 amount) internal virtual override {</span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">       12595 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">       12595 :     for (uint256 i = 0; i &lt; $._rewardTokens.length; i++) {</span></span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">       11589 :       address rewardToken = address($._rewardTokens[i]);</span></span>
+<span id="L165"><span class="lineNum">     165</span>                 :<span class="tlaGNC">       11589 :       uint256 rewardsIndex = getCurrentRewardsIndex(rewardToken);</span></span>
+<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">       11589 :       if (from != address(0)) {</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        2000 :         _updateUser(from, rewardsIndex, rewardToken);</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :       }</span>
+<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">       11589 :       if (to != address(0) &amp;&amp; from != to) {</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">       10589 :         _updateUser(to, rewardsIndex, rewardToken);</span></span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :       }</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :     }</span>
+<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">       12595 :     super._update(from, to, amount);</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :   }</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             : </span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :   /**</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :    * @notice Adding the pending rewards to the unclaimed for specific user and updating user index</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :    * @param user The address of the user to update</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :    * @param currentRewardsIndex The current rewardIndex</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :    * @param rewardToken The address of the reward token</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :    */</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :   function _updateUser(address user, uint256 currentRewardsIndex, address rewardToken) internal {</span>
+<span id="L183"><span class="lineNum">     183</span>                 :<span class="tlaGNC">       12589 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">       12589 :     uint256 balance = balanceOf(user);</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">       12589 :     if (balance &gt; 0) {</span></span>
+<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">        2589 :       $._userRewardsData[user][rewardToken].unclaimedRewards = _getClaimableRewards(</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :         user,</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :         rewardToken,</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :         balance,</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :         currentRewardsIndex</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :       ).toUint128();</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :     }</span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">       12589 :     $._userRewardsData[user][rewardToken].rewardsIndexOnLastInteraction = currentRewardsIndex</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :       .toUint128();</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :   }</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             : </span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :   /**</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :    * @notice Compute the pending in WAD. Pending is the amount to add (not yet unclaimed) rewards in WAD.</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :    * @param balance The balance of the user</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :    * @param rewardsIndexOnLastInteraction The index which was on the last interaction of the user</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :    * @param currentRewardsIndex The current rewards index in the system</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :    * @return The amount of pending rewards in WAD</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :    */</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :   function _getPendingRewards(</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :     uint256 balance,</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :     uint256 rewardsIndexOnLastInteraction,</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :     uint256 currentRewardsIndex</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :   ) internal view returns (uint256) {</span>
+<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">       19949 :     if (balance == 0) {</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       return 0;</span></span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :     }</span>
+<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC tlaBgGNC">       19949 :     return (balance * (currentRewardsIndex - rewardsIndexOnLastInteraction)) / 10 ** decimals();</span></span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :   }</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             : </span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :   /**</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :    * @notice Compute the claimable rewards for a user</span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :    * @param user The address of the user</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :    * @param reward The address of the reward</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :    * @param balance The balance of the user in WAD</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :    * @param currentRewardsIndex The current rewards index</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :    * @return The total rewards that can be claimed by the user (if `fresh` flag true, after updating rewards)</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :    */</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :   function _getClaimableRewards(</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :     address user,</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :     address reward,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :     uint256 balance,</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :     uint256 currentRewardsIndex</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :   ) internal view returns (uint256) {</span>
+<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">       19950 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">       19950 :     RewardIndexCache memory rewardsIndexCache = $._startIndex[reward];</span></span>
+<span id="L231"><span class="lineNum">     231</span>                 :<span class="tlaGNC">       19950 :     if (!rewardsIndexCache.isRegistered) {</span></span>
+<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">           1 :       revert RewardNotInitialized(reward);</span></span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :     }</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             : </span>
+<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">       19949 :     UserRewardsData memory currentUserRewardsData = $._userRewardsData[user][reward];</span></span>
+<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">       19949 :     return</span></span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">       19949 :       currentUserRewardsData.unclaimedRewards +</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">       19949 :       _getPendingRewards(</span></span>
+<span id="L239"><span class="lineNum">     239</span>                 :             :         balance,</span>
+<span id="L240"><span class="lineNum">     240</span>                 :             :         currentUserRewardsData.rewardsIndexOnLastInteraction == 0</span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :           ? rewardsIndexCache.lastUpdatedIndex</span>
+<span id="L242"><span class="lineNum">     242</span>                 :             :           : currentUserRewardsData.rewardsIndexOnLastInteraction,</span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :         currentRewardsIndex</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :       );</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :   }</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             : </span>
+<span id="L247"><span class="lineNum">     247</span>                 :             :   /**</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             :    * @notice Claim rewards on behalf of a user and send them to a receiver</span>
+<span id="L249"><span class="lineNum">     249</span>                 :             :    * @param onBehalfOf The address to claim on behalf of</span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :    * @param rewards The addresses of the rewards</span>
+<span id="L251"><span class="lineNum">     251</span>                 :             :    * @param receiver The address to receive the rewards</span>
+<span id="L252"><span class="lineNum">     252</span>                 :             :    */</span>
+<span id="L253"><span class="lineNum">     253</span>                 :             :   function _claimRewardsOnBehalf(</span>
+<span id="L254"><span class="lineNum">     254</span>                 :             :     address onBehalfOf,</span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :     address receiver,</span>
+<span id="L256"><span class="lineNum">     256</span>                 :             :     address[] memory rewards</span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :   ) internal virtual {</span>
+<span id="L258"><span class="lineNum">     258</span>                 :<span class="tlaGNC">        4000 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">        4000 :       if (address(rewards[i]) == address(0)) {</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">        4000 :         continue;</span></span>
+<span id="L261"><span class="lineNum">     261</span>                 :             :       }</span>
+<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">        4000 :       uint256 currentRewardsIndex = getCurrentRewardsIndex(rewards[i]);</span></span>
+<span id="L263"><span class="lineNum">     263</span>                 :<span class="tlaGNC">        4000 :       uint256 balance = balanceOf(onBehalfOf);</span></span>
+<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">        4000 :       uint256 userReward = _getClaimableRewards(</span></span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :         onBehalfOf,</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :         rewards[i],</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             :         balance,</span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :         currentRewardsIndex</span>
+<span id="L269"><span class="lineNum">     269</span>                 :             :       );</span>
+<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">        4000 :       uint256 totalRewardTokenBalance = IERC20(rewards[i]).balanceOf(address(this));</span></span>
+<span id="L271"><span class="lineNum">     271</span>                 :<span class="tlaGNC">        4000 :       uint256 unclaimedReward = 0;</span></span>
+<span id="L272"><span class="lineNum">     272</span>                 :             : </span>
+<span id="L273"><span class="lineNum">     273</span>                 :<span class="tlaGNC">        4000 :       if (userReward &gt; totalRewardTokenBalance) {</span></span>
+<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">        1516 :         totalRewardTokenBalance += collectAndUpdateRewards(address(rewards[i]));</span></span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :       }</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             : </span>
+<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">        4000 :       if (userReward &gt; totalRewardTokenBalance) {</span></span>
+<span id="L278"><span class="lineNum">     278</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         unclaimedReward = userReward - totalRewardTokenBalance;</span></span>
+<span id="L279"><span class="lineNum">     279</span>                 :<span class="tlaUNC">           0 :         userReward = totalRewardTokenBalance;</span></span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :       }</span>
+<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC tlaBgGNC">        4000 :       if (userReward &gt; 0) {</span></span>
+<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">        1516 :         ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">        1516 :         $._userRewardsData[onBehalfOf][rewards[i]].unclaimedRewards = unclaimedReward.toUint128();</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :<span class="tlaGNC">        1516 :         $</span></span>
+<span id="L285"><span class="lineNum">     285</span>                 :             :         ._userRewardsData[onBehalfOf][rewards[i]]</span>
+<span id="L286"><span class="lineNum">     286</span>                 :             :           .rewardsIndexOnLastInteraction = currentRewardsIndex.toUint128();</span>
+<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">        1516 :         SafeERC20.safeTransfer(IERC20(rewards[i]), receiver, userReward);</span></span>
+<span id="L288"><span class="lineNum">     288</span>                 :             :       }</span>
+<span id="L289"><span class="lineNum">     289</span>                 :             :     }</span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :   }</span>
+<span id="L291"><span class="lineNum">     291</span>                 :             : </span>
+<span id="L292"><span class="lineNum">     292</span>                 :             :   /**</span>
+<span id="L293"><span class="lineNum">     293</span>                 :             :    * @notice Initializes a new rewardToken</span>
+<span id="L294"><span class="lineNum">     294</span>                 :             :    * @param reward The reward token to be registered</span>
+<span id="L295"><span class="lineNum">     295</span>                 :             :    */</span>
+<span id="L296"><span class="lineNum">     296</span>                 :             :   function _registerRewardToken(address reward) internal {</span>
+<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">        9003 :     if (isRegisteredRewardToken(reward)) return;</span></span>
+<span id="L298"><span class="lineNum">     298</span>                 :<span class="tlaGNC">        9003 :     uint256 startIndex = getCurrentRewardsIndex(reward);</span></span>
+<span id="L299"><span class="lineNum">     299</span>                 :             : </span>
+<span id="L300"><span class="lineNum">     300</span>                 :<span class="tlaGNC">        9003 :     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();</span></span>
+<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">        9003 :     $._rewardTokens.push(reward);</span></span>
+<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">        9003 :     $._startIndex[reward] = RewardIndexCache(true, startIndex.toUint240());</span></span>
+<span id="L303"><span class="lineNum">     303</span>                 :             : </span>
+<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">        9003 :     emit RewardTokenRegistered(reward, startIndex);</span></span>
+<span id="L305"><span class="lineNum">     305</span>                 :             :   }</span>
+<span id="L306"><span class="lineNum">     306</span>                 :             : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func-c.html b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func-c.html
new file mode 100644
index 00000000..4565cd95
--- /dev/null
+++ b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func-c.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC4626StataTokenUpgradeable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC4626StataTokenUpgradeable.sol<span style="font-size: 80%;"> (<a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">73</td>
+            <td class="headerCovTableEntry">68</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ERC4626StataTokenUpgradeable.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L47">ERC4626StataTokenUpgradeable.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L116">ERC4626StataTokenUpgradeable.aToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L122">ERC4626StataTokenUpgradeable.maxMint</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L129">ERC4626StataTokenUpgradeable.maxWithdraw</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L52">ERC4626StataTokenUpgradeable.__ERC4626StataToken_init</a></td>
+              
+              <td class="coverFnHi">97</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L57">ERC4626StataTokenUpgradeable.__ERC4626StataToken_init_unchained</a></td>
+              
+              <td class="coverFnHi">97</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L184">ERC4626StataTokenUpgradeable.latestAnswer</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L134">ERC4626StataTokenUpgradeable.totalAssets</a></td>
+              
+              <td class="coverFnHi">1002</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L160">ERC4626StataTokenUpgradeable.maxDeposit</a></td>
+              
+              <td class="coverFnHi">1003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L104">ERC4626StataTokenUpgradeable.redeemATokens</a></td>
+              
+              <td class="coverFnHi">3000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L139">ERC4626StataTokenUpgradeable.maxRedeem</a></td>
+              
+              <td class="coverFnHi">3002</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L83">ERC4626StataTokenUpgradeable.depositWithPermit</a></td>
+              
+              <td class="coverFnHi">5000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L231">ERC4626StataTokenUpgradeable._withdraw</a></td>
+              
+              <td class="coverFnHi">7004</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L75">ERC4626StataTokenUpgradeable.depositATokens</a></td>
+              
+              <td class="coverFnHi">12005</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L278">ERC4626StataTokenUpgradeable._convertToAssets</a></td>
+              
+              <td class="coverFnHi">14007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L191">ERC4626StataTokenUpgradeable._deposit</a></td>
+              
+              <td class="coverFnHi">21009</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L32">ERC4626StataTokenUpgradeable._getERC4626StataTokenStorage</a></td>
+              
+              <td class="coverFnHi">21104</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L270">ERC4626StataTokenUpgradeable._convertToShares</a></td>
+              
+              <td class="coverFnHi">28013</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L286">ERC4626StataTokenUpgradeable._rate</a></td>
+              
+              <td class="coverFnHi">44021</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func.html b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func.html
new file mode 100644
index 00000000..07cfdf4a
--- /dev/null
+++ b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.func.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC4626StataTokenUpgradeable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC4626StataTokenUpgradeable.sol<span style="font-size: 80%;"> (<a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">73</td>
+            <td class="headerCovTableEntry">68</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ERC4626StataTokenUpgradeable.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L47">ERC4626StataTokenUpgradeable.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L52">ERC4626StataTokenUpgradeable.__ERC4626StataToken_init</a></td>
+              
+              <td class="coverFnHi">97</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L57">ERC4626StataTokenUpgradeable.__ERC4626StataToken_init_unchained</a></td>
+              
+              <td class="coverFnHi">97</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L278">ERC4626StataTokenUpgradeable._convertToAssets</a></td>
+              
+              <td class="coverFnHi">14007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L270">ERC4626StataTokenUpgradeable._convertToShares</a></td>
+              
+              <td class="coverFnHi">28013</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L191">ERC4626StataTokenUpgradeable._deposit</a></td>
+              
+              <td class="coverFnHi">21009</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L32">ERC4626StataTokenUpgradeable._getERC4626StataTokenStorage</a></td>
+              
+              <td class="coverFnHi">21104</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L286">ERC4626StataTokenUpgradeable._rate</a></td>
+              
+              <td class="coverFnHi">44021</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L231">ERC4626StataTokenUpgradeable._withdraw</a></td>
+              
+              <td class="coverFnHi">7004</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L116">ERC4626StataTokenUpgradeable.aToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L75">ERC4626StataTokenUpgradeable.depositATokens</a></td>
+              
+              <td class="coverFnHi">12005</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L83">ERC4626StataTokenUpgradeable.depositWithPermit</a></td>
+              
+              <td class="coverFnHi">5000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L184">ERC4626StataTokenUpgradeable.latestAnswer</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L160">ERC4626StataTokenUpgradeable.maxDeposit</a></td>
+              
+              <td class="coverFnHi">1003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L122">ERC4626StataTokenUpgradeable.maxMint</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L139">ERC4626StataTokenUpgradeable.maxRedeem</a></td>
+              
+              <td class="coverFnHi">3002</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L129">ERC4626StataTokenUpgradeable.maxWithdraw</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L104">ERC4626StataTokenUpgradeable.redeemATokens</a></td>
+              
+              <td class="coverFnHi">3000</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html#L134">ERC4626StataTokenUpgradeable.totalAssets</a></td>
+              
+              <td class="coverFnHi">1002</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.gcov.html b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.gcov.html
new file mode 100644
index 00000000..15185fe5
--- /dev/null
+++ b/report/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol.gcov.html
@@ -0,0 +1,376 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/ERC4626StataTokenUpgradeable.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - ERC4626StataTokenUpgradeable.sol<span style="font-size: 80%;"> (source / <a href="ERC4626StataTokenUpgradeable.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">73</td>
+            <td class="headerCovTableEntry">68</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
+<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.17;</span>
+<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {ERC4626Upgradeable, Math, IERC4626} from 'openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC4626Upgradeable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeERC20, IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20Permit} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : </span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IPool, IPoolAddressesProvider} from '../../interfaces/IPool.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IAaveOracle} from '../../interfaces/IAaveOracle.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {DataTypes, ReserveConfiguration} from '../../protocol/libraries/configuration/ReserveConfiguration.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : </span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {IAToken} from './interfaces/IAToken.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {IERC4626StataToken} from './interfaces/IERC4626StataToken.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : </span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @title ERC4626StataTokenUpgradeable</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  * @notice Wrapper smart contract that allows to deposit tokens on the Aave protocol and receive</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  * a token which balance doesn't increase automatically, but uses an ever-increasing exchange rate.</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :  * @dev ERC20 extension, so ERC20 initialization should be done by the children contract/s</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :  * @author BGD labs</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :  */</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             : abstract contract ERC4626StataTokenUpgradeable is ERC4626Upgradeable, IERC4626StataToken {</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   using Math for uint256;</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             : </span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   /// @custom:storage-location erc7201:aave-dao.storage.ERC4626StataToken</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :   struct ERC4626StataTokenStorage {</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :     IERC20 _aToken;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   }</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             : </span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   // keccak256(abi.encode(uint256(keccak256(&quot;aave-dao.storage.ERC4626StataToken&quot;)) - 1)) &amp; ~bytes32(uint256(0xff))</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :   bytes32 private constant ERC4626StataTokenStorageLocation =</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :     0x55029d3f54709e547ed74b2fc842d93107ab1490ab7555dd9dd0bf6451101900;</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             : </span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :   function _getERC4626StataTokenStorage()</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :     private</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :     pure</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :     returns (ERC4626StataTokenStorage storage $)</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   {</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :     assembly {</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC tlaBgGNC">       21104 :       $.slot := ERC4626StataTokenStorageLocation</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :     }</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             : </span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   uint256 public constant RAY = 1e27;</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             : </span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   IPool public immutable POOL;</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   IPoolAddressesProvider public immutable POOL_ADDRESSES_PROVIDER;</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   constructor(IPool pool) {</span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     POOL = pool;</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaUNC">           0 :     POOL_ADDRESSES_PROVIDER = pool.ADDRESSES_PROVIDER();</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   }</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             : </span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   function __ERC4626StataToken_init(address newAToken) internal onlyInitializing {</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC tlaBgGNC">          97 :     IERC20 aTokenUnderlying = __ERC4626StataToken_init_unchained(newAToken);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">          97 :     __ERC4626_init_unchained(aTokenUnderlying);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             : </span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :   function __ERC4626StataToken_init_unchained(</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :     address newAToken</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :   ) internal onlyInitializing returns (IERC20) {</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :     // sanity check, to be sure that we support that version of the aToken</span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">          97 :     address poolOfAToken = IAToken(newAToken).POOL();</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">          97 :     if (poolOfAToken != address(POOL)) revert PoolAddressMismatch(poolOfAToken);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             : </span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">          97 :     IERC20 aTokenUnderlying = IERC20(IAToken(newAToken).UNDERLYING_ASSET_ADDRESS());</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             : </span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">          97 :     ERC4626StataTokenStorage storage $ = _getERC4626StataTokenStorage();</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">          97 :     $._aToken = IERC20(newAToken);</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :             : </span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          97 :     SafeERC20.forceApprove(aTokenUnderlying, address(POOL), type(uint256).max);</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             : </span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          97 :     return aTokenUnderlying;</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :   }</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             : </span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :   ///@inheritdoc IERC4626StataToken</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   function depositATokens(uint256 assets, address receiver) external returns (uint256) {</span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       12005 :     uint256 shares = previewDeposit(assets);</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       12005 :     _deposit(_msgSender(), receiver, assets, shares, false);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             : </span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       11005 :     return shares;</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   }</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             : </span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :   ///@inheritdoc IERC4626StataToken</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :   function depositWithPermit(</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :     uint256 assets,</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :     address receiver,</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :     uint256 deadline,</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :     SignatureParams memory sig,</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :     bool depositToAave</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :   ) external returns (uint256) {</span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">        5000 :     IERC20Permit assetToDeposit = IERC20Permit(</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :       depositToAave ? asset() : address(_getERC4626StataTokenStorage()._aToken)</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :     );</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             : </span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :     try</span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">        5000 :       assetToDeposit.permit(_msgSender(), address(this), assets, deadline, sig.v, sig.r, sig.s)</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     {} catch {}</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC tlaBgGNC">        5000 :     uint256 shares = previewDeposit(assets);</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">        5000 :     _deposit(_msgSender(), receiver, assets, shares, depositToAave);</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">        4000 :     return shares;</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :   }</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   ///@inheritdoc IERC4626StataToken</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   function redeemATokens(</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     uint256 shares,</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :     address receiver,</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :     address owner</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   ) external returns (uint256) {</span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">        3000 :     uint256 assets = previewRedeem(shares);</span></span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">        3000 :     _withdraw(_msgSender(), receiver, owner, assets, shares, false);</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :             : </span>
+<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">        2000 :     return assets;</span></span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :   }</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             : </span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :   ///@inheritdoc IERC4626StataToken</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :   function aToken() public view returns (IERC20) {</span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">        1002 :     ERC4626StataTokenStorage storage $ = _getERC4626StataTokenStorage();</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">        1002 :     return $._aToken;</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   }</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             : </span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   ///@inheritdoc IERC4626</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :   function maxMint(address) public view override returns (uint256) {</span>
+<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">        2002 :     uint256 assets = maxDeposit(address(0));</span></span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">        2002 :     if (assets == type(uint256).max) return type(uint256).max;</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return convertToShares(assets);</span></span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :   }</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             : </span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :   ///@inheritdoc IERC4626</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :   function maxWithdraw(address owner) public view override returns (uint256) {</span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC tlaBgGNC">        2002 :     return convertToAssets(maxRedeem(owner));</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :   }</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             : </span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :   ///@inheritdoc IERC4626</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :   function totalAssets() public view override returns (uint256) {</span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        1002 :     return _convertToAssets(totalSupply(), Math.Rounding.Floor);</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :   }</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             : </span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :   ///@inheritdoc IERC4626</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :   function maxRedeem(address owner) public view override returns (uint256) {</span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">        6005 :     DataTypes.ReserveData memory reserveData = POOL.getReserveDataExtended(asset());</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :             : </span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :     // if paused or inactive users cannot withdraw underlying</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :     if (</span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">        6005 :       !ReserveConfiguration.getActive(reserveData.configuration) ||</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">        6005 :       ReserveConfiguration.getPaused(reserveData.configuration)</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :     ) {</span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">        1000 :       return 0;</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :     }</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             : </span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :     // otherwise users can withdraw up to the available amount</span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        5005 :     uint256 underlyingTokenBalanceInShares = convertToShares(reserveData.virtualUnderlyingBalance);</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">        5005 :     uint256 cachedUserBalance = balanceOf(owner);</span></span>
+<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">        5005 :     return</span></span>
+<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">        5005 :       underlyingTokenBalanceInShares &gt;= cachedUserBalance</span></span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :         ? cachedUserBalance</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :         : underlyingTokenBalanceInShares;</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :   }</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             : </span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :   ///@inheritdoc IERC4626</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :   function maxDeposit(address) public view override returns (uint256) {</span>
+<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">        3006 :     DataTypes.ReserveDataLegacy memory reserveData = POOL.getReserveData(asset());</span></span>
+<span id="L164"><span class="lineNum">     164</span>                 :             : </span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :     // if inactive, paused or frozen users cannot deposit underlying</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :     if (</span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        3006 :       !ReserveConfiguration.getActive(reserveData.configuration) ||</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        3006 :       ReserveConfiguration.getPaused(reserveData.configuration) ||</span></span>
+<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">        3005 :       ReserveConfiguration.getFrozen(reserveData.configuration)</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :     ) {</span>
+<span id="L171"><span class="lineNum">     171</span>                 :<span class="tlaGNC">           2 :       return 0;</span></span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :     }</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             : </span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">        3004 :     uint256 supplyCap = ReserveConfiguration.getSupplyCap(reserveData.configuration) *</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :       (10 ** ReserveConfiguration.getDecimals(reserveData.configuration));</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :     // if no supply cap deposit is unlimited</span>
+<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">        3004 :     if (supplyCap == 0) return type(uint256).max;</span></span>
+<span id="L178"><span class="lineNum">     178</span>                 :             : </span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :     // return remaining supply cap margin</span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">        1000 :     uint256 currentSupply = (IAToken(reserveData.aTokenAddress).scaledTotalSupply() +</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :       reserveData.accruedToTreasury).mulDiv(_rate(), RAY, Math.Rounding.Ceil);</span>
+<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">        1000 :     return currentSupply &gt; supplyCap ? 0 : supplyCap - currentSupply;</span></span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :   }</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             : </span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :   ///@inheritdoc IERC4626StataToken</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :   function latestAnswer() external view returns (int256) {</span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">        1001 :     uint256 aTokenUnderlyingAssetPrice = IAaveOracle(POOL_ADDRESSES_PROVIDER.getPriceOracle())</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :       .getAssetPrice(asset());</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :     // @notice aTokenUnderlyingAssetPrice * rate / RAY</span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">        1001 :     return int256(aTokenUnderlyingAssetPrice.mulDiv(_rate(), RAY, Math.Rounding.Floor));</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :   }</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             : </span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :   function _deposit(</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :     address caller,</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :     address receiver,</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :     uint256 assets,</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :     uint256 shares,</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :     bool depositToAave</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :   ) internal virtual {</span>
+<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">       19007 :     if (shares == 0) {</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       revert StaticATokenInvalidZeroShares();</span></span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :     }</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :     // If _asset is ERC777, `transferFrom` can trigger a reentrancy BEFORE the transfer happens through the</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :     // `tokensToSend` hook. On the other hand, the `tokenReceived` hook, that is triggered after the transfer,</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :     // calls the vault, which is assumed not malicious.</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :     //</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :     // Conclusion: we need to do the transfer before we mint so that any reentrancy would happen before the</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :     // assets are transferred and before the shares are minted, which is a valid state.</span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :     // slither-disable-next-line reentrancy-no-eth</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             : </span>
+<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC tlaBgGNC">       19007 :     if (depositToAave) {</span></span>
+<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC">        4002 :       address cachedAsset = asset();</span></span>
+<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">        4002 :       SafeERC20.safeTransferFrom(IERC20(cachedAsset), caller, address(this), assets);</span></span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">        3002 :       POOL.deposit(cachedAsset, assets, address(this), 0);</span></span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :     } else {</span>
+<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">       15005 :       ERC4626StataTokenStorage storage $ = _getERC4626StataTokenStorage();</span></span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">       15005 :       SafeERC20.safeTransferFrom($._aToken, caller, address(this), assets);</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :     }</span>
+<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">       16007 :     _mint(receiver, shares);</span></span>
+<span id="L220"><span class="lineNum">     220</span>                 :             : </span>
+<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">       16005 :     emit Deposit(caller, receiver, assets, shares);</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :   }</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             : </span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :   function _deposit(</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :     address caller,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :     address receiver,</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :     uint256 assets,</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :     uint256 shares</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :   ) internal virtual override {</span>
+<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">        2002 :     _deposit(caller, receiver, assets, shares, true);</span></span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :   }</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             : </span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :   function _withdraw(</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :     address caller,</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :     address receiver,</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :     address owner,</span>
+<span id="L237"><span class="lineNum">     237</span>                 :             :     uint256 assets,</span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :     uint256 shares,</span>
+<span id="L239"><span class="lineNum">     239</span>                 :             :     bool withdrawFromAave</span>
+<span id="L240"><span class="lineNum">     240</span>                 :             :   ) internal virtual {</span>
+<span id="L241"><span class="lineNum">     241</span>                 :<span class="tlaGNC">        5002 :     if (caller != owner) {</span></span>
+<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">        2000 :       _spendAllowance(owner, caller, shares);</span></span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :     }</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             : </span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :     // If _asset is ERC777, `transfer` can trigger a reentrancy AFTER the transfer happens through the</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             :     // `tokensReceived` hook. On the other hand, the `tokensToSend` hook, that is triggered before the transfer,</span>
+<span id="L247"><span class="lineNum">     247</span>                 :             :     // calls the vault, which is assumed not malicious.</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             :     //</span>
+<span id="L249"><span class="lineNum">     249</span>                 :             :     // Conclusion: we need to do the transfer after the burn so that any reentrancy would happen after the</span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :     // shares are burned and after the assets are transferred, which is a valid state.</span>
+<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">        4002 :     _burn(owner, shares);</span></span>
+<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">        4000 :     if (withdrawFromAave) {</span></span>
+<span id="L253"><span class="lineNum">     253</span>                 :<span class="tlaGNC">        2000 :       POOL.withdraw(asset(), assets, receiver);</span></span>
+<span id="L254"><span class="lineNum">     254</span>                 :             :     } else {</span>
+<span id="L255"><span class="lineNum">     255</span>                 :<span class="tlaGNC">        2000 :       ERC4626StataTokenStorage storage $ = _getERC4626StataTokenStorage();</span></span>
+<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">        2000 :       SafeERC20.safeTransfer($._aToken, receiver, assets);</span></span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :     }</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             : </span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">        4000 :     emit Withdraw(caller, receiver, owner, assets, shares);</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :             :   }</span>
+<span id="L261"><span class="lineNum">     261</span>                 :             : </span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :   function _withdraw(</span>
+<span id="L263"><span class="lineNum">     263</span>                 :             :     address caller,</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :     address receiver,</span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :     address owner,</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :     uint256 assets,</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             :     uint256 shares</span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :   ) internal virtual override {</span>
+<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">        2002 :     _withdraw(caller, receiver, owner, assets, shares, true);</span></span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :   }</span>
+<span id="L271"><span class="lineNum">     271</span>                 :             : </span>
+<span id="L272"><span class="lineNum">     272</span>                 :             :   function _convertToShares(</span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :     uint256 assets,</span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :     Math.Rounding rounding</span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :   ) internal view virtual override returns (uint256) {</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :     // * @notice assets * RAY / exchangeRate</span>
+<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">       28013 :     return assets.mulDiv(RAY, _rate(), rounding);</span></span>
+<span id="L278"><span class="lineNum">     278</span>                 :             :   }</span>
+<span id="L279"><span class="lineNum">     279</span>                 :             : </span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :   function _convertToAssets(</span>
+<span id="L281"><span class="lineNum">     281</span>                 :             :     uint256 shares,</span>
+<span id="L282"><span class="lineNum">     282</span>                 :             :     Math.Rounding rounding</span>
+<span id="L283"><span class="lineNum">     283</span>                 :             :   ) internal view virtual override returns (uint256) {</span>
+<span id="L284"><span class="lineNum">     284</span>                 :             :     // * @notice share * exchangeRate / RAY</span>
+<span id="L285"><span class="lineNum">     285</span>                 :<span class="tlaGNC">       14007 :     return shares.mulDiv(_rate(), RAY, rounding);</span></span>
+<span id="L286"><span class="lineNum">     286</span>                 :             :   }</span>
+<span id="L287"><span class="lineNum">     287</span>                 :             : </span>
+<span id="L288"><span class="lineNum">     288</span>                 :             :   function _rate() internal view returns (uint256) {</span>
+<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">       44021 :     return POOL.getReserveNormalizedIncome(asset());</span></span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :   }</span>
+<span id="L291"><span class="lineNum">     291</span>                 :             : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func-c.html b/report/extensions/static-a-token/StataTokenFactory.sol.func-c.html
similarity index 50%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func-c.html
rename to report/extensions/static-a-token/StataTokenFactory.sol.func-c.html
index b8d88ccc..e70d06ee 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.func-c.html
+++ b/report/extensions/static-a-token/StataTokenFactory.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenFactory.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (<a href="BorrowLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenFactory.sol<span style="font-size: 80%;"> (<a href="StataTokenFactory.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.1&nbsp;%</td>
-            <td class="headerCovTableEntry">67</td>
-            <td class="headerCovTableEntry">59</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,49 +53,56 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BorrowLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StataTokenFactory.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L280">BorrowLogic.executeRebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L27">StataTokenFactory.</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L311">BorrowLogic.executeSwapBorrowRateMode</a></td>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L81">StataTokenFactory.getStataTokens</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L179">BorrowLogic.executeRepay</a></td>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L42">StataTokenFactory.createStataTokens</a></td>
               
-              <td class="coverFnHi">5029</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L66">BorrowLogic.executeBorrow</a></td>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L86">StataTokenFactory.getStataToken</a></td>
               
-              <td class="coverFnHi">9117</td>
+              <td class="coverFnHi">23</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L39">StataTokenFactory.initialize</a></td>
+              
+              <td class="coverFnHi">655</td>
               
               
             </tr>
@@ -103,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/extensions/static-a-token/StataTokenFactory.sol.func.html b/report/extensions/static-a-token/StataTokenFactory.sol.func.html
new file mode 100644
index 00000000..a0807d2d
--- /dev/null
+++ b/report/extensions/static-a-token/StataTokenFactory.sol.func.html
@@ -0,0 +1,119 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenFactory.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenFactory.sol<span style="font-size: 80%;"> (<a href="StataTokenFactory.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">14</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StataTokenFactory.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L27">StataTokenFactory.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L42">StataTokenFactory.createStataTokens</a></td>
+              
+              <td class="coverFnHi">23</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L86">StataTokenFactory.getStataToken</a></td>
+              
+              <td class="coverFnHi">23</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L81">StataTokenFactory.getStataTokens</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenFactory.sol.gcov.html#L39">StataTokenFactory.initialize</a></td>
+              
+              <td class="coverFnHi">655</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/StataTokenFactory.sol.gcov.html b/report/extensions/static-a-token/StataTokenFactory.sol.gcov.html
new file mode 100644
index 00000000..d2463089
--- /dev/null
+++ b/report/extensions/static-a-token/StataTokenFactory.sol.gcov.html
@@ -0,0 +1,176 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenFactory.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenFactory.sol<span style="font-size: 80%;"> (source / <a href="StataTokenFactory.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">14</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
+<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
+<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPool, DataTypes} from '../../../contracts/interfaces/IPool.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {StataTokenV2} from './StataTokenV2.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IStataTokenFactory} from './interfaces/IStataTokenFactory.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : </span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : /**</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             :  * @title StataTokenFactory</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             :  * @notice Factory contract that keeps track of all deployed StataTokens for a specified pool.</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             :  * This registry also acts as a factory, allowing to deploy new StataTokens on demand.</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             :  * There can only be one StataToken per underlying on the registry at any time.</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @author BGD labs</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  */</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             : contract StataTokenFactory is Initializable, IStataTokenFactory {</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :   IPool public immutable POOL;</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   address public immutable PROXY_ADMIN;</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :   ITransparentProxyFactory public immutable TRANSPARENT_PROXY_FACTORY;</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   address public immutable STATA_TOKEN_IMPL;</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             : </span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   mapping(address =&gt; address) internal _underlyingToStataToken;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   address[] internal _stataTokens;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : </span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   event StataTokenCreated(address indexed stataToken, address indexed underlying);</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             : </span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   constructor(</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :     IPool pool,</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :     address proxyAdmin,</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :     ITransparentProxyFactory transparentProxyFactory,</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :     address stataTokenImpl</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :   ) {</span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     POOL = pool;</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaUNC">           0 :     PROXY_ADMIN = proxyAdmin;</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaUNC">           0 :     TRANSPARENT_PROXY_FACTORY = transparentProxyFactory;</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaUNC">           0 :     STATA_TOKEN_IMPL = stataTokenImpl;</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             : </span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :   function initialize() external initializer {}</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             : </span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :   ///@inheritdoc IStataTokenFactory</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   function createStataTokens(address[] memory underlyings) external returns (address[] memory) {</span>
+<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC tlaBgGNC">          23 :     address[] memory stataTokens = new address[](underlyings.length);</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">          23 :     for (uint256 i = 0; i &lt; underlyings.length; i++) {</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">          69 :       address cachedStataToken = _underlyingToStataToken[underlyings[i]];</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">          69 :       if (cachedStataToken == address(0)) {</span></span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">          69 :         DataTypes.ReserveDataLegacy memory reserveData = POOL.getReserveData(underlyings[i]);</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">          69 :         if (reserveData.aTokenAddress == address(0))</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaUNC tlaBgUNC">           0 :           revert NotListedUnderlying(reserveData.aTokenAddress);</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC tlaBgGNC">          69 :         bytes memory symbol = abi.encodePacked(</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :           'stat',</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :           IERC20Metadata(reserveData.aTokenAddress).symbol(),</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :           'v2'</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :         );</span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">          69 :         address stataToken = TRANSPARENT_PROXY_FACTORY.createDeterministic(</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :           STATA_TOKEN_IMPL,</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :           PROXY_ADMIN,</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :           abi.encodeWithSelector(</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :             StataTokenV2.initialize.selector,</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :             reserveData.aTokenAddress,</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :             string(</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :               abi.encodePacked('Static ', IERC20Metadata(reserveData.aTokenAddress).name(), ' v2')</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :             ),</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :             string(symbol)</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :           ),</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :           bytes32(uint256(uint160(underlyings[i])))</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :         );</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             : </span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          69 :         _underlyingToStataToken[underlyings[i]] = stataToken;</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          69 :         stataTokens[i] = stataToken;</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          69 :         _stataTokens.push(stataToken);</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          69 :         emit StataTokenCreated(stataToken, underlyings[i]);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :       } else {</span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         stataTokens[i] = cachedStataToken;</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :       }</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :     }</span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC tlaBgGNC">          23 :     return stataTokens;</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             : </span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   ///@inheritdoc IStataTokenFactory</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function getStataTokens() external view returns (address[] memory) {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     return _stataTokens;</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :   }</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             : </span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :   ///@inheritdoc IStataTokenFactory</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   function getStataToken(address underlying) external view returns (address) {</span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC tlaBgGNC">          23 :     return _underlyingToStataToken[underlying];</span></span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :   }</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/StataTokenV2.sol.func-c.html b/report/extensions/static-a-token/StataTokenV2.sol.func-c.html
new file mode 100644
index 00000000..86b8663e
--- /dev/null
+++ b/report/extensions/static-a-token/StataTokenV2.sol.func-c.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenV2.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenV2.sol<span style="font-size: 80%;"> (<a href="StataTokenV2.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">85.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">18</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">72.7&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">8</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StataTokenV2.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L30">StataTokenV2.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L66">StataTokenV2.maxRescue</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L61">StataTokenV2.whoCanRescue</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L102">StataTokenV2._claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L91">StataTokenV2.decimals</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L84">StataTokenV2.nonces</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L42">StataTokenV2.initialize</a></td>
+              
+              <td class="coverFnHi">70</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L79">StataTokenV2.canPause</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L37">StataTokenV2.onlyPauseGuardian</a></td>
+              
+              <td class="coverFnHi">1007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L55">StataTokenV2.setPaused</a></td>
+              
+              <td class="coverFnHi">1007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L112">StataTokenV2._update</a></td>
+              
+              <td class="coverFnHi">1009</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/StataTokenV2.sol.func.html b/report/extensions/static-a-token/StataTokenV2.sol.func.html
new file mode 100644
index 00000000..c1164e33
--- /dev/null
+++ b/report/extensions/static-a-token/StataTokenV2.sol.func.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenV2.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenV2.sol<span style="font-size: 80%;"> (<a href="StataTokenV2.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">85.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">18</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">72.7&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">8</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StataTokenV2.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L30">StataTokenV2.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L102">StataTokenV2._claimRewardsOnBehalf</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L112">StataTokenV2._update</a></td>
+              
+              <td class="coverFnHi">1009</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L79">StataTokenV2.canPause</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L91">StataTokenV2.decimals</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L42">StataTokenV2.initialize</a></td>
+              
+              <td class="coverFnHi">70</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L66">StataTokenV2.maxRescue</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L84">StataTokenV2.nonces</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L37">StataTokenV2.onlyPauseGuardian</a></td>
+              
+              <td class="coverFnHi">1007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L55">StataTokenV2.setPaused</a></td>
+              
+              <td class="coverFnHi">1007</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StataTokenV2.sol.gcov.html#L61">StataTokenV2.whoCanRescue</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/StataTokenV2.sol.gcov.html b/report/extensions/static-a-token/StataTokenV2.sol.gcov.html
new file mode 100644
index 00000000..1acc806f
--- /dev/null
+++ b/report/extensions/static-a-token/StataTokenV2.sol.gcov.html
@@ -0,0 +1,206 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token/StataTokenV2.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory extensions/static-a-token">extensions/static-a-token</a> - StataTokenV2.sol<span style="font-size: 80%;"> (source / <a href="StataTokenV2.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">85.7&nbsp;%</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">18</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">72.7&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">8</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">             Branch data     Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
+<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
+<span id="L3"><span class="lineNum">       3</span>                 :             : </span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {ERC20Upgradeable, ERC20PermitUpgradeable} from 'openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20PermitUpgradeable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20Metadata} from '@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {PausableUpgradeable} from 'openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IRescuable, Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IRescuableBase, RescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IERC20Permit} from '@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : </span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {IACLManager} from '../../../contracts/interfaces/IACLManager.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ERC4626Upgradeable, ERC4626StataTokenUpgradeable, IPool, Math, IERC20} from './ERC4626StataTokenUpgradeable.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {ERC20AaveLMUpgradeable, IRewardsController} from './ERC20AaveLMUpgradeable.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {IStataTokenV2} from './interfaces/IStataTokenV2.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : import {IAToken} from './interfaces/IAToken.sol';</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : </span>
+<span id="L17"><span class="lineNum">      17</span>                 :             : /**</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  * @title StataTokenV2</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :  * @notice A 4626 Vault which wrapps aTokens in order to translate the rebasing nature of yield accrual into a non-rebasing value accrual.</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :  * @author BGD labs</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :  */</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             : contract StataTokenV2 is</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   ERC20PermitUpgradeable,</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   ERC20AaveLMUpgradeable,</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   ERC4626StataTokenUpgradeable,</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :   PausableUpgradeable,</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   Rescuable,</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   IStataTokenV2</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             : {</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   using Math for uint256;</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             : </span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   constructor(</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :     IPool pool,</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :     IRewardsController rewardsController</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   ) ERC20AaveLMUpgradeable(rewardsController) ERC4626StataTokenUpgradeable(pool) {</span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     _disableInitializers();</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   }</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             : </span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   modifier onlyPauseGuardian() {</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC tlaBgGNC">        1007 :     if (!canPause(_msgSender())) revert OnlyPauseGuardian(_msgSender());</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :     _;</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             : </span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   function initialize(</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :     address aToken,</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :     string calldata staticATokenName,</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :     string calldata staticATokenSymbol</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   ) external initializer {</span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">          69 :     __ERC20_init(staticATokenName, staticATokenSymbol);</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">          69 :     __ERC20Permit_init(staticATokenName);</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">          69 :     __ERC20AaveLM_init(aToken);</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">          69 :     __ERC4626StataToken_init(aToken);</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">          69 :     __Pausable_init();</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   }</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   ///@inheritdoc IStataTokenV2</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   function setPaused(bool paused) external onlyPauseGuardian {</span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           7 :     if (paused) _pause();</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     else _unpause();</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   }</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             : </span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :   /// @inheritdoc IRescuable</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   function whoCanRescue() public view override returns (address) {</span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC tlaBgGNC">        1003 :     return POOL_ADDRESSES_PROVIDER.getACLAdmin();</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             : </span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   /// @inheritdoc IRescuableBase</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :   function maxRescue(</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :     address asset</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   ) public view override(IRescuableBase, RescuableBase) returns (uint256) {</span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">        1002 :     IERC20 cachedAToken = aToken();</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">        1002 :     if (asset == address(cachedAToken)) {</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">        1001 :       uint256 requiredBacking = _convertToAssets(totalSupply(), Math.Rounding.Ceil);</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">        1001 :       uint256 balance = cachedAToken.balanceOf(address(this));</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        1001 :       return balance &gt; requiredBacking ? balance - requiredBacking : 0;</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :     }</span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           1 :     return type(uint256).max;</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :   }</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             : </span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   ///@inheritdoc IStataTokenV2</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :   function canPause(address actor) public view returns (bool) {</span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">        2008 :     return IACLManager(POOL_ADDRESSES_PROVIDER.getACLManager()).isEmergencyAdmin(actor);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   }</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             : </span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :   ///@inheritdoc IERC20Permit</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :   function nonces(</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :     address owner</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   ) public view virtual override(ERC20PermitUpgradeable, IERC20Permit) returns (uint256) {</span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">           3 :     return super.nonces(owner);</span></span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :   }</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             : </span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   ///@inheritdoc IERC20Metadata</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :   function decimals()</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :     public</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :     view</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :     override(IERC20Metadata, ERC20Upgradeable, ERC4626Upgradeable)</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :     returns (uint8)</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :   {</span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :     /// @notice The initialization of ERC4626Upgradeable already assures that decimal are</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :     /// the same as the underlying asset of the StataTokenV2, e.g. decimals of WETH for stataWETH</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           1 :     return ERC4626Upgradeable.decimals();</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   function _claimRewardsOnBehalf(</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :     address onBehalfOf,</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :     address receiver,</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     address[] memory rewards</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   ) internal virtual override whenNotPaused {</span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     super._claimRewardsOnBehalf(onBehalfOf, receiver, rewards);</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             : </span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :   // @notice to merge inheritance with ERC20AaveLMUpgradeable.sol properly we put</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :   // `whenNotPaused` here instead of using ERC20PausableUpgradeable</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :   function _update(</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :     address from,</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :     address to,</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :     uint256 amount</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :   ) internal virtual override(ERC20AaveLMUpgradeable, ERC20Upgradeable) whenNotPaused {</span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC tlaBgGNC">        1004 :     ERC20AaveLMUpgradeable._update(from, to, amount);</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :   }</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/index-sort-b.html b/report/extensions/static-a-token/index-sort-b.html
new file mode 100644
index 00000000..ee99753c
--- /dev/null
+++ b/report/extensions/static-a-token/index-sort-b.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/static-a-token</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">89.4&nbsp;%</td>
+            <td class="headerCovTableEntry">208</td>
+            <td class="headerCovTableEntry">186</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">84.2&nbsp;%</td>
+            <td class="headerCovTableEntry">57</td>
+            <td class="headerCovTableEntry">48</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol">ERC20AaveLMUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.5%"><img src="../../snow.png" width=8 height=10 alt="92.5%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">92.5&nbsp;%</td>
+              <td class="coverNumDflt">93</td>
+              <td class="coverNumDflt">86</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">22</td>
+              <td class="coverNumDflt">20</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol">ERC4626StataTokenUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.2%"><img src="../../snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">73</td>
+              <td class="coverNumDflt">68</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenFactory.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenFactory.sol">StataTokenFactory.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">60.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">3</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenV2.sol">StataTokenV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=86 height=10 alt="85.7%"><img src="../../snow.png" width=14 height=10 alt="85.7%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">85.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">72.7&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">8</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/index-sort-f.html b/report/extensions/static-a-token/index-sort-f.html
new file mode 100644
index 00000000..1ddeabca
--- /dev/null
+++ b/report/extensions/static-a-token/index-sort-f.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/static-a-token</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">89.4&nbsp;%</td>
+            <td class="headerCovTableEntry">208</td>
+            <td class="headerCovTableEntry">186</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">84.2&nbsp;%</td>
+            <td class="headerCovTableEntry">57</td>
+            <td class="headerCovTableEntry">48</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenFactory.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenFactory.sol">StataTokenFactory.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">60.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">3</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenV2.sol">StataTokenV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=86 height=10 alt="85.7%"><img src="../../snow.png" width=14 height=10 alt="85.7%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">85.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">72.7&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">8</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol">ERC4626StataTokenUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.2%"><img src="../../snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">73</td>
+              <td class="coverNumDflt">68</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol">ERC20AaveLMUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.5%"><img src="../../snow.png" width=8 height=10 alt="92.5%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">92.5&nbsp;%</td>
+              <td class="coverNumDflt">93</td>
+              <td class="coverNumDflt">86</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">22</td>
+              <td class="coverNumDflt">20</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/index-sort-l.html b/report/extensions/static-a-token/index-sort-l.html
new file mode 100644
index 00000000..40e641b5
--- /dev/null
+++ b/report/extensions/static-a-token/index-sort-l.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/static-a-token</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">89.4&nbsp;%</td>
+            <td class="headerCovTableEntry">208</td>
+            <td class="headerCovTableEntry">186</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">84.2&nbsp;%</td>
+            <td class="headerCovTableEntry">57</td>
+            <td class="headerCovTableEntry">48</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenFactory.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenFactory.sol">StataTokenFactory.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">60.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">3</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenV2.sol">StataTokenV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=86 height=10 alt="85.7%"><img src="../../snow.png" width=14 height=10 alt="85.7%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">85.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">72.7&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">8</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol">ERC20AaveLMUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.5%"><img src="../../snow.png" width=8 height=10 alt="92.5%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">92.5&nbsp;%</td>
+              <td class="coverNumDflt">93</td>
+              <td class="coverNumDflt">86</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">22</td>
+              <td class="coverNumDflt">20</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol">ERC4626StataTokenUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.2%"><img src="../../snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">73</td>
+              <td class="coverNumDflt">68</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/extensions/static-a-token/index.html b/report/extensions/static-a-token/index.html
new file mode 100644
index 00000000..d190267e
--- /dev/null
+++ b/report/extensions/static-a-token/index.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - extensions/static-a-token</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - extensions/static-a-token</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryMed">89.4&nbsp;%</td>
+            <td class="headerCovTableEntry">208</td>
+            <td class="headerCovTableEntry">186</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryMed">84.2&nbsp;%</td>
+            <td class="headerCovTableEntry">57</td>
+            <td class="headerCovTableEntry">48</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC20AaveLMUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol">ERC20AaveLMUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=92 height=10 alt="92.5%"><img src="../../snow.png" width=8 height=10 alt="92.5%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">92.5&nbsp;%</td>
+              <td class="coverNumDflt">93</td>
+              <td class="coverNumDflt">86</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">22</td>
+              <td class="coverNumDflt">20</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="ERC4626StataTokenUpgradeable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol">ERC4626StataTokenUpgradeable.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=93 height=10 alt="93.2%"><img src="../../snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">73</td>
+              <td class="coverNumDflt">68</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenFactory.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenFactory.sol">StataTokenFactory.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">60.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">3</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="StataTokenV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token/StataTokenV2.sol">StataTokenV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=86 height=10 alt="85.7%"><img src="../../snow.png" width=14 height=10 alt="85.7%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">85.7&nbsp;%</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">72.7&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">8</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/gcov.css b/report/gcov.css
index f3290428..6c23ba93 100644
--- a/report/gcov.css
+++ b/report/gcov.css
@@ -187,6 +187,17 @@ td.coverFile
   font-family: monospace;
 }
 
+/* Directory view/File view (all): directory name entry format */
+td.coverDirectory
+{
+  text-align: left;
+  padding-left: 10px;
+  padding-right: 20px;
+  color: #284fa8;
+  background-color: #b8d0ff;
+  font-family: monospace;
+}
+
 /* Directory view/File view (all): filename entry format */
 td.overallOwner
 {
@@ -528,12 +539,29 @@ pre.source
   margin-top: 2px;
 }
 
+/* elided/removed code */
+span.elidedSource
+{
+  font-family: sans-serif;
+  /*font-size: 8pt; */
+  font-style: italic;
+  background-color: lightgrey;
+}
+
 /* Source code view: line number format */
 span.lineNum
 {
   background-color: #efe383;
 }
 
+/* Source code view: line number format when there are deleted
+   lines in the corresponding location */
+span.lineNumWithDelete
+{
+  foreground-color: #efe383;
+  background-color: lightgrey;
+}
+
 /* Source code view: format for Cov legend */
 span.coverLegendCov
 {
@@ -634,7 +662,7 @@ a.branchTla:visited
   color: #000000;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered New Code (+ => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered New Code (+ => 0):
 Newly added code is not tested" */
 td.tlaUNC
 {
@@ -645,7 +673,7 @@ td.tlaBgUNC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered New Code (+ => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered New Code (+ => 0):
 Newly added code is not tested" */
 span.tlaUNC
 {
@@ -670,7 +698,7 @@ td.headerCovTableHeadUNC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Lost Baseline Coverage (1 => 0):
+/* Source code view/table entry background: format for lines classified as "Lost Baseline Coverage (1 => 0):
 Unchanged code is no longer tested" */
 td.tlaLBC
 {
@@ -681,7 +709,7 @@ td.tlaBgLBC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Lost Baseline Coverage (1 => 0):
+/* Source code view/table entry background: format for lines classified as "Lost Baseline Coverage (1 => 0):
 Unchanged code is no longer tested" */
 span.tlaLBC
 {
@@ -706,7 +734,7 @@ td.headerCovTableHeadLBC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered Included Code (# => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered Included Code (# => 0):
 Previously unused code is untested" */
 td.tlaUIC
 {
@@ -717,7 +745,7 @@ td.tlaBgUIC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered Included Code (# => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered Included Code (# => 0):
 Previously unused code is untested" */
 span.tlaUIC
 {
@@ -742,7 +770,7 @@ td.headerCovTableHeadUIC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered Baseline Code (0 => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered Baseline Code (0 => 0):
 Unchanged code was untested before, is untested now" */
 td.tlaUBC
 {
@@ -753,7 +781,7 @@ td.tlaBgUBC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Uncovered Baseline Code (0 => 0):
+/* Source code view/table entry background: format for lines classified as "Uncovered Baseline Code (0 => 0):
 Unchanged code was untested before, is untested now" */
 span.tlaUBC
 {
@@ -778,7 +806,7 @@ td.headerCovTableHeadUBC {
   background-color: #FF6230;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained Baseline Coverage (0 => 1):
+/* Source code view/table entry background: format for lines classified as "Gained Baseline Coverage (0 => 1):
 Unchanged code is tested now" */
 td.tlaGBC
 {
@@ -789,7 +817,7 @@ td.tlaBgGBC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained Baseline Coverage (0 => 1):
+/* Source code view/table entry background: format for lines classified as "Gained Baseline Coverage (0 => 1):
 Unchanged code is tested now" */
 span.tlaGBC
 {
@@ -814,7 +842,7 @@ td.headerCovTableHeadGBC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained Included Coverage (# => 1):
+/* Source code view/table entry background: format for lines classified as "Gained Included Coverage (# => 1):
 Previously unused code is tested now" */
 td.tlaGIC
 {
@@ -825,7 +853,7 @@ td.tlaBgGIC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained Included Coverage (# => 1):
+/* Source code view/table entry background: format for lines classified as "Gained Included Coverage (# => 1):
 Previously unused code is tested now" */
 span.tlaGIC
 {
@@ -850,7 +878,7 @@ td.headerCovTableHeadGIC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained New Coverage (+ => 1):
+/* Source code view/table entry background: format for lines classified as "Gained New Coverage (+ => 1):
 Newly added code is tested" */
 td.tlaGNC
 {
@@ -861,7 +889,7 @@ td.tlaBgGNC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Gained New Coverage (+ => 1):
+/* Source code view/table entry background: format for lines classified as "Gained New Coverage (+ => 1):
 Newly added code is tested" */
 span.tlaGNC
 {
@@ -886,7 +914,7 @@ td.headerCovTableHeadGNC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Covered Baseline Code (1 => 1):
+/* Source code view/table entry background: format for lines classified as "Covered Baseline Code (1 => 1):
 Unchanged code was tested before and is still tested" */
 td.tlaCBC
 {
@@ -897,7 +925,7 @@ td.tlaBgCBC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Covered Baseline Code (1 => 1):
+/* Source code view/table entry background: format for lines classified as "Covered Baseline Code (1 => 1):
 Unchanged code was tested before and is still tested" */
 span.tlaCBC
 {
@@ -922,7 +950,7 @@ td.headerCovTableHeadCBC {
   background-color: #CAD7FE;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Excluded Uncovered Baseline (0 => #):
+/* Source code view/table entry background: format for lines classified as "Excluded Uncovered Baseline (0 => #):
 Previously untested code is unused now" */
 td.tlaEUB
 {
@@ -933,7 +961,7 @@ td.tlaBgEUB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Excluded Uncovered Baseline (0 => #):
+/* Source code view/table entry background: format for lines classified as "Excluded Uncovered Baseline (0 => #):
 Previously untested code is unused now" */
 span.tlaEUB
 {
@@ -958,7 +986,7 @@ td.headerCovTableHeadEUB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Excluded Covered Baseline (1 => #):
+/* Source code view/table entry background: format for lines classified as "Excluded Covered Baseline (1 => #):
 Previously tested code is unused now" */
 td.tlaECB
 {
@@ -969,7 +997,7 @@ td.tlaBgECB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Excluded Covered Baseline (1 => #):
+/* Source code view/table entry background: format for lines classified as "Excluded Covered Baseline (1 => #):
 Previously tested code is unused now" */
 span.tlaECB
 {
@@ -994,7 +1022,7 @@ td.headerCovTableHeadECB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Deleted Uncovered Baseline (0 => -):
+/* Source code view/table entry background: format for lines classified as "Deleted Uncovered Baseline (0 => -):
 Previously untested code has been deleted" */
 td.tlaDUB
 {
@@ -1005,7 +1033,7 @@ td.tlaBgDUB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Deleted Uncovered Baseline (0 => -):
+/* Source code view/table entry background: format for lines classified as "Deleted Uncovered Baseline (0 => -):
 Previously untested code has been deleted" */
 span.tlaDUB
 {
@@ -1030,7 +1058,7 @@ td.headerCovTableHeadDUB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Deleted Covered Baseline (1 => -):
+/* Source code view/table entry background: format for lines classified as "Deleted Covered Baseline (1 => -):
 Previously tested code has been deleted" */
 td.tlaDCB
 {
@@ -1041,7 +1069,7 @@ td.tlaBgDCB {
   background-color: #FFFFFF;
 }
 
-/* Source code view/table entry backround: format for lines classified as "Deleted Covered Baseline (1 => -):
+/* Source code view/table entry background: format for lines classified as "Deleted Covered Baseline (1 => -):
 Previously tested code has been deleted" */
 span.tlaDCB
 {
diff --git a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func-c.html b/report/helpers/L2Encoder.sol.func-c.html
similarity index 67%
rename from report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func-c.html
rename to report/helpers/L2Encoder.sol.func-c.html
index 5ef0d0b6..5a58c656 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func-c.html
+++ b/report/helpers/L2Encoder.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/L2Encoder.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/L2Encoder.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - L2Encoder.sol<span style="font-size: 80%;"> (<a href="L2Encoder.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - L2Encoder.sol<span style="font-size: 80%;"> (<a href="L2Encoder.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">68</td>
-            <td class="headerCovTableEntry">68</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">57</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,33 +53,33 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="L2Encoder.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="L2Encoder.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L308">L2Encoder.encodeLiquidationCall</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L20">L2Encoder.</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L264">L2Encoder.encodeRebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L268">L2Encoder.encodeLiquidationCall</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -100,14 +100,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L284">L2Encoder.encodeSetUserUseReserveAsCollateral</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L244">L2Encoder.encodeSwapBorrowRateMode</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L244">L2Encoder.encodeSetUserUseReserveAsCollateral</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -152,8 +145,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func.html b/report/helpers/L2Encoder.sol.func.html
similarity index 67%
rename from report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func.html
rename to report/helpers/L2Encoder.sol.func.html
index 6a118e88..09697cc0 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.func.html
+++ b/report/helpers/L2Encoder.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/L2Encoder.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/L2Encoder.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - L2Encoder.sol<span style="font-size: 80%;"> (<a href="L2Encoder.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - L2Encoder.sol<span style="font-size: 80%;"> (<a href="L2Encoder.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">68</td>
-            <td class="headerCovTableEntry">68</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">57</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,40 +53,40 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="L2Encoder.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="L2Encoder.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L124">L2Encoder.encodeBorrowParams</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L20">L2Encoder.</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L308">L2Encoder.encodeLiquidationCall</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L124">L2Encoder.encodeBorrowParams</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L264">L2Encoder.encodeRebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L268">L2Encoder.encodeLiquidationCall</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -114,7 +114,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L284">L2Encoder.encodeSetUserUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L244">L2Encoder.encodeSetUserUseReserveAsCollateral</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -133,13 +133,6 @@
               <td class="coverFnHi">1000</td>
               
               
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L244">L2Encoder.encodeSwapBorrowRateMode</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
             </tr>
             <tr>
               <td class="coverFn"><a href="L2Encoder.sol.gcov.html#L101">L2Encoder.encodeWithdrawParams</a></td>
@@ -152,8 +145,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.gcov.html b/report/helpers/L2Encoder.sol.gcov.html
similarity index 77%
rename from report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.gcov.html
rename to report/helpers/L2Encoder.sol.gcov.html
index 37fa7d60..5ae42100 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/L2Encoder.sol.gcov.html
+++ b/report/helpers/L2Encoder.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/L2Encoder.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/L2Encoder.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - L2Encoder.sol<span style="font-size: 80%;"> (source / <a href="L2Encoder.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - L2Encoder.sol<span style="font-size: 80%;"> (source / <a href="L2Encoder.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">68</td>
-            <td class="headerCovTableEntry">68</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">57</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntryHi">90.0&nbsp;%</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -91,7 +91,7 @@
 <span id="L20"><span class="lineNum">      20</span>                 :             :    * @param pool The address of the Pool contract</span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :    */</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             :   constructor(IPool pool) {</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :     POOL = pool;</span>
+<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     POOL = pool;</span></span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :   }</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             : </span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :   /**</span>
@@ -103,21 +103,21 @@
 <span id="L32"><span class="lineNum">      32</span>                 :             :    *   0 if the action is executed directly by the user, without any middle-man</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :    * @return compact representation of supply parameters</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :    */</span>
-<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC tlaBgGNC">           7 :   function encodeSupplyParams(</span></span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   function encodeSupplyParams(</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :     address asset,</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :     uint256 amount,</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     uint16 referralCode</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">          21 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC tlaBgGNC">           7 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             : </span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">          14 :     uint16 assetId = data.id;</span></span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">          21 :     uint128 shortenedAmount = amount.toUint128();</span></span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">          14 :     bytes32 res;</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">           7 :     uint16 assetId = data.id;</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">           7 :     uint128 shortenedAmount = amount.toUint128();</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">           7 :     bytes32 res;</span></span>
 <span id="L45"><span class="lineNum">      45</span>                 :             : </span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :     assembly {</span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">          14 :       res := add(assetId, add(shl(16, shortenedAmount), shl(144, referralCode)))</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           7 :       res := add(assetId, add(shl(16, shortenedAmount), shl(144, referralCode)))</span></span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :     }</span>
-<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">          14 :     return res;</span></span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">           7 :     return res;</span></span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :   }</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             : </span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :   /**</span>
@@ -135,7 +135,7 @@
 <span id="L64"><span class="lineNum">      64</span>                 :             :    * @return The R parameter of ERC712 permit sig</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :    * @return The S parameter of ERC712 permit sig</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :    */</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">        1000 :   function encodeSupplyWithPermitParams(</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   function encodeSupplyWithPermitParams(</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     address asset,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     uint256 amount,</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :     uint16 referralCode,</span>
@@ -144,15 +144,15 @@
 <span id="L73"><span class="lineNum">      73</span>                 :             :     bytes32 permitR,</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :     bytes32 permitS</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   ) external view returns (bytes32, bytes32, bytes32) {</span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">        3000 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">        1000 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">        2000 :     uint16 assetId = data.id;</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">        3000 :     uint128 shortenedAmount = amount.toUint128();</span></span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">        3000 :     uint32 shortenedDeadline = deadline.toUint32();</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">        1000 :     uint16 assetId = data.id;</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">        1000 :     uint128 shortenedAmount = amount.toUint128();</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">        1000 :     uint32 shortenedDeadline = deadline.toUint32();</span></span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">        2000 :     bytes32 res;</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">        1000 :     bytes32 res;</span></span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :     assembly {</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        2000 :       res := add(</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        1000 :       res := add(</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :         assetId,</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :         add(</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :           shl(16, shortenedAmount),</span>
@@ -161,7 +161,7 @@
 <span id="L90"><span class="lineNum">      90</span>                 :             :       )</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :     }</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             : </span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        2000 :     return (res, permitR, permitS);</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        1000 :     return (res, permitR, permitS);</span></span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :   }</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             : </span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   /**</span>
@@ -171,17 +171,17 @@
 <span id="L100"><span class="lineNum">     100</span>                 :             :    * @param amount The underlying amount to be withdrawn</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :    * @return compact representation of withdraw parameters</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :    */</span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">           2 :   function encodeWithdrawParams(address asset, uint256 amount) external view returns (bytes32) {</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           6 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :   function encodeWithdrawParams(address asset, uint256 amount) external view returns (bytes32) {</span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           2 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           4 :     uint16 assetId = data.id;</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           6 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           2 :     uint16 assetId = data.id;</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           2 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             : </span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           4 :     bytes32 res;</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           2 :     bytes32 res;</span></span>
 <span id="L110"><span class="lineNum">     110</span>                 :             :     assembly {</span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           4 :       res := add(assetId, shl(16, shortenedAmount))</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           2 :       res := add(assetId, shl(16, shortenedAmount))</span></span>
 <span id="L112"><span class="lineNum">     112</span>                 :             :     }</span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           4 :     return res;</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           2 :     return res;</span></span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :   }</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             : </span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :   /**</span>
@@ -189,25 +189,25 @@
 <span id="L118"><span class="lineNum">     118</span>                 :             :    * @dev Without an onBehalfOf parameter as the compact calls to L2Pool will use msg.sender as onBehalfOf</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :    * @param asset The address of the underlying asset to borrow</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :    * @param amount The amount to be borrowed</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :    * @param interestRateMode The interest rate mode at which the user wants to borrow: 1 for Stable, 2 for Variable</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :    * @param interestRateMode The interest rate mode at which the user wants to borrow: 2 for Variable, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.</span>
 <span id="L123"><span class="lineNum">     123</span>                 :             :    *   0 if the action is executed directly by the user, without any middle-man</span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :    * @return compact representation of withdraw parameters</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             :    */</span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           3 :   function encodeBorrowParams(</span></span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :   function encodeBorrowParams(</span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :     address asset,</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     uint256 amount,</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :     uint256 interestRateMode,</span>
 <span id="L130"><span class="lineNum">     130</span>                 :             :     uint16 referralCode</span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           9 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           6 :     uint16 assetId = data.id;</span></span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           9 :     uint128 shortenedAmount = amount.toUint128();</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           9 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">           6 :     bytes32 res;</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           3 :     uint16 assetId = data.id;</span></span>
+<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           3 :     uint128 shortenedAmount = amount.toUint128();</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           3 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">           3 :     bytes32 res;</span></span>
 <span id="L138"><span class="lineNum">     138</span>                 :             :     assembly {</span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           6 :       res := add(</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           3 :       res := add(</span></span>
 <span id="L140"><span class="lineNum">     140</span>                 :             :         assetId,</span>
 <span id="L141"><span class="lineNum">     141</span>                 :             :         add(</span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :           shl(16, shortenedAmount),</span>
@@ -215,7 +215,7 @@
 <span id="L144"><span class="lineNum">     144</span>                 :             :         )</span>
 <span id="L145"><span class="lineNum">     145</span>                 :             :       )</span>
 <span id="L146"><span class="lineNum">     146</span>                 :             :     }</span>
-<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           6 :     return res;</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           3 :     return res;</span></span>
 <span id="L148"><span class="lineNum">     148</span>                 :             :   }</span>
 <span id="L149"><span class="lineNum">     149</span>                 :             : </span>
 <span id="L150"><span class="lineNum">     150</span>                 :             :   /**</span>
@@ -224,25 +224,25 @@
 <span id="L153"><span class="lineNum">     153</span>                 :             :    * @param asset The address of the borrowed underlying asset previously borrowed</span>
 <span id="L154"><span class="lineNum">     154</span>                 :             :    * @param amount The amount to repay</span>
 <span id="L155"><span class="lineNum">     155</span>                 :             :    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `interestRateMode`</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             :    * @return compact representation of repay parameters</span>
 <span id="L158"><span class="lineNum">     158</span>                 :             :    */</span>
-<span id="L159"><span class="lineNum">     159</span>                 :<span class="tlaGNC">           1 :   function encodeRepayParams(</span></span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :   function encodeRepayParams(</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             :     address asset,</span>
 <span id="L161"><span class="lineNum">     161</span>                 :             :     uint256 amount,</span>
 <span id="L162"><span class="lineNum">     162</span>                 :             :     uint256 interestRateMode</span>
 <span id="L163"><span class="lineNum">     163</span>                 :             :   ) public view returns (bytes32) {</span>
-<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">           6 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">           2 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L165"><span class="lineNum">     165</span>                 :             : </span>
-<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">           4 :     uint16 assetId = data.id;</span></span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           6 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           6 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
+<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">           2 :     uint16 assetId = data.id;</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           2 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           2 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
 <span id="L169"><span class="lineNum">     169</span>                 :             : </span>
-<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           4 :     bytes32 res;</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           2 :     bytes32 res;</span></span>
 <span id="L171"><span class="lineNum">     171</span>                 :             :     assembly {</span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           4 :       res := add(assetId, add(shl(16, shortenedAmount), shl(144, shortenedInterestRateMode)))</span></span>
+<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           2 :       res := add(assetId, add(shl(16, shortenedAmount), shl(144, shortenedInterestRateMode)))</span></span>
 <span id="L173"><span class="lineNum">     173</span>                 :             :     }</span>
-<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">           4 :     return res;</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">           2 :     return res;</span></span>
 <span id="L175"><span class="lineNum">     175</span>                 :             :   }</span>
 <span id="L176"><span class="lineNum">     176</span>                 :             : </span>
 <span id="L177"><span class="lineNum">     177</span>                 :             :   /**</span>
@@ -251,7 +251,7 @@
 <span id="L180"><span class="lineNum">     180</span>                 :             :    * @param asset The address of the borrowed underlying asset previously borrowed</span>
 <span id="L181"><span class="lineNum">     181</span>                 :             :    * @param amount The amount to repay</span>
 <span id="L182"><span class="lineNum">     182</span>                 :             :    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L184"><span class="lineNum">     184</span>                 :             :    * @param deadline The deadline timestamp that the permit is valid</span>
 <span id="L185"><span class="lineNum">     185</span>                 :             :    * @param permitV The V parameter of ERC712 permit sig</span>
 <span id="L186"><span class="lineNum">     186</span>                 :             :    * @param permitR The R parameter of ERC712 permit sig</span>
@@ -260,7 +260,7 @@
 <span id="L189"><span class="lineNum">     189</span>                 :             :    * @return The R parameter of ERC712 permit sig</span>
 <span id="L190"><span class="lineNum">     190</span>                 :             :    * @return The S parameter of ERC712 permit sig</span>
 <span id="L191"><span class="lineNum">     191</span>                 :             :    */</span>
-<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">        1000 :   function encodeRepayWithPermitParams(</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :   function encodeRepayWithPermitParams(</span>
 <span id="L193"><span class="lineNum">     193</span>                 :             :     address asset,</span>
 <span id="L194"><span class="lineNum">     194</span>                 :             :     uint256 amount,</span>
 <span id="L195"><span class="lineNum">     195</span>                 :             :     uint256 interestRateMode,</span>
@@ -269,16 +269,16 @@
 <span id="L198"><span class="lineNum">     198</span>                 :             :     bytes32 permitR,</span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :     bytes32 permitS</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             :   ) external view returns (bytes32, bytes32, bytes32) {</span>
-<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        3000 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        1000 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
 <span id="L202"><span class="lineNum">     202</span>                 :             : </span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        2000 :     uint16 assetId = data.id;</span></span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">        3000 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">        3000 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">        3000 :     uint32 shortenedDeadline = deadline.toUint32();</span></span>
+<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        1000 :     uint16 assetId = data.id;</span></span>
+<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">        1000 :     uint128 shortenedAmount = amount == type(uint256).max ? type(uint128).max : amount.toUint128();</span></span>
+<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">        1000 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">        1000 :     uint32 shortenedDeadline = deadline.toUint32();</span></span>
 <span id="L207"><span class="lineNum">     207</span>                 :             : </span>
-<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">        2000 :     bytes32 res;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">        1000 :     bytes32 res;</span></span>
 <span id="L209"><span class="lineNum">     209</span>                 :             :     assembly {</span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">        2000 :       res := add(</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">        1000 :       res := add(</span></span>
 <span id="L211"><span class="lineNum">     211</span>                 :             :         assetId,</span>
 <span id="L212"><span class="lineNum">     212</span>                 :             :         add(</span>
 <span id="L213"><span class="lineNum">     213</span>                 :             :           shl(16, shortenedAmount),</span>
@@ -289,7 +289,7 @@
 <span id="L218"><span class="lineNum">     218</span>                 :             :         )</span>
 <span id="L219"><span class="lineNum">     219</span>                 :             :       )</span>
 <span id="L220"><span class="lineNum">     220</span>                 :             :     }</span>
-<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">        2000 :     return (res, permitR, permitS);</span></span>
+<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">        1000 :     return (res, permitR, permitS);</span></span>
 <span id="L222"><span class="lineNum">     222</span>                 :             :   }</span>
 <span id="L223"><span class="lineNum">     223</span>                 :             : </span>
 <span id="L224"><span class="lineNum">     224</span>                 :             :   /**</span>
@@ -297,114 +297,74 @@
 <span id="L226"><span class="lineNum">     226</span>                 :             :    * @param asset The address of the borrowed underlying asset previously borrowed</span>
 <span id="L227"><span class="lineNum">     227</span>                 :             :    * @param amount The amount to repay</span>
 <span id="L228"><span class="lineNum">     228</span>                 :             :    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :    * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated  (changed on v3.2.0)</span>
 <span id="L230"><span class="lineNum">     230</span>                 :             :    * @return compact representation of repay with aToken parameters</span>
 <span id="L231"><span class="lineNum">     231</span>                 :             :    */</span>
-<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">           1 :   function encodeRepayWithATokensParams(</span></span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :   function encodeRepayWithATokensParams(</span>
 <span id="L233"><span class="lineNum">     233</span>                 :             :     address asset,</span>
 <span id="L234"><span class="lineNum">     234</span>                 :             :     uint256 amount,</span>
 <span id="L235"><span class="lineNum">     235</span>                 :             :     uint256 interestRateMode</span>
 <span id="L236"><span class="lineNum">     236</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           3 :     return encodeRepayParams(asset, amount, interestRateMode);</span></span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           1 :     return encodeRepayParams(asset, amount, interestRateMode);</span></span>
 <span id="L238"><span class="lineNum">     238</span>                 :             :   }</span>
 <span id="L239"><span class="lineNum">     239</span>                 :             : </span>
 <span id="L240"><span class="lineNum">     240</span>                 :             :   /**</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :    * @notice Encodes swap borrow rate mode parameters from standard input to compact representation of 1 bytes32</span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :    * @notice Encodes set user use reserve as collateral parameters from standard input to compact representation of 1 bytes32</span>
 <span id="L242"><span class="lineNum">     242</span>                 :             :    * @param asset The address of the underlying asset borrowed</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :    * @param interestRateMode The current interest rate mode of the position being swapped: 1 for Stable, 2 for Variable</span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :    * @return compact representation of swap borrow rate mode parameters</span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :    * @param useAsCollateral True if the user wants to use the supply as collateral, false otherwise</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :    * @return compact representation of set user use reserve as collateral parameters</span>
 <span id="L245"><span class="lineNum">     245</span>                 :             :    */</span>
-<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">           1 :   function encodeSwapBorrowRateMode(</span></span>
+<span id="L246"><span class="lineNum">     246</span>                 :             :   function encodeSetUserUseReserveAsCollateral(</span>
 <span id="L247"><span class="lineNum">     247</span>                 :             :     address asset,</span>
-<span id="L248"><span class="lineNum">     248</span>                 :             :     uint256 interestRateMode</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             :     bool useAsCollateral</span>
 <span id="L249"><span class="lineNum">     249</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
-<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">           2 :     uint16 assetId = data.id;</span></span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">           3 :     uint8 shortenedInterestRateMode = interestRateMode.toUint8();</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :<span class="tlaGNC">           2 :     bytes32 res;</span></span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :     assembly {</span>
-<span id="L255"><span class="lineNum">     255</span>                 :<span class="tlaGNC">           2 :       res := add(assetId, shl(16, shortenedInterestRateMode))</span></span>
-<span id="L256"><span class="lineNum">     256</span>                 :             :     }</span>
-<span id="L257"><span class="lineNum">     257</span>                 :<span class="tlaGNC">           2 :     return res;</span></span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :   }</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             : </span>
-<span id="L260"><span class="lineNum">     260</span>                 :             :   /**</span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :    * @notice Encodes rebalance stable borrow rate parameters from standard input to compact representation of 1 bytes32</span>
-<span id="L262"><span class="lineNum">     262</span>                 :             :    * @param asset The address of the underlying asset borrowed</span>
-<span id="L263"><span class="lineNum">     263</span>                 :             :    * @param user The address of the user to be rebalanced</span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :    * @return compact representation of rebalance stable borrow rate parameters</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :    */</span>
-<span id="L266"><span class="lineNum">     266</span>                 :<span class="tlaGNC">           1 :   function encodeRebalanceStableBorrowRate(</span></span>
-<span id="L267"><span class="lineNum">     267</span>                 :             :     address asset,</span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :     address user</span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
-<span id="L271"><span class="lineNum">     271</span>                 :<span class="tlaGNC">           2 :     uint16 assetId = data.id;</span></span>
-<span id="L272"><span class="lineNum">     272</span>                 :             : </span>
-<span id="L273"><span class="lineNum">     273</span>                 :<span class="tlaGNC">           2 :     bytes32 res;</span></span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :     assembly {</span>
-<span id="L275"><span class="lineNum">     275</span>                 :<span class="tlaGNC">           2 :       res := add(assetId, shl(16, user))</span></span>
-<span id="L276"><span class="lineNum">     276</span>                 :             :     }</span>
-<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">           2 :     return res;</span></span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :   }</span>
+<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">           1 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
+<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">           1 :     uint16 assetId = data.id;</span></span>
+<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">           1 :     bytes32 res;</span></span>
+<span id="L253"><span class="lineNum">     253</span>                 :             :     assembly {</span>
+<span id="L254"><span class="lineNum">     254</span>                 :<span class="tlaGNC">           1 :       res := add(assetId, shl(16, useAsCollateral))</span></span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :     }</span>
+<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">           1 :     return res;</span></span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :   }</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             : </span>
+<span id="L259"><span class="lineNum">     259</span>                 :             :   /**</span>
+<span id="L260"><span class="lineNum">     260</span>                 :             :    * @notice Encodes liquidation call parameters from standard input to compact representation of 2 bytes32</span>
+<span id="L261"><span class="lineNum">     261</span>                 :             :    * @param collateralAsset The address of the underlying asset used as collateral, to receive as result of the liquidation</span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :    * @param debtAsset The address of the underlying borrowed asset to be repaid with the liquidation</span>
+<span id="L263"><span class="lineNum">     263</span>                 :             :    * @param user The address of the borrower getting liquidated</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :    * @param debtToCover The debt amount of borrowed `asset` the liquidator wants to cover</span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :    * @param receiveAToken True if the liquidators wants to receive the collateral aTokens, `false` if he wants</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :    * to receive the underlying collateral asset directly</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             :    * @return First half ot compact representation of liquidation call parameters</span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :    * @return Second half ot compact representation of liquidation call parameters</span>
+<span id="L269"><span class="lineNum">     269</span>                 :             :    */</span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :   function encodeLiquidationCall(</span>
+<span id="L271"><span class="lineNum">     271</span>                 :             :     address collateralAsset,</span>
+<span id="L272"><span class="lineNum">     272</span>                 :             :     address debtAsset,</span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :     address user,</span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :     uint256 debtToCover,</span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :     bool receiveAToken</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :   ) external view returns (bytes32, bytes32) {</span>
+<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">           1 :     DataTypes.ReserveDataLegacy memory collateralData = POOL.getReserveData(collateralAsset);</span></span>
+<span id="L278"><span class="lineNum">     278</span>                 :<span class="tlaGNC">           1 :     uint16 collateralAssetId = collateralData.id;</span></span>
 <span id="L279"><span class="lineNum">     279</span>                 :             : </span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :   /**</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             :    * @notice Encodes set user use reserve as collateral parameters from standard input to compact representation of 1 bytes32</span>
-<span id="L282"><span class="lineNum">     282</span>                 :             :    * @param asset The address of the underlying asset borrowed</span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :    * @param useAsCollateral True if the user wants to use the supply as collateral, false otherwise</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             :    * @return compact representation of set user use reserve as collateral parameters</span>
-<span id="L285"><span class="lineNum">     285</span>                 :             :    */</span>
-<span id="L286"><span class="lineNum">     286</span>                 :<span class="tlaGNC">           1 :   function encodeSetUserUseReserveAsCollateral(</span></span>
-<span id="L287"><span class="lineNum">     287</span>                 :             :     address asset,</span>
-<span id="L288"><span class="lineNum">     288</span>                 :             :     bool useAsCollateral</span>
-<span id="L289"><span class="lineNum">     289</span>                 :             :   ) external view returns (bytes32) {</span>
-<span id="L290"><span class="lineNum">     290</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);</span></span>
-<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">           2 :     uint16 assetId = data.id;</span></span>
-<span id="L292"><span class="lineNum">     292</span>                 :<span class="tlaGNC">           2 :     bytes32 res;</span></span>
-<span id="L293"><span class="lineNum">     293</span>                 :             :     assembly {</span>
-<span id="L294"><span class="lineNum">     294</span>                 :<span class="tlaGNC">           2 :       res := add(assetId, shl(16, useAsCollateral))</span></span>
-<span id="L295"><span class="lineNum">     295</span>                 :             :     }</span>
-<span id="L296"><span class="lineNum">     296</span>                 :<span class="tlaGNC">           2 :     return res;</span></span>
-<span id="L297"><span class="lineNum">     297</span>                 :             :   }</span>
-<span id="L298"><span class="lineNum">     298</span>                 :             : </span>
-<span id="L299"><span class="lineNum">     299</span>                 :             :   /**</span>
-<span id="L300"><span class="lineNum">     300</span>                 :             :    * @notice Encodes liquidation call parameters from standard input to compact representation of 2 bytes32</span>
-<span id="L301"><span class="lineNum">     301</span>                 :             :    * @param collateralAsset The address of the underlying asset used as collateral, to receive as result of the liquidation</span>
-<span id="L302"><span class="lineNum">     302</span>                 :             :    * @param debtAsset The address of the underlying borrowed asset to be repaid with the liquidation</span>
-<span id="L303"><span class="lineNum">     303</span>                 :             :    * @param user The address of the borrower getting liquidated</span>
-<span id="L304"><span class="lineNum">     304</span>                 :             :    * @param debtToCover The debt amount of borrowed `asset` the liquidator wants to cover</span>
-<span id="L305"><span class="lineNum">     305</span>                 :             :    * @param receiveAToken True if the liquidators wants to receive the collateral aTokens, `false` if he wants</span>
-<span id="L306"><span class="lineNum">     306</span>                 :             :    * to receive the underlying collateral asset directly</span>
-<span id="L307"><span class="lineNum">     307</span>                 :             :    * @return First half ot compact representation of liquidation call parameters</span>
-<span id="L308"><span class="lineNum">     308</span>                 :             :    * @return Second half ot compact representation of liquidation call parameters</span>
-<span id="L309"><span class="lineNum">     309</span>                 :             :    */</span>
-<span id="L310"><span class="lineNum">     310</span>                 :<span class="tlaGNC">           1 :   function encodeLiquidationCall(</span></span>
-<span id="L311"><span class="lineNum">     311</span>                 :             :     address collateralAsset,</span>
-<span id="L312"><span class="lineNum">     312</span>                 :             :     address debtAsset,</span>
-<span id="L313"><span class="lineNum">     313</span>                 :             :     address user,</span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :     uint256 debtToCover,</span>
-<span id="L315"><span class="lineNum">     315</span>                 :             :     bool receiveAToken</span>
-<span id="L316"><span class="lineNum">     316</span>                 :             :   ) external view returns (bytes32, bytes32) {</span>
-<span id="L317"><span class="lineNum">     317</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory collateralData = POOL.getReserveData(collateralAsset);</span></span>
-<span id="L318"><span class="lineNum">     318</span>                 :<span class="tlaGNC">           2 :     uint16 collateralAssetId = collateralData.id;</span></span>
-<span id="L319"><span class="lineNum">     319</span>                 :             : </span>
-<span id="L320"><span class="lineNum">     320</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory debtData = POOL.getReserveData(debtAsset);</span></span>
-<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">           2 :     uint16 debtAssetId = debtData.id;</span></span>
-<span id="L322"><span class="lineNum">     322</span>                 :             : </span>
-<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">           3 :     uint128 shortenedDebtToCover = debtToCover == type(uint256).max</span></span>
-<span id="L324"><span class="lineNum">     324</span>                 :             :       ? type(uint128).max</span>
-<span id="L325"><span class="lineNum">     325</span>                 :             :       : debtToCover.toUint128();</span>
-<span id="L326"><span class="lineNum">     326</span>                 :             : </span>
-<span id="L327"><span class="lineNum">     327</span>                 :<span class="tlaGNC">           2 :     bytes32 res1;</span></span>
-<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">           2 :     bytes32 res2;</span></span>
-<span id="L329"><span class="lineNum">     329</span>                 :             : </span>
-<span id="L330"><span class="lineNum">     330</span>                 :             :     assembly {</span>
-<span id="L331"><span class="lineNum">     331</span>                 :<span class="tlaGNC">           2 :       res1 := add(add(collateralAssetId, shl(16, debtAssetId)), shl(32, user))</span></span>
-<span id="L332"><span class="lineNum">     332</span>                 :<span class="tlaGNC">           2 :       res2 := add(shortenedDebtToCover, shl(128, receiveAToken))</span></span>
-<span id="L333"><span class="lineNum">     333</span>                 :             :     }</span>
-<span id="L334"><span class="lineNum">     334</span>                 :<span class="tlaGNC">           2 :     return (res1, res2);</span></span>
-<span id="L335"><span class="lineNum">     335</span>                 :             :   }</span>
-<span id="L336"><span class="lineNum">     336</span>                 :             : }</span>
+<span id="L280"><span class="lineNum">     280</span>                 :<span class="tlaGNC">           1 :     DataTypes.ReserveDataLegacy memory debtData = POOL.getReserveData(debtAsset);</span></span>
+<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">           1 :     uint16 debtAssetId = debtData.id;</span></span>
+<span id="L282"><span class="lineNum">     282</span>                 :             : </span>
+<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">           1 :     uint128 shortenedDebtToCover = debtToCover == type(uint256).max</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :             :       ? type(uint128).max</span>
+<span id="L285"><span class="lineNum">     285</span>                 :             :       : debtToCover.toUint128();</span>
+<span id="L286"><span class="lineNum">     286</span>                 :             : </span>
+<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">           1 :     bytes32 res1;</span></span>
+<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">           1 :     bytes32 res2;</span></span>
+<span id="L289"><span class="lineNum">     289</span>                 :             : </span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :     assembly {</span>
+<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">           1 :       res1 := add(add(collateralAssetId, shl(16, debtAssetId)), shl(32, user))</span></span>
+<span id="L292"><span class="lineNum">     292</span>                 :<span class="tlaGNC">           1 :       res2 := add(shortenedDebtToCover, shl(128, receiveAToken))</span></span>
+<span id="L293"><span class="lineNum">     293</span>                 :             :     }</span>
+<span id="L294"><span class="lineNum">     294</span>                 :<span class="tlaGNC">           1 :     return (res1, res2);</span></span>
+<span id="L295"><span class="lineNum">     295</span>                 :             :   }</span>
+<span id="L296"><span class="lineNum">     296</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -412,8 +372,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func-c.html b/report/helpers/WrappedTokenGatewayV3.sol.func-c.html
similarity index 66%
rename from report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func-c.html
rename to report/helpers/WrappedTokenGatewayV3.sol.func-c.html
index 839810f6..a0c3b246 100644
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func-c.html
+++ b/report/helpers/WrappedTokenGatewayV3.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/WrappedTokenGatewayV3.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/misc/src/periphery/contracts/misc</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (<a href="WrappedTokenGatewayV3.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (<a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
+            <td class="headerCovTableEntryHi">90.2&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">37</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,89 +53,89 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="WrappedTokenGatewayV3.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="WrappedTokenGatewayV3.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L108">WrappedTokenGatewayV3.borrowETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L98">WrappedTokenGatewayV3.borrowETH</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L180">WrappedTokenGatewayV3.emergencyEtherTransfer</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L171">WrappedTokenGatewayV3.emergencyEtherTransfer</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L170">WrappedTokenGatewayV3.emergencyTokenTransfer</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L161">WrappedTokenGatewayV3.emergencyTokenTransfer</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L187">WrappedTokenGatewayV3.getWETHAddress</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L178">WrappedTokenGatewayV3.getWETHAddress</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L201">WrappedTokenGatewayV3.</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L30">WrappedTokenGatewayV3.</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L54">WrappedTokenGatewayV3.withdrawETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L53">WrappedTokenGatewayV3.withdrawETH</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L128">WrappedTokenGatewayV3.withdrawETHWithPermit</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L119">WrappedTokenGatewayV3.withdrawETHWithPermit</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L75">WrappedTokenGatewayV3.repayETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L73">WrappedTokenGatewayV3.repayETH</a></td>
               
               <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L158">WrappedTokenGatewayV3._safeTransferETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L149">WrappedTokenGatewayV3._safeTransferETH</a></td>
               
               <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L44">WrappedTokenGatewayV3.depositETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L43">WrappedTokenGatewayV3.depositETH</a></td>
               
               <td class="coverFnHi">8</td>
               
@@ -145,8 +145,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func.html b/report/helpers/WrappedTokenGatewayV3.sol.func.html
similarity index 66%
rename from report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func.html
rename to report/helpers/WrappedTokenGatewayV3.sol.func.html
index 8970b385..7ee3be56 100644
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.func.html
+++ b/report/helpers/WrappedTokenGatewayV3.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/WrappedTokenGatewayV3.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/misc/src/periphery/contracts/misc</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (<a href="WrappedTokenGatewayV3.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (<a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
+            <td class="headerCovTableEntryHi">90.2&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">37</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,89 +53,89 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="WrappedTokenGatewayV3.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="WrappedTokenGatewayV3.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L201">WrappedTokenGatewayV3.</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L30">WrappedTokenGatewayV3.</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L158">WrappedTokenGatewayV3._safeTransferETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L149">WrappedTokenGatewayV3._safeTransferETH</a></td>
               
               <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L108">WrappedTokenGatewayV3.borrowETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L98">WrappedTokenGatewayV3.borrowETH</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L44">WrappedTokenGatewayV3.depositETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L43">WrappedTokenGatewayV3.depositETH</a></td>
               
               <td class="coverFnHi">8</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L180">WrappedTokenGatewayV3.emergencyEtherTransfer</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L171">WrappedTokenGatewayV3.emergencyEtherTransfer</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L170">WrappedTokenGatewayV3.emergencyTokenTransfer</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L161">WrappedTokenGatewayV3.emergencyTokenTransfer</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L187">WrappedTokenGatewayV3.getWETHAddress</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L178">WrappedTokenGatewayV3.getWETHAddress</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L75">WrappedTokenGatewayV3.repayETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L73">WrappedTokenGatewayV3.repayETH</a></td>
               
               <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L54">WrappedTokenGatewayV3.withdrawETH</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L53">WrappedTokenGatewayV3.withdrawETH</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L128">WrappedTokenGatewayV3.withdrawETHWithPermit</a></td>
+              <td class="coverFn"><a href="WrappedTokenGatewayV3.sol.gcov.html#L119">WrappedTokenGatewayV3.withdrawETHWithPermit</a></td>
               
               <td class="coverFnHi">2</td>
               
@@ -145,8 +145,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.gcov.html b/report/helpers/WrappedTokenGatewayV3.sol.gcov.html
similarity index 73%
rename from report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.gcov.html
rename to report/helpers/WrappedTokenGatewayV3.sol.gcov.html
index 9e54be92..dd54419f 100644
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol.gcov.html
+++ b/report/helpers/WrappedTokenGatewayV3.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - helpers/WrappedTokenGatewayV3.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/misc/src/periphery/contracts/misc</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (source / <a href="WrappedTokenGatewayV3.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory helpers">helpers</a> - WrappedTokenGatewayV3.sol<span style="font-size: 80%;"> (source / <a href="WrappedTokenGatewayV3.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
+            <td class="headerCovTableEntryHi">90.2&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">37</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,209 +72,200 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IWETH} from 'aave-v3-core/contracts/misc/interfaces/IWETH.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {GPv2SafeERC20} from '../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IWETH} from './interfaces/IWETH.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IPool} from '../interfaces/IPool.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IAToken} from '../interfaces/IAToken.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {UserConfiguration} from '../protocol/libraries/configuration/UserConfiguration.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';</span>
 <span id="L13"><span class="lineNum">      13</span>                 :             : import {IWrappedTokenGatewayV3} from './interfaces/IWrappedTokenGatewayV3.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {DataTypesHelper} from '../libraries/DataTypesHelper.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : </span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : /**</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :  * @dev This contract is an upgrade of the WrappedTokenGatewayV3 contract, with immutable pool address.</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :  * This contract keeps the same interface of the deprecated WrappedTokenGatewayV3 contract.</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :  */</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             : </span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :   IWETH internal immutable WETH;</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :   IPool internal immutable POOL;</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             : </span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   /**</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :    * @dev Sets the WETH address and the PoolAddressesProvider address. Infinite approves pool.</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :    * @param weth Address of the Wrapped Ether contract</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :    * @param owner Address of the owner of this contract</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :    **/</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   constructor(address weth, address owner, IPool pool) {</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :     WETH = IWETH(weth);</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     POOL = pool;</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :     transferOwnership(owner);</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     IWETH(weth).approve(address(pool), type(uint256).max);</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :   }</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             : </span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :   /**</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :    * @dev deposits WETH into the reserve, using native ETH. A corresponding amount of the overlying asset (aTokens)</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :    * is minted.</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :    * @param onBehalfOf address of the user who will receive the aTokens representing the deposit</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :    * @param referralCode integrators are assigned a referral code and can potentially receive rewards.</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :    **/</span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC tlaBgGNC">           8 :   function depositETH(address, address onBehalfOf, uint16 referralCode) external payable override {</span></span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">          16 :     WETH.deposit{value: msg.value}();</span></span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">          16 :     POOL.deposit(address(WETH), msg.value, onBehalfOf, referralCode);</span></span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             : </span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :   /**</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :    * @dev withdraws the WETH _reserves of msg.sender.</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :    * @param amount amount of aWETH to withdraw and receive native ETH</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :    * @param to address of the user who will receive native ETH</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :    */</span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           2 :   function withdrawETH(address, uint256 amount, address to) external override {</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           6 :     IAToken aWETH = IAToken(POOL.getReserveData(address(WETH)).aTokenAddress);</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           6 :     uint256 userBalance = aWETH.balanceOf(msg.sender);</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           4 :     uint256 amountToWithdraw = amount;</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :             : </span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :     // if amount is equal to uint(-1), the user wants to redeem everything</span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           4 :     if (amount == type(uint256).max) {</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           2 :       amountToWithdraw = userBalance;</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :     }</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">           4 :     aWETH.transferFrom(msg.sender, address(this), amountToWithdraw);</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           4 :     POOL.withdraw(address(WETH), amountToWithdraw, address(this));</span></span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           4 :     WETH.withdraw(amountToWithdraw);</span></span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           4 :     _safeTransferETH(to, amountToWithdraw);</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :   }</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             : </span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :   /**</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :    * @dev repays a borrow on the WETH reserve, for the specified amount (or for the whole amount, if uint256(-1) is specified).</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :    * @param amount the amount to repay, or uint256(-1) if the user wants to repay everything</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :    * @param rateMode the rate mode to repay</span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :    * @param onBehalfOf the address for which msg.sender is repaying</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :    */</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           5 :   function repayETH(</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :     address,</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :     uint256 amount,</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :     uint256 rateMode,</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :     address onBehalfOf</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :   ) external payable override {</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">          15 :     (uint256 stableDebt, uint256 variableDebt) = DataTypesHelper.getUserCurrentDebt(</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :             :       onBehalfOf,</span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :       POOL.getReserveData(address(WETH))</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :     );</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             : </span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          15 :     uint256 paybackAmount = DataTypes.InterestRateMode(rateMode) ==</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :       DataTypes.InterestRateMode.STABLE</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :       ? stableDebt</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :       : variableDebt;</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             : </span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">          10 :     if (amount &lt; paybackAmount) {</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           4 :       paybackAmount = amount;</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :     }</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">          10 :     require(msg.value &gt;= paybackAmount, 'msg.value is less than repayment amount');</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">          10 :     WETH.deposit{value: paybackAmount}();</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">          10 :     POOL.repay(address(WETH), paybackAmount, rateMode, onBehalfOf);</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :     // refund remaining dust eth</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">          11 :     if (msg.value &gt; paybackAmount) _safeTransferETH(msg.sender, msg.value - paybackAmount);</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :   /**</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             :    * @dev borrow WETH, unwraps to ETH and send both the ETH and DebtTokens to msg.sender, via `approveDelegation` and onBehalf argument in `Pool.borrow`.</span>
-<span id="L106"><span class="lineNum">     106</span>                 :             :    * @param amount the amount of ETH to borrow</span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :    * @param interestRateMode the interest rate mode</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :    * @param referralCode integrators are assigned a referral code and can potentially receive rewards</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :    */</span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           1 :   function borrowETH(</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :     address,</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :     uint256 amount,</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :     uint256 interestRateMode,</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :     uint16 referralCode</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :   ) external override {</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">           2 :     POOL.borrow(address(WETH), amount, interestRateMode, referralCode, msg.sender);</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           2 :     WETH.withdraw(amount);</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           2 :     _safeTransferETH(msg.sender, amount);</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :   }</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             : </span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :   /**</span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :    * @dev withdraws the WETH _reserves of msg.sender.</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             :    * @param amount amount of aWETH to withdraw and receive native ETH</span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :    * @param to address of the user who will receive native ETH</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             :    * @param deadline validity deadline of permit and so depositWithPermit signature</span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :    * @param permitV V parameter of ERC712 permit sig</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :    * @param permitR R parameter of ERC712 permit sig</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :    * @param permitS S parameter of ERC712 permit sig</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :    */</span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           2 :   function withdrawETHWithPermit(</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :     address,</span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :     uint256 amount,</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             :     address to,</span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :     uint256 deadline,</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :     uint8 permitV,</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :     bytes32 permitR,</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :     bytes32 permitS</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :   ) external override {</span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           6 :     IAToken aWETH = IAToken(POOL.getReserveData(address(WETH)).aTokenAddress);</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           6 :     uint256 userBalance = aWETH.balanceOf(msg.sender);</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           4 :     uint256 amountToWithdraw = amount;</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :             : </span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :     // if amount is equal to type(uint256).max, the user wants to redeem everything</span>
-<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">           4 :     if (amount == type(uint256).max) {</span></span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           2 :       amountToWithdraw = userBalance;</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :     }</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :     // permit `amount` rather than `amountToWithdraw` to make it easier for front-ends and integrators</span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">           4 :     aWETH.permit(msg.sender, address(this), amount, deadline, permitV, permitR, permitS);</span></span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">           4 :     aWETH.transferFrom(msg.sender, address(this), amountToWithdraw);</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">           4 :     POOL.withdraw(address(WETH), amountToWithdraw, address(this));</span></span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           4 :     WETH.withdraw(amountToWithdraw);</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           4 :     _safeTransferETH(to, amountToWithdraw);</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :   }</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             : </span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :   /**</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :    * @dev transfer ETH to an address, revert if it fails.</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :    * @param to recipient of the transfer</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :    * @param value the amount to send</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :    */</span>
-<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">           7 :   function _safeTransferETH(address to, uint256 value) internal {</span></span>
-<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">          21 :     (bool success, ) = to.call{value: value}(new bytes(0));</span></span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">          14 :     require(success, 'ETH_TRANSFER_FAILED');</span></span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :   }</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             : </span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :   /**</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :    * @dev transfer ERC20 from the utility contract, for ERC20 recovery in case of stuck tokens due</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :    * direct transfers to the contract address.</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :    * @param token token to transfer</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :    * @param to recipient of the transfer</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :    * @param amount amount to send</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :    */</span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           1 :   function emergencyTokenTransfer(address token, address to, uint256 amount) external onlyOwner {</span></span>
-<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           2 :     IERC20(token).safeTransfer(to, amount);</span></span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :   }</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             : </span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :   /**</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :    * @dev transfer native Ether from the utility contract, for native Ether recovery in case of stuck Ether</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :    * due to selfdestructs or ether transfers to the pre-computed contract address before deployment.</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :    * @param to recipient of the transfer</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :    * @param amount amount to send</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :    */</span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">           1 :   function emergencyEtherTransfer(address to, uint256 amount) external onlyOwner {</span></span>
-<span id="L183"><span class="lineNum">     183</span>                 :<span class="tlaGNC">           2 :     _safeTransferETH(to, amount);</span></span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :   }</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             : </span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :   /**</span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :    * @dev Get WETH address used by WrappedTokenGatewayV3</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             :    */</span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">           1 :   function getWETHAddress() external view returns (address) {</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">           3 :     return address(WETH);</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :   }</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             : </span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :   /**</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :    * @dev Only WETH contract is allowed to transfer ETH here. Prevent other addresses to send Ether to this contract.</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :    */</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             :   receive() external payable {</span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :     require(msg.sender == address(WETH), 'Receive not allowed');</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :   }</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             : </span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :   /**</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :    * @dev Revert fallback calls</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :    */</span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">           2 :   fallback() external payable {</span></span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">           4 :     revert('Fallback not allowed');</span></span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :   }</span>
-<span id="L206"><span class="lineNum">     206</span>                 :             : }</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : </span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @dev This contract is an upgrade of the WrappedTokenGatewayV3 contract, with immutable pool address.</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  * This contract keeps the same interface of the deprecated WrappedTokenGatewayV3 contract.</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  */</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             : contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             : </span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   IWETH internal immutable WETH;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   IPool internal immutable POOL;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : </span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   /**</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :    * @dev Sets the WETH address and the PoolAddressesProvider address. Infinite approves pool.</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :    * @param weth Address of the Wrapped Ether contract</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :    * @param owner Address of the owner of this contract</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :    **/</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   constructor(address weth, address owner, IPool pool) {</span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     WETH = IWETH(weth);</span></span>
+<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaUNC">           0 :     POOL = pool;</span></span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaUNC">           0 :     transferOwnership(owner);</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaUNC">           0 :     IWETH(weth).approve(address(pool), type(uint256).max);</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   }</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             : </span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   /**</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :    * @dev deposits WETH into the reserve, using native ETH. A corresponding amount of the overlying asset (aTokens)</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :    * is minted.</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :    * @param onBehalfOf address of the user who will receive the aTokens representing the deposit</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :    * @param referralCode integrators are assigned a referral code and can potentially receive rewards.</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :    **/</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function depositETH(address, address onBehalfOf, uint16 referralCode) external payable override {</span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC tlaBgGNC">           8 :     WETH.deposit{value: msg.value}();</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           8 :     POOL.deposit(address(WETH), msg.value, onBehalfOf, referralCode);</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   }</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             : </span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   /**</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :    * @dev withdraws the WETH _reserves of msg.sender.</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :    * @param amount amount of aWETH to withdraw and receive native ETH</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :    * @param to address of the user who will receive native ETH</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :    */</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   function withdrawETH(address, uint256 amount, address to) external override {</span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           2 :     IAToken aWETH = IAToken(POOL.getReserveData(address(WETH)).aTokenAddress);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           2 :     uint256 userBalance = aWETH.balanceOf(msg.sender);</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           2 :     uint256 amountToWithdraw = amount;</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :             : </span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :     // if amount is equal to uint(-1), the user wants to redeem everything</span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           2 :     if (amount == type(uint256).max) {</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           1 :       amountToWithdraw = userBalance;</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :     }</span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           2 :     aWETH.transferFrom(msg.sender, address(this), amountToWithdraw);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">           2 :     POOL.withdraw(address(WETH), amountToWithdraw, address(this));</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           2 :     WETH.withdraw(amountToWithdraw);</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           2 :     _safeTransferETH(to, amountToWithdraw);</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :   }</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             : </span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   /**</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :    * @dev repays a borrow on the WETH reserve, for the specified amount (or for the whole amount, if uint256(-1) is specified).</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :    * @param amount the amount to repay, or uint256(-1) if the user wants to repay everything</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :    * @param onBehalfOf the address for which msg.sender is repaying</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :    */</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   function repayETH(address, uint256 amount, address onBehalfOf) external payable override {</span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           5 :     uint256 paybackAmount = IERC20((POOL.getReserveData(address(WETH))).variableDebtTokenAddress)</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :       .balanceOf(onBehalfOf);</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             : </span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           5 :     if (amount &lt; paybackAmount) {</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           2 :       paybackAmount = amount;</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :     }</span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">           5 :     require(msg.value &gt;= paybackAmount, 'msg.value is less than repayment amount');</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">           5 :     WETH.deposit{value: paybackAmount}();</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           5 :     POOL.repay(</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :       address(WETH),</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :       paybackAmount,</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :       uint256(DataTypes.InterestRateMode.VARIABLE),</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :       onBehalfOf</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :     );</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             : </span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :     // refund remaining dust eth</span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">           5 :     if (msg.value &gt; paybackAmount) _safeTransferETH(msg.sender, msg.value - paybackAmount);</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :   }</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             : </span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   /**</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :    * @dev borrow WETH, unwraps to ETH and send both the ETH and DebtTokens to msg.sender, via `approveDelegation` and onBehalf argument in `Pool.borrow`.</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :    * @param amount the amount of ETH to borrow</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :    * @param referralCode integrators are assigned a referral code and can potentially receive rewards</span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :    */</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   function borrowETH(address, uint256 amount, uint16 referralCode) external override {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           1 :     POOL.borrow(</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :       address(WETH),</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :       amount,</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :       uint256(DataTypes.InterestRateMode.VARIABLE),</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :       referralCode,</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :       msg.sender</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     );</span>
+<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           1 :     WETH.withdraw(amount);</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           1 :     _safeTransferETH(msg.sender, amount);</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             : </span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :   /**</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :    * @dev withdraws the WETH _reserves of msg.sender.</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :    * @param amount amount of aWETH to withdraw and receive native ETH</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :    * @param to address of the user who will receive native ETH</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :    * @param deadline validity deadline of permit and so depositWithPermit signature</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :    * @param permitV V parameter of ERC712 permit sig</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :    * @param permitR R parameter of ERC712 permit sig</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :    * @param permitS S parameter of ERC712 permit sig</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :    */</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   function withdrawETHWithPermit(</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :     address,</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :     uint256 amount,</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :     address to,</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :     uint256 deadline,</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     uint8 permitV,</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :     bytes32 permitR,</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :     bytes32 permitS</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :   ) external override {</span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           2 :     IAToken aWETH = IAToken(POOL.getReserveData(address(WETH)).aTokenAddress);</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           2 :     uint256 userBalance = aWETH.balanceOf(msg.sender);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           2 :     uint256 amountToWithdraw = amount;</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :             : </span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :     // if amount is equal to type(uint256).max, the user wants to redeem everything</span>
+<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           2 :     if (amount == type(uint256).max) {</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           1 :       amountToWithdraw = userBalance;</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :     }</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :     // permit `amount` rather than `amountToWithdraw` to make it easier for front-ends and integrators</span>
+<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           2 :     aWETH.permit(msg.sender, address(this), amount, deadline, permitV, permitR, permitS);</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           2 :     aWETH.transferFrom(msg.sender, address(this), amountToWithdraw);</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           2 :     POOL.withdraw(address(WETH), amountToWithdraw, address(this));</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">           2 :     WETH.withdraw(amountToWithdraw);</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           2 :     _safeTransferETH(to, amountToWithdraw);</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :   }</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             : </span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :   /**</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :    * @dev transfer ETH to an address, revert if it fails.</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :    * @param to recipient of the transfer</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :    * @param value the amount to send</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :    */</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :   function _safeTransferETH(address to, uint256 value) internal {</span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           7 :     (bool success, ) = to.call{value: value}(new bytes(0));</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">           7 :     require(success, 'ETH_TRANSFER_FAILED');</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   }</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             : </span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :   /**</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :    * @dev transfer ERC20 from the utility contract, for ERC20 recovery in case of stuck tokens due</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :    * direct transfers to the contract address.</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :    * @param token token to transfer</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :    * @param to recipient of the transfer</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :    * @param amount amount to send</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :    */</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :   function emergencyTokenTransfer(address token, address to, uint256 amount) external onlyOwner {</span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">           1 :     IERC20(token).safeTransfer(to, amount);</span></span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :   }</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             : </span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :   /**</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :    * @dev transfer native Ether from the utility contract, for native Ether recovery in case of stuck Ether</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :    * due to selfdestructs or ether transfers to the pre-computed contract address before deployment.</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :    * @param to recipient of the transfer</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :    * @param amount amount to send</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :    */</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :   function emergencyEtherTransfer(address to, uint256 amount) external onlyOwner {</span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">           1 :     _safeTransferETH(to, amount);</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :   }</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             : </span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :   /**</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :    * @dev Get WETH address used by WrappedTokenGatewayV3</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :    */</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :   function getWETHAddress() external view returns (address) {</span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           1 :     return address(WETH);</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :   }</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             : </span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :   /**</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :    * @dev Only WETH contract is allowed to transfer ETH here. Prevent other addresses to send Ether to this contract.</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :    */</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :   receive() external payable {</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :     require(msg.sender == address(WETH), 'Receive not allowed');</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :   }</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             : </span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :   /**</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :    * @dev Revert fallback calls</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :    */</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :   fallback() external payable {</span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">           2 :     revert('Fallback not allowed');</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :   }</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -282,8 +273,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/helpers/index-sort-b.html b/report/helpers/index-sort-b.html
new file mode 100644
index 00000000..913d2408
--- /dev/null
+++ b/report/helpers/index-sort-b.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - helpers</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - helpers</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
+            <td class="headerCovTableEntry">99</td>
+            <td class="headerCovTableEntry">94</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">19</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Encoder.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/L2Encoder.sol">L2Encoder.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/WrappedTokenGatewayV3.sol">WrappedTokenGatewayV3.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=90 height=10 alt="90.2%"><img src="../snow.png" width=10 height=10 alt="90.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">90.2&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/helpers/index-sort-f.html b/report/helpers/index-sort-f.html
new file mode 100644
index 00000000..9a72208b
--- /dev/null
+++ b/report/helpers/index-sort-f.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - helpers</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - helpers</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
+            <td class="headerCovTableEntry">99</td>
+            <td class="headerCovTableEntry">94</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">19</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Encoder.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/L2Encoder.sol">L2Encoder.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/WrappedTokenGatewayV3.sol">WrappedTokenGatewayV3.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=90 height=10 alt="90.2%"><img src="../snow.png" width=10 height=10 alt="90.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">90.2&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/helpers/index-sort-l.html b/report/helpers/index-sort-l.html
new file mode 100644
index 00000000..61f2165b
--- /dev/null
+++ b/report/helpers/index-sort-l.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - helpers</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - helpers</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
+            <td class="headerCovTableEntry">99</td>
+            <td class="headerCovTableEntry">94</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">19</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/WrappedTokenGatewayV3.sol">WrappedTokenGatewayV3.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=90 height=10 alt="90.2%"><img src="../snow.png" width=10 height=10 alt="90.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">90.2&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Encoder.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/L2Encoder.sol">L2Encoder.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/helpers/index.html b/report/helpers/index.html
new file mode 100644
index 00000000..f94d5a6d
--- /dev/null
+++ b/report/helpers/index.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - helpers</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - helpers</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
+            <td class="headerCovTableEntry">99</td>
+            <td class="headerCovTableEntry">94</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">19</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Encoder.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/L2Encoder.sol">L2Encoder.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers/WrappedTokenGatewayV3.sol">WrappedTokenGatewayV3.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=90 height=10 alt="90.2%"><img src="../snow.png" width=10 height=10 alt="90.2%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">90.2&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/index-sort-b.html b/report/index-sort-b.html
index 5f1a2742..cd0fba43 100644
--- a/report/index-sort-b.html
+++ b/report/index-sort-b.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
-            <td class="headerCovTableEntry">1826</td>
-            <td class="headerCovTableEntry">1795</td>
+            <td class="headerCovTableEntryHi">96.4&nbsp;%</td>
+            <td class="headerCovTableEntry">2009</td>
+            <td class="headerCovTableEntry">1937</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
-            <td class="headerCovTableEntry">469</td>
-            <td class="headerCovTableEntry">463</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">545</td>
+            <td class="headerCovTableEntry">520</td>
           </tr>
           <tr>
             <td></td>
@@ -96,229 +96,229 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/misc/src/core/contracts/misc/index.html">core/contracts/misc/src/core/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="extensions/paraswap-adapters/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters">extensions/paraswap-adapters/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=88 height=10 alt="87.8%"><img src="snow.png" width=12 height=10 alt="87.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">93</td>
-              <td class="coverNumDflt">93</td>
+              <td class="coverPerMed">87.8&nbsp;%</td>
+              <td class="coverNumDflt">164</td>
+              <td class="coverNumDflt">144</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
+              <td class="coverPerLo">74.1&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
               <td class="coverNumDflt">20</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a></td>
+              <td class="coverDirectory"><a href="extensions/static-a-token/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token">extensions/static-a-token/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=89 height=10 alt="89.4%"><img src="snow.png" width=11 height=10 alt="89.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">111</td>
-              <td class="coverNumDflt">111</td>
+              <td class="coverPerMed">89.4&nbsp;%</td>
+              <td class="coverNumDflt">208</td>
+              <td class="coverNumDflt">186</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverPerMed">84.2&nbsp;%</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverNumDflt">48</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a></td>
+              <td class="coverDirectory"><a href="helpers/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers">helpers/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="94.9%"><img src="snow.png" width=5 height=10 alt="94.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">94.9&nbsp;%</td>
+              <td class="coverNumDflt">99</td>
+              <td class="coverNumDflt">94</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a></td>
+              <td class="coverDirectory"><a href="instances/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances">instances/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a></td>
+              <td class="coverDirectory"><a href="misc/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc">misc/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="97.9%"><img src="snow.png" width=2 height=10 alt="97.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=93 height=10 alt="93.2%"><img src="snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
               </td>
-              <td class="coverPerHi">97.9&nbsp;%</td>
-              <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">564</td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">88</td>
+              <td class="coverNumDflt">82</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">64</td>
-              <td class="coverNumDflt">64</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">34</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a></td>
+              <td class="coverDirectory"><a href="misc/aave-upgradeability/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability">misc/aave-upgradeability/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a></td>
+              <td class="coverDirectory"><a href="misc/flashloan/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base">misc/flashloan/base/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.1%"><img src="snow.png" width=2 height=10 alt="98.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=50 height=10 alt="50.0%"><img src="snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.1&nbsp;%</td>
-              <td class="coverNumDflt">365</td>
-              <td class="coverNumDflt">358</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">97.6&nbsp;%</td>
-              <td class="coverNumDflt">124</td>
-              <td class="coverNumDflt">121</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a></td>
+              <td class="coverDirectory"><a href="protocol/configuration/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration">protocol/configuration/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="95.4%"><img src="snow.png" width=5 height=10 alt="95.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">115</td>
-              <td class="coverNumDflt">115</td>
+              <td class="coverPerHi">95.4&nbsp;%</td>
+              <td class="coverNumDflt">108</td>
+              <td class="coverNumDflt">103</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">35</td>
-              <td class="coverNumDflt">35</td>
+              <td class="coverPerHi">96.1&nbsp;%</td>
+              <td class="coverNumDflt">51</td>
+              <td class="coverNumDflt">49</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/logic/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic">protocol/libraries/logic/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=91 height=10 alt="90.5%"><img src="snow.png" width=9 height=10 alt="90.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.8%"><img src="snow.png" width=1 height=10 alt="99.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">90.5&nbsp;%</td>
-              <td class="coverNumDflt">74</td>
-              <td class="coverNumDflt">67</td>
+              <td class="coverPerHi">99.8&nbsp;%</td>
+              <td class="coverNumDflt">493</td>
+              <td class="coverNumDflt">492</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">47</td>
-              <td class="coverNumDflt">47</td>
+              <td class="coverNumDflt">54</td>
+              <td class="coverNumDflt">54</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/instances/src/core/instances/index.html">core/instances/src/core/instances</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/math/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math">protocol/libraries/math/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=94 height=10 alt="94.1%"><img src="snow.png" width=6 height=10 alt="94.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=96 height=10 alt="95.6%"><img src="snow.png" width=4 height=10 alt="95.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">94.1&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
-              <td class="coverNumDflt">32</td>
+              <td class="coverPerHi">95.6&nbsp;%</td>
+              <td class="coverNumDflt">45</td>
+              <td class="coverNumDflt">43</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
               <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a></td>
+              <td class="coverDirectory"><a href="protocol/pool/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool">protocol/pool/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.3%"><img src="snow.png" width=1 height=10 alt="99.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.4%"><img src="snow.png" width=1 height=10 alt="99.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.3&nbsp;%</td>
-              <td class="coverNumDflt">140</td>
-              <td class="coverNumDflt">139</td>
+              <td class="coverPerHi">99.4&nbsp;%</td>
+              <td class="coverNumDflt">331</td>
+              <td class="coverNumDflt">329</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">95.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverNumDflt">119</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/libraries/src/periphery/contracts/libraries/index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization">protocol/tokenization/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">55</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">30</td>
+              <td class="coverNumDflt">30</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/misc/src/periphery/contracts/misc/index.html">periphery/contracts/misc/src/periphery/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base">protocol/tokenization/base/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
+              <td class="coverNumDflt">124</td>
+              <td class="coverNumDflt">124</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">97.6&nbsp;%</td>
+              <td class="coverNumDflt">42</td>
+              <td class="coverNumDflt">41</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/src/periphery/contracts/rewards/index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a></td>
+              <td class="coverDirectory"><a href="rewards/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards">rewards/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="98.6%"><img src="snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">214</td>
-              <td class="coverNumDflt">212</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">219</td>
+              <td class="coverNumDflt">216</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverPerHi">96.7&nbsp;%</td>
+              <td class="coverNumDflt">61</td>
+              <td class="coverNumDflt">59</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a></td>
+              <td class="coverDirectory"><a href="rewards/transfer-strategies/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies">rewards/transfer-strategies/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">15</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">20</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">93.3&nbsp;%</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">14</td>
             </tr>
           </table>
           </center>
@@ -326,7 +326,7 @@
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="ruler"><img src="glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/index-sort-f.html b/report/index-sort-f.html
index 0c255fb4..1f749f29 100644
--- a/report/index-sort-f.html
+++ b/report/index-sort-f.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
-            <td class="headerCovTableEntry">1826</td>
-            <td class="headerCovTableEntry">1795</td>
+            <td class="headerCovTableEntryHi">96.4&nbsp;%</td>
+            <td class="headerCovTableEntry">2009</td>
+            <td class="headerCovTableEntry">1937</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
-            <td class="headerCovTableEntry">469</td>
-            <td class="headerCovTableEntry">463</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">545</td>
+            <td class="headerCovTableEntry">520</td>
           </tr>
           <tr>
             <td></td>
@@ -96,229 +96,229 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/instances/src/core/instances/index.html">core/instances/src/core/instances</a></td>
+              <td class="coverDirectory"><a href="misc/flashloan/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base">misc/flashloan/base/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=94 height=10 alt="94.1%"><img src="snow.png" width=6 height=10 alt="94.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=50 height=10 alt="50.0%"><img src="snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">94.1&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
-              <td class="coverNumDflt">32</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a></td>
+              <td class="coverDirectory"><a href="extensions/paraswap-adapters/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters">extensions/paraswap-adapters/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.3%"><img src="snow.png" width=1 height=10 alt="99.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=88 height=10 alt="87.8%"><img src="snow.png" width=12 height=10 alt="87.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.3&nbsp;%</td>
-              <td class="coverNumDflt">140</td>
-              <td class="coverNumDflt">139</td>
+              <td class="coverPerMed">87.8&nbsp;%</td>
+              <td class="coverNumDflt">164</td>
+              <td class="coverNumDflt">144</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverPerLo">74.1&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
               <td class="coverNumDflt">20</td>
-              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a></td>
+              <td class="coverDirectory"><a href="extensions/static-a-token/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token">extensions/static-a-token/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.1%"><img src="snow.png" width=2 height=10 alt="98.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=89 height=10 alt="89.4%"><img src="snow.png" width=11 height=10 alt="89.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.1&nbsp;%</td>
-              <td class="coverNumDflt">365</td>
-              <td class="coverNumDflt">358</td>
+              <td class="coverPerMed">89.4&nbsp;%</td>
+              <td class="coverNumDflt">208</td>
+              <td class="coverNumDflt">186</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">97.6&nbsp;%</td>
-              <td class="coverNumDflt">124</td>
-              <td class="coverNumDflt">121</td>
+              <td class="coverPerMed">84.2&nbsp;%</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverNumDflt">48</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a></td>
+              <td class="coverDirectory"><a href="rewards/transfer-strategies/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies">rewards/transfer-strategies/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">20</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">93.3&nbsp;%</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">14</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/libraries/src/periphery/contracts/libraries/index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a></td>
+              <td class="coverDirectory"><a href="helpers/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers">helpers/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="94.9%"><img src="snow.png" width=5 height=10 alt="94.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">94.9&nbsp;%</td>
+              <td class="coverNumDflt">99</td>
+              <td class="coverNumDflt">94</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a></td>
+              <td class="coverDirectory"><a href="protocol/configuration/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration">protocol/configuration/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="95.4%"><img src="snow.png" width=5 height=10 alt="95.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">95.4&nbsp;%</td>
+              <td class="coverNumDflt">108</td>
+              <td class="coverNumDflt">103</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverPerHi">96.1&nbsp;%</td>
+              <td class="coverNumDflt">51</td>
+              <td class="coverNumDflt">49</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a></td>
+              <td class="coverDirectory"><a href="rewards/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards">rewards/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="98.6%"><img src="snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">219</td>
+              <td class="coverNumDflt">216</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">96.7&nbsp;%</td>
+              <td class="coverNumDflt">61</td>
+              <td class="coverNumDflt">59</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/misc/src/periphery/contracts/misc/index.html">periphery/contracts/misc/src/periphery/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="misc/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc">misc/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=93 height=10 alt="93.2%"><img src="snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">88</td>
+              <td class="coverNumDflt">82</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">34</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base">protocol/tokenization/base/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">15</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">124</td>
+              <td class="coverNumDflt">124</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">97.6&nbsp;%</td>
+              <td class="coverNumDflt">42</td>
+              <td class="coverNumDflt">41</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/misc/src/core/contracts/misc/index.html">core/contracts/misc/src/core/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/math/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math">protocol/libraries/math/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=96 height=10 alt="95.6%"><img src="snow.png" width=4 height=10 alt="95.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">93</td>
-              <td class="coverNumDflt">93</td>
+              <td class="coverPerHi">95.6&nbsp;%</td>
+              <td class="coverNumDflt">45</td>
+              <td class="coverNumDflt">43</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
-              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a></td>
+              <td class="coverDirectory"><a href="instances/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances">instances/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">115</td>
-              <td class="coverNumDflt">115</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">35</td>
-              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a></td>
+              <td class="coverDirectory"><a href="misc/aave-upgradeability/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability">misc/aave-upgradeability/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=91 height=10 alt="90.5%"><img src="snow.png" width=9 height=10 alt="90.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">90.5&nbsp;%</td>
-              <td class="coverNumDflt">74</td>
-              <td class="coverNumDflt">67</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">47</td>
-              <td class="coverNumDflt">47</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization">protocol/tokenization/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">111</td>
-              <td class="coverNumDflt">111</td>
+              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">55</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">30</td>
+              <td class="coverNumDflt">30</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/src/periphery/contracts/rewards/index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/logic/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic">protocol/libraries/logic/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.8%"><img src="snow.png" width=1 height=10 alt="99.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">214</td>
-              <td class="coverNumDflt">212</td>
+              <td class="coverPerHi">99.8&nbsp;%</td>
+              <td class="coverNumDflt">493</td>
+              <td class="coverNumDflt">492</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">54</td>
+              <td class="coverNumDflt">54</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a></td>
+              <td class="coverDirectory"><a href="protocol/pool/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool">protocol/pool/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="97.9%"><img src="snow.png" width=2 height=10 alt="97.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.4%"><img src="snow.png" width=1 height=10 alt="99.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">97.9&nbsp;%</td>
-              <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">564</td>
+              <td class="coverPerHi">99.4&nbsp;%</td>
+              <td class="coverNumDflt">331</td>
+              <td class="coverNumDflt">329</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">64</td>
-              <td class="coverNumDflt">64</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverNumDflt">119</td>
             </tr>
           </table>
           </center>
@@ -326,7 +326,7 @@
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="ruler"><img src="glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/index-sort-l.html b/report/index-sort-l.html
index fdb18d18..780d900a 100644
--- a/report/index-sort-l.html
+++ b/report/index-sort-l.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
-            <td class="headerCovTableEntry">1826</td>
-            <td class="headerCovTableEntry">1795</td>
+            <td class="headerCovTableEntryHi">96.4&nbsp;%</td>
+            <td class="headerCovTableEntry">2009</td>
+            <td class="headerCovTableEntry">1937</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
-            <td class="headerCovTableEntry">469</td>
-            <td class="headerCovTableEntry">463</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">545</td>
+            <td class="headerCovTableEntry">520</td>
           </tr>
           <tr>
             <td></td>
@@ -96,88 +96,88 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a></td>
+              <td class="coverDirectory"><a href="misc/flashloan/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base">misc/flashloan/base/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=91 height=10 alt="90.5%"><img src="snow.png" width=9 height=10 alt="90.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=50 height=10 alt="50.0%"><img src="snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">90.5&nbsp;%</td>
-              <td class="coverNumDflt">74</td>
-              <td class="coverNumDflt">67</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">47</td>
-              <td class="coverNumDflt">47</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/instances/src/core/instances/index.html">core/instances/src/core/instances</a></td>
+              <td class="coverDirectory"><a href="rewards/transfer-strategies/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies">rewards/transfer-strategies/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=94 height=10 alt="94.1%"><img src="snow.png" width=6 height=10 alt="94.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">94.1&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
-              <td class="coverNumDflt">32</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">20</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerHi">93.3&nbsp;%</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">14</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a></td>
+              <td class="coverDirectory"><a href="extensions/paraswap-adapters/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters">extensions/paraswap-adapters/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="97.9%"><img src="snow.png" width=2 height=10 alt="97.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=88 height=10 alt="87.8%"><img src="snow.png" width=12 height=10 alt="87.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">97.9&nbsp;%</td>
-              <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">564</td>
+              <td class="coverPerMed">87.8&nbsp;%</td>
+              <td class="coverNumDflt">164</td>
+              <td class="coverNumDflt">144</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">64</td>
-              <td class="coverNumDflt">64</td>
+              <td class="coverPerLo">74.1&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
+              <td class="coverNumDflt">20</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a></td>
+              <td class="coverDirectory"><a href="extensions/static-a-token/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token">extensions/static-a-token/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.1%"><img src="snow.png" width=2 height=10 alt="98.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=89 height=10 alt="89.4%"><img src="snow.png" width=11 height=10 alt="89.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.1&nbsp;%</td>
-              <td class="coverNumDflt">365</td>
-              <td class="coverNumDflt">358</td>
+              <td class="coverPerMed">89.4&nbsp;%</td>
+              <td class="coverNumDflt">208</td>
+              <td class="coverNumDflt">186</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">97.6&nbsp;%</td>
-              <td class="coverNumDflt">124</td>
-              <td class="coverNumDflt">121</td>
+              <td class="coverPerMed">84.2&nbsp;%</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverNumDflt">48</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/src/periphery/contracts/rewards/index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a></td>
+              <td class="coverDirectory"><a href="misc/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc">misc/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=93 height=10 alt="93.2%"><img src="snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">214</td>
-              <td class="coverNumDflt">212</td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">88</td>
+              <td class="coverNumDflt">82</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">34</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a></td>
+              <td class="coverDirectory"><a href="helpers/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers">helpers/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.3%"><img src="snow.png" width=1 height=10 alt="99.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="94.9%"><img src="snow.png" width=5 height=10 alt="94.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.3&nbsp;%</td>
-              <td class="coverNumDflt">140</td>
-              <td class="coverNumDflt">139</td>
+              <td class="coverPerHi">94.9&nbsp;%</td>
+              <td class="coverNumDflt">99</td>
+              <td class="coverNumDflt">94</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -186,139 +186,139 @@
               <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a></td>
+              <td class="coverDirectory"><a href="protocol/configuration/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration">protocol/configuration/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="95.4%"><img src="snow.png" width=5 height=10 alt="95.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">95.4&nbsp;%</td>
+              <td class="coverNumDflt">108</td>
+              <td class="coverNumDflt">103</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">96.1&nbsp;%</td>
+              <td class="coverNumDflt">51</td>
+              <td class="coverNumDflt">49</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/libraries/src/periphery/contracts/libraries/index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/math/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math">protocol/libraries/math/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=96 height=10 alt="95.6%"><img src="snow.png" width=4 height=10 alt="95.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">95.6&nbsp;%</td>
+              <td class="coverNumDflt">45</td>
+              <td class="coverNumDflt">43</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a></td>
+              <td class="coverDirectory"><a href="rewards/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards">rewards/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="98.6%"><img src="snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">219</td>
+              <td class="coverNumDflt">216</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverPerHi">96.7&nbsp;%</td>
+              <td class="coverNumDflt">61</td>
+              <td class="coverNumDflt">59</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a></td>
+              <td class="coverDirectory"><a href="protocol/pool/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool">protocol/pool/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.4%"><img src="snow.png" width=1 height=10 alt="99.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">15</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverPerHi">99.4&nbsp;%</td>
+              <td class="coverNumDflt">331</td>
+              <td class="coverNumDflt">329</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverNumDflt">119</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/logic/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic">protocol/libraries/logic/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.8%"><img src="snow.png" width=1 height=10 alt="99.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverPerHi">99.8&nbsp;%</td>
+              <td class="coverNumDflt">493</td>
+              <td class="coverNumDflt">492</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">54</td>
+              <td class="coverNumDflt">54</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/misc/src/periphery/contracts/misc/index.html">periphery/contracts/misc/src/periphery/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="misc/aave-upgradeability/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability">misc/aave-upgradeability/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/misc/src/core/contracts/misc/index.html">core/contracts/misc/src/core/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="instances/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances">instances/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">93</td>
-              <td class="coverNumDflt">93</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
-              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization">protocol/tokenization/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">111</td>
-              <td class="coverNumDflt">111</td>
+              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">55</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">30</td>
+              <td class="coverNumDflt">30</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base">protocol/tokenization/base/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">115</td>
-              <td class="coverNumDflt">115</td>
+              <td class="coverNumDflt">124</td>
+              <td class="coverNumDflt">124</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">35</td>
-              <td class="coverNumDflt">35</td>
+              <td class="coverPerHi">97.6&nbsp;%</td>
+              <td class="coverNumDflt">42</td>
+              <td class="coverNumDflt">41</td>
             </tr>
           </table>
           </center>
@@ -326,7 +326,7 @@
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="ruler"><img src="glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/index.html b/report/index.html
index c4ee4cdb..1a8e5fc2 100644
--- a/report/index.html
+++ b/report/index.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
-            <td class="headerCovTableEntry">1826</td>
-            <td class="headerCovTableEntry">1795</td>
+            <td class="headerCovTableEntryHi">96.4&nbsp;%</td>
+            <td class="headerCovTableEntry">2009</td>
+            <td class="headerCovTableEntry">1937</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
-            <td class="headerCovTableEntry">469</td>
-            <td class="headerCovTableEntry">463</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">545</td>
+            <td class="headerCovTableEntry">520</td>
           </tr>
           <tr>
             <td></td>
@@ -96,229 +96,229 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/misc/src/core/contracts/misc/index.html">core/contracts/misc/src/core/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="extensions/paraswap-adapters/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/paraswap-adapters">extensions/paraswap-adapters/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=88 height=10 alt="87.8%"><img src="snow.png" width=12 height=10 alt="87.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">93</td>
-              <td class="coverNumDflt">93</td>
+              <td class="coverPerMed">87.8&nbsp;%</td>
+              <td class="coverNumDflt">164</td>
+              <td class="coverNumDflt">144</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
+              <td class="coverPerLo">74.1&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
               <td class="coverNumDflt">20</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a></td>
+              <td class="coverDirectory"><a href="extensions/static-a-token/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/extensions/static-a-token">extensions/static-a-token/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=89 height=10 alt="89.4%"><img src="snow.png" width=11 height=10 alt="89.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">111</td>
-              <td class="coverNumDflt">111</td>
+              <td class="coverPerMed">89.4&nbsp;%</td>
+              <td class="coverNumDflt">208</td>
+              <td class="coverNumDflt">186</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverPerMed">84.2&nbsp;%</td>
+              <td class="coverNumDflt">57</td>
+              <td class="coverNumDflt">48</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a></td>
+              <td class="coverDirectory"><a href="helpers/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/helpers">helpers/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="94.9%"><img src="snow.png" width=5 height=10 alt="94.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">94.9&nbsp;%</td>
+              <td class="coverNumDflt">99</td>
+              <td class="coverNumDflt">94</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a></td>
+              <td class="coverDirectory"><a href="instances/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances">instances/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a></td>
+              <td class="coverDirectory"><a href="misc/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc">misc/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="97.9%"><img src="snow.png" width=2 height=10 alt="97.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=93 height=10 alt="93.2%"><img src="snow.png" width=7 height=10 alt="93.2%"></td></tr></table>
               </td>
-              <td class="coverPerHi">97.9&nbsp;%</td>
-              <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">564</td>
+              <td class="coverPerHi">93.2&nbsp;%</td>
+              <td class="coverNumDflt">88</td>
+              <td class="coverNumDflt">82</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">64</td>
-              <td class="coverNumDflt">64</td>
+              <td class="coverPerHi">97.1&nbsp;%</td>
+              <td class="coverNumDflt">35</td>
+              <td class="coverNumDflt">34</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a></td>
+              <td class="coverDirectory"><a href="misc/aave-upgradeability/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability">misc/aave-upgradeability/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/pool/src/core/contracts/protocol/pool/index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a></td>
+              <td class="coverDirectory"><a href="misc/flashloan/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base">misc/flashloan/base/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.1%"><img src="snow.png" width=2 height=10 alt="98.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=50 height=10 alt="50.0%"><img src="snow.png" width=50 height=10 alt="50.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.1&nbsp;%</td>
-              <td class="coverNumDflt">365</td>
-              <td class="coverNumDflt">358</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">97.6&nbsp;%</td>
-              <td class="coverNumDflt">124</td>
-              <td class="coverNumDflt">121</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a></td>
+              <td class="coverDirectory"><a href="protocol/configuration/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration">protocol/configuration/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=95 height=10 alt="95.4%"><img src="snow.png" width=5 height=10 alt="95.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">115</td>
-              <td class="coverNumDflt">115</td>
+              <td class="coverPerHi">95.4&nbsp;%</td>
+              <td class="coverNumDflt">108</td>
+              <td class="coverNumDflt">103</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">35</td>
-              <td class="coverNumDflt">35</td>
+              <td class="coverPerHi">96.1&nbsp;%</td>
+              <td class="coverNumDflt">51</td>
+              <td class="coverNumDflt">49</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/logic/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic">protocol/libraries/logic/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=91 height=10 alt="90.5%"><img src="snow.png" width=9 height=10 alt="90.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.8%"><img src="snow.png" width=1 height=10 alt="99.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">90.5&nbsp;%</td>
-              <td class="coverNumDflt">74</td>
-              <td class="coverNumDflt">67</td>
+              <td class="coverPerHi">99.8&nbsp;%</td>
+              <td class="coverNumDflt">493</td>
+              <td class="coverNumDflt">492</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">47</td>
-              <td class="coverNumDflt">47</td>
+              <td class="coverNumDflt">54</td>
+              <td class="coverNumDflt">54</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="core/instances/src/core/instances/index.html">core/instances/src/core/instances</a></td>
+              <td class="coverDirectory"><a href="protocol/libraries/math/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math">protocol/libraries/math/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=94 height=10 alt="94.1%"><img src="snow.png" width=6 height=10 alt="94.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=96 height=10 alt="95.6%"><img src="snow.png" width=4 height=10 alt="95.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">94.1&nbsp;%</td>
-              <td class="coverNumDflt">34</td>
-              <td class="coverNumDflt">32</td>
+              <td class="coverPerHi">95.6&nbsp;%</td>
+              <td class="coverNumDflt">45</td>
+              <td class="coverNumDflt">43</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
               <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a></td>
+              <td class="coverDirectory"><a href="protocol/pool/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool">protocol/pool/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.3%"><img src="snow.png" width=1 height=10 alt="99.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.4%"><img src="snow.png" width=1 height=10 alt="99.4%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.3&nbsp;%</td>
-              <td class="coverNumDflt">140</td>
-              <td class="coverNumDflt">139</td>
+              <td class="coverPerHi">99.4&nbsp;%</td>
+              <td class="coverNumDflt">331</td>
+              <td class="coverNumDflt">329</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">95.0&nbsp;%</td>
-              <td class="coverNumDflt">20</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverNumDflt">119</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/libraries/src/periphery/contracts/libraries/index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization">protocol/tokenization/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">55</td>
+              <td class="coverNumDflt">55</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">30</td>
+              <td class="coverNumDflt">30</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/misc/src/periphery/contracts/misc/index.html">periphery/contracts/misc/src/periphery/contracts/misc</a></td>
+              <td class="coverDirectory"><a href="protocol/tokenization/base/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base">protocol/tokenization/base/</a></td>
               <td class="coverBar" align="center">
                                 <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
+              <td class="coverNumDflt">124</td>
+              <td class="coverNumDflt">124</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">97.6&nbsp;%</td>
+              <td class="coverNumDflt">42</td>
+              <td class="coverNumDflt">41</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/src/periphery/contracts/rewards/index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a></td>
+              <td class="coverDirectory"><a href="rewards/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards">rewards/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="99.1%"><img src="snow.png" width=1 height=10 alt="99.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=99 height=10 alt="98.6%"><img src="snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.1&nbsp;%</td>
-              <td class="coverNumDflt">214</td>
-              <td class="coverNumDflt">212</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">219</td>
+              <td class="coverNumDflt">216</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">55</td>
-              <td class="coverNumDflt">55</td>
+              <td class="coverPerHi">96.7&nbsp;%</td>
+              <td class="coverNumDflt">61</td>
+              <td class="coverNumDflt">59</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a></td>
+              <td class="coverDirectory"><a href="rewards/transfer-strategies/index.html" title="Click to go to directory /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies">rewards/transfer-strategies/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">15</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">20</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">93.3&nbsp;%</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">14</td>
             </tr>
           </table>
           </center>
@@ -326,7 +326,7 @@
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="ruler"><img src="glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/ATokenInstance.sol.func-c.html b/report/instances/ATokenInstance.sol.func-c.html
similarity index 63%
rename from report/core/instances/src/core/instances/ATokenInstance.sol.func-c.html
rename to report/instances/ATokenInstance.sol.func-c.html
index 9c9950d0..d83b22b7 100644
--- a/report/core/instances/src/core/instances/ATokenInstance.sol.func-c.html
+++ b/report/instances/ATokenInstance.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/ATokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/ATokenInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (<a href="ATokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (<a href="ATokenInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ATokenInstance.sol.func.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ATokenInstance.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L7">ATokenInstance.</a></td>
+              
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L10">ATokenInstance.getRevision</a></td>
               
-              <td class="coverFnHi">3469</td>
+              <td class="coverFnHi">166696</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L15">ATokenInstance.initialize</a></td>
               
-              <td class="coverFnHi">3470</td>
+              <td class="coverFnHi">166697</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/ATokenInstance.sol.func.html b/report/instances/ATokenInstance.sol.func.html
similarity index 63%
rename from report/core/instances/src/core/instances/ATokenInstance.sol.func.html
rename to report/instances/ATokenInstance.sol.func.html
index 4ea020d2..8e578d85 100644
--- a/report/core/instances/src/core/instances/ATokenInstance.sol.func.html
+++ b/report/instances/ATokenInstance.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/ATokenInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/ATokenInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (<a href="ATokenInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (<a href="ATokenInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ATokenInstance.sol.func-c.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ATokenInstance.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L7">ATokenInstance.</a></td>
+              
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L10">ATokenInstance.getRevision</a></td>
               
-              <td class="coverFnHi">3469</td>
+              <td class="coverFnHi">166696</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ATokenInstance.sol.gcov.html#L15">ATokenInstance.initialize</a></td>
               
-              <td class="coverFnHi">3470</td>
+              <td class="coverFnHi">166697</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/ATokenInstance.sol.gcov.html b/report/instances/ATokenInstance.sol.gcov.html
similarity index 79%
rename from report/core/instances/src/core/instances/ATokenInstance.sol.gcov.html
rename to report/instances/ATokenInstance.sol.gcov.html
index 9c0e3a35..fe163efd 100644
--- a/report/core/instances/src/core/instances/ATokenInstance.sol.gcov.html
+++ b/report/instances/ATokenInstance.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/ATokenInstance.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/ATokenInstance.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (source / <a href="ATokenInstance.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - ATokenInstance.sol<span style="font-size: 80%;"> (source / <a href="ATokenInstance.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,7 +72,7 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {AToken, IPool, IAaveIncentivesController, IInitializableAToken, Errors, VersionedInitializable} from '../contracts/protocol/tokenization/AToken.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {AToken, IPool, IAaveIncentivesController, IInitializableAToken, Errors, VersionedInitializable} from '../protocol/tokenization/AToken.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : </span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : contract ATokenInstance is AToken {</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             :   uint256 public constant ATOKEN_REVISION = 1;</span>
@@ -80,12 +80,12 @@
 <span id="L9"><span class="lineNum">       9</span>                 :             :   constructor(IPool pool) AToken(pool) {}</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : </span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :   /// @inheritdoc VersionedInitializable</span>
-<span id="L12"><span class="lineNum">      12</span>                 :<span class="tlaGNC tlaBgGNC">        3469 :   function getRevision() internal pure virtual override returns (uint256) {</span></span>
-<span id="L13"><span class="lineNum">      13</span>                 :<span class="tlaGNC">        6938 :     return ATOKEN_REVISION;</span></span>
+<span id="L12"><span class="lineNum">      12</span>                 :             :   function getRevision() internal pure virtual override returns (uint256) {</span>
+<span id="L13"><span class="lineNum">      13</span>                 :<span class="tlaGNC tlaBgGNC">      166696 :     return ATOKEN_REVISION;</span></span>
 <span id="L14"><span class="lineNum">      14</span>                 :             :   }</span>
 <span id="L15"><span class="lineNum">      15</span>                 :             : </span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :   /// @inheritdoc IInitializableAToken</span>
-<span id="L17"><span class="lineNum">      17</span>                 :<span class="tlaGNC">        3470 :   function initialize(</span></span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :   function initialize(</span>
 <span id="L18"><span class="lineNum">      18</span>                 :             :     IPool initializingPool,</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :     address treasury,</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :     address underlyingAsset,</span>
@@ -95,18 +95,18 @@
 <span id="L24"><span class="lineNum">      24</span>                 :             :     string calldata aTokenSymbol,</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :     bytes calldata params</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :   ) public virtual override initializer {</span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        6940 :     require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);</span></span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        6940 :     _setName(aTokenName);</span></span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">        6940 :     _setSymbol(aTokenSymbol);</span></span>
-<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC">        6940 :     _setDecimals(aTokenDecimals);</span></span>
+<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">      166697 :     require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);</span></span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">      166697 :     _setName(aTokenName);</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">      166697 :     _setSymbol(aTokenSymbol);</span></span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC">      166697 :     _setDecimals(aTokenDecimals);</span></span>
 <span id="L31"><span class="lineNum">      31</span>                 :             : </span>
-<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">        6940 :     _treasury = treasury;</span></span>
-<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">        6940 :     _underlyingAsset = underlyingAsset;</span></span>
-<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">        6940 :     _incentivesController = incentivesController;</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">      166697 :     _treasury = treasury;</span></span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">      166697 :     _underlyingAsset = underlyingAsset;</span></span>
+<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">      166697 :     _incentivesController = incentivesController;</span></span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">        6940 :     _domainSeparator = _calculateDomainSeparator();</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">      166697 :     _domainSeparator = _calculateDomainSeparator();</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             : </span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">        6940 :     emit Initialized(</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">      166697 :     emit Initialized(</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :       underlyingAsset,</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :       address(POOL),</span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :       treasury,</span>
@@ -125,8 +125,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func-c.html b/report/instances/PoolConfiguratorInstance.sol.func-c.html
similarity index 68%
rename from report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func-c.html
rename to report/instances/PoolConfiguratorInstance.sol.func-c.html
index f69764a3..a679cce6 100644
--- a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func-c.html
+++ b/report/instances/PoolConfiguratorInstance.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolConfiguratorInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolConfiguratorInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (<a href="PoolConfiguratorInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (<a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolConfiguratorInstance.sol.func.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolConfiguratorInstance.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolConfiguratorInstance.sol.gcov.html#L8">PoolConfiguratorInstance.getRevision</a></td>
               
-              <td class="coverFnHi">1232</td>
+              <td class="coverFnHi">1389</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolConfiguratorInstance.sol.gcov.html#L12">PoolConfiguratorInstance.initialize</a></td>
               
-              <td class="coverFnHi">1232</td>
+              <td class="coverFnHi">1389</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func.html b/report/instances/PoolConfiguratorInstance.sol.func.html
similarity index 68%
rename from report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func.html
rename to report/instances/PoolConfiguratorInstance.sol.func.html
index 8fe1d16b..39a526df 100644
--- a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.func.html
+++ b/report/instances/PoolConfiguratorInstance.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolConfiguratorInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolConfiguratorInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (<a href="PoolConfiguratorInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (<a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolConfiguratorInstance.sol.func-c.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolConfiguratorInstance.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolConfiguratorInstance.sol.gcov.html#L8">PoolConfiguratorInstance.getRevision</a></td>
               
-              <td class="coverFnHi">1232</td>
+              <td class="coverFnHi">1389</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolConfiguratorInstance.sol.gcov.html#L12">PoolConfiguratorInstance.initialize</a></td>
               
-              <td class="coverFnHi">1232</td>
+              <td class="coverFnHi">1389</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.gcov.html b/report/instances/PoolConfiguratorInstance.sol.gcov.html
similarity index 72%
rename from report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.gcov.html
rename to report/instances/PoolConfiguratorInstance.sol.gcov.html
index 92e18a88..86aefa61 100644
--- a/report/core/instances/src/core/instances/PoolConfiguratorInstance.sol.gcov.html
+++ b/report/instances/PoolConfiguratorInstance.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolConfiguratorInstance.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolConfiguratorInstance.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (source / <a href="PoolConfiguratorInstance.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolConfiguratorInstance.sol<span style="font-size: 80%;"> (source / <a href="PoolConfiguratorInstance.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,19 +72,19 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {PoolConfigurator, IPoolAddressesProvider, IPool, VersionedInitializable} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {PoolConfigurator, IPoolAddressesProvider, IPool, VersionedInitializable} from '../protocol/pool/PoolConfigurator.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : </span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : contract PoolConfiguratorInstance is PoolConfigurator {</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             :   uint256 public constant CONFIGURATOR_REVISION = 3;</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             :   uint256 public constant CONFIGURATOR_REVISION = 4;</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : </span>
 <span id="L9"><span class="lineNum">       9</span>                 :             :   /// @inheritdoc VersionedInitializable</span>
-<span id="L10"><span class="lineNum">      10</span>                 :<span class="tlaGNC tlaBgGNC">        1232 :   function getRevision() internal pure virtual override returns (uint256) {</span></span>
-<span id="L11"><span class="lineNum">      11</span>                 :<span class="tlaGNC">        2464 :     return CONFIGURATOR_REVISION;</span></span>
+<span id="L10"><span class="lineNum">      10</span>                 :             :   function getRevision() internal pure virtual override returns (uint256) {</span>
+<span id="L11"><span class="lineNum">      11</span>                 :<span class="tlaGNC tlaBgGNC">        1389 :     return CONFIGURATOR_REVISION;</span></span>
 <span id="L12"><span class="lineNum">      12</span>                 :             :   }</span>
 <span id="L13"><span class="lineNum">      13</span>                 :             : </span>
-<span id="L14"><span class="lineNum">      14</span>                 :<span class="tlaGNC">        1232 :   function initialize(IPoolAddressesProvider provider) public virtual override initializer {</span></span>
-<span id="L15"><span class="lineNum">      15</span>                 :<span class="tlaGNC">        2464 :     _addressesProvider = provider;</span></span>
-<span id="L16"><span class="lineNum">      16</span>                 :<span class="tlaGNC">        2464 :     _pool = IPool(_addressesProvider.getPool());</span></span>
+<span id="L14"><span class="lineNum">      14</span>                 :             :   function initialize(IPoolAddressesProvider provider) public virtual override initializer {</span>
+<span id="L15"><span class="lineNum">      15</span>                 :<span class="tlaGNC">        1389 :     _addressesProvider = provider;</span></span>
+<span id="L16"><span class="lineNum">      16</span>                 :<span class="tlaGNC">        1389 :     _pool = IPool(_addressesProvider.getPool());</span></span>
 <span id="L17"><span class="lineNum">      17</span>                 :             :   }</span>
 <span id="L18"><span class="lineNum">      18</span>                 :             : }</span>
         </pre>
@@ -94,8 +94,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolInstance.sol.func-c.html b/report/instances/PoolInstance.sol.func-c.html
similarity index 64%
rename from report/core/instances/src/core/instances/PoolInstance.sol.func-c.html
rename to report/instances/PoolInstance.sol.func-c.html
index 9587d444..2187e044 100644
--- a/report/core/instances/src/core/instances/PoolInstance.sol.func-c.html
+++ b/report/instances/PoolInstance.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (<a href="PoolInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (<a href="PoolInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolInstance.sol.func.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolInstance.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L9">PoolInstance.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnHi">194</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L23">PoolInstance.getRevision</a></td>
+              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L22">PoolInstance.getRevision</a></td>
               
-              <td class="coverFnHi">1238</td>
+              <td class="coverFnHi">1395</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L18">PoolInstance.initialize</a></td>
               
-              <td class="coverFnHi">1238</td>
+              <td class="coverFnHi">1395</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolInstance.sol.func.html b/report/instances/PoolInstance.sol.func.html
similarity index 64%
rename from report/core/instances/src/core/instances/PoolInstance.sol.func.html
rename to report/instances/PoolInstance.sol.func.html
index 1d449c53..c5b24f36 100644
--- a/report/core/instances/src/core/instances/PoolInstance.sol.func.html
+++ b/report/instances/PoolInstance.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolInstance.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (<a href="PoolInstance.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (<a href="PoolInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolInstance.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L9">PoolInstance.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolInstance.sol.func-c.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnHi">194</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L23">PoolInstance.getRevision</a></td>
+              <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L22">PoolInstance.getRevision</a></td>
               
-              <td class="coverFnHi">1238</td>
+              <td class="coverFnHi">1395</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolInstance.sol.gcov.html#L18">PoolInstance.initialize</a></td>
               
-              <td class="coverFnHi">1238</td>
+              <td class="coverFnHi">1395</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/PoolInstance.sol.gcov.html b/report/instances/PoolInstance.sol.gcov.html
similarity index 72%
rename from report/core/instances/src/core/instances/PoolInstance.sol.gcov.html
rename to report/instances/PoolInstance.sol.gcov.html
index a90e1377..1a6d65d6 100644
--- a/report/core/instances/src/core/instances/PoolInstance.sol.gcov.html
+++ b/report/instances/PoolInstance.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/PoolInstance.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/PoolInstance.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (source / <a href="PoolInstance.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - PoolInstance.sol<span style="font-size: 80%;"> (source / <a href="PoolInstance.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,12 +72,12 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {Pool} from '../contracts/protocol/pool/Pool.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../contracts/interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {Errors} from '../contracts/protocol/libraries/helpers/Errors.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {Pool} from '../protocol/pool/Pool.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {Errors} from '../protocol/libraries/helpers/Errors.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : </span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : contract PoolInstance is Pool {</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             :   uint256 public constant POOL_REVISION = 4;</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             :   uint256 public constant POOL_REVISION = 5;</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : </span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :   constructor(IPoolAddressesProvider provider) Pool(provider) {}</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             : </span>
@@ -88,15 +88,14 @@
 <span id="L17"><span class="lineNum">      17</span>                 :             :    * @dev Caching the address of the PoolAddressesProvider in order to reduce gas consumption on subsequent operations</span>
 <span id="L18"><span class="lineNum">      18</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :    */</span>
-<span id="L20"><span class="lineNum">      20</span>                 :<span class="tlaGNC tlaBgGNC">        1238 :   function initialize(IPoolAddressesProvider provider) external virtual override initializer {</span></span>
-<span id="L21"><span class="lineNum">      21</span>                 :<span class="tlaGNC">        2476 :     require(provider == ADDRESSES_PROVIDER, Errors.INVALID_ADDRESSES_PROVIDER);</span></span>
-<span id="L22"><span class="lineNum">      22</span>                 :<span class="tlaGNC">        2472 :     _maxStableRateBorrowSizePercent = 0.25e4;</span></span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :   }</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             : </span>
-<span id="L25"><span class="lineNum">      25</span>                 :<span class="tlaGNC">        1238 :   function getRevision() internal pure virtual override returns (uint256) {</span></span>
-<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC">        2476 :     return POOL_REVISION;</span></span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :   }</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             : }</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   function initialize(IPoolAddressesProvider provider) external virtual override initializer {</span>
+<span id="L21"><span class="lineNum">      21</span>                 :<span class="tlaGNC tlaBgGNC">        1395 :     require(provider == ADDRESSES_PROVIDER, Errors.INVALID_ADDRESSES_PROVIDER);</span></span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   }</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             : </span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   function getRevision() internal pure virtual override returns (uint256) {</span>
+<span id="L25"><span class="lineNum">      25</span>                 :<span class="tlaGNC">        1395 :     return POOL_REVISION;</span></span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :   }</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -104,8 +103,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/instances/VariableDebtTokenInstance.sol.func-c.html b/report/instances/VariableDebtTokenInstance.sol.func-c.html
new file mode 100644
index 00000000..ea596034
--- /dev/null
+++ b/report/instances/VariableDebtTokenInstance.sol.func-c.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - instances/VariableDebtTokenInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">9</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VariableDebtTokenInstance.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L7">VariableDebtTokenInstance.</a></td>
+              
+              <td class="coverFnHi">7103</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L10">VariableDebtTokenInstance.getRevision</a></td>
+              
+              <td class="coverFnHi">174696</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L15">VariableDebtTokenInstance.initialize</a></td>
+              
+              <td class="coverFnHi">174697</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/instances/VariableDebtTokenInstance.sol.func.html b/report/instances/VariableDebtTokenInstance.sol.func.html
new file mode 100644
index 00000000..d228d81b
--- /dev/null
+++ b/report/instances/VariableDebtTokenInstance.sol.func.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - instances/VariableDebtTokenInstance.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (<a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">9</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VariableDebtTokenInstance.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L7">VariableDebtTokenInstance.</a></td>
+              
+              <td class="coverFnHi">7103</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L10">VariableDebtTokenInstance.getRevision</a></td>
+              
+              <td class="coverFnHi">174696</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtTokenInstance.sol.gcov.html#L15">VariableDebtTokenInstance.initialize</a></td>
+              
+              <td class="coverFnHi">174697</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.gcov.html b/report/instances/VariableDebtTokenInstance.sol.gcov.html
similarity index 76%
rename from report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.gcov.html
rename to report/instances/VariableDebtTokenInstance.sol.gcov.html
index 8445d25a..2a2860c8 100644
--- a/report/core/instances/src/core/instances/VariableDebtTokenInstance.sol.gcov.html
+++ b/report/instances/VariableDebtTokenInstance.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances/VariableDebtTokenInstance.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances/VariableDebtTokenInstance.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - <a href="index.html">core/instances/src/core/instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (source / <a href="VariableDebtTokenInstance.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory instances">instances</a> - VariableDebtTokenInstance.sol<span style="font-size: 80%;"> (source / <a href="VariableDebtTokenInstance.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.9&nbsp;%</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
             <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,7 +72,7 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {VariableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../contracts/protocol/tokenization/VariableDebtToken.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {VariableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../protocol/tokenization/VariableDebtToken.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : </span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : contract VariableDebtTokenInstance is VariableDebtToken {</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             :   uint256 public constant DEBT_TOKEN_REVISION = 1;</span>
@@ -80,12 +80,12 @@
 <span id="L9"><span class="lineNum">       9</span>                 :             :   constructor(IPool pool) VariableDebtToken(pool) {}</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : </span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :   /// @inheritdoc VersionedInitializable</span>
-<span id="L12"><span class="lineNum">      12</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function getRevision() internal pure virtual override returns (uint256) {</span></span>
-<span id="L13"><span class="lineNum">      13</span>                 :<span class="tlaUNC">           0 :     return DEBT_TOKEN_REVISION;</span></span>
+<span id="L12"><span class="lineNum">      12</span>                 :             :   function getRevision() internal pure virtual override returns (uint256) {</span>
+<span id="L13"><span class="lineNum">      13</span>                 :<span class="tlaGNC tlaBgGNC">      174696 :     return DEBT_TOKEN_REVISION;</span></span>
 <span id="L14"><span class="lineNum">      14</span>                 :             :   }</span>
 <span id="L15"><span class="lineNum">      15</span>                 :             : </span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :   /// @inheritdoc IInitializableDebtToken</span>
-<span id="L17"><span class="lineNum">      17</span>                 :<span class="tlaGNC tlaBgGNC">        3478 :   function initialize(</span></span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :   function initialize(</span>
 <span id="L18"><span class="lineNum">      18</span>                 :             :     IPool initializingPool,</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :     address underlyingAsset,</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :     IAaveIncentivesController incentivesController,</span>
@@ -94,17 +94,17 @@
 <span id="L23"><span class="lineNum">      23</span>                 :             :     string memory debtTokenSymbol,</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :     bytes calldata params</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   ) external override initializer {</span>
-<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC">        6954 :     require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);</span></span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        6952 :     _setName(debtTokenName);</span></span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        6952 :     _setSymbol(debtTokenSymbol);</span></span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">        6952 :     _setDecimals(debtTokenDecimals);</span></span>
+<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC">      173697 :     require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);</span></span>
+<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">      172697 :     _setName(debtTokenName);</span></span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">      172697 :     _setSymbol(debtTokenSymbol);</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">      172697 :     _setDecimals(debtTokenDecimals);</span></span>
 <span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        6952 :     _underlyingAsset = underlyingAsset;</span></span>
-<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">        6952 :     _incentivesController = incentivesController;</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">      172697 :     _underlyingAsset = underlyingAsset;</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">      172697 :     _incentivesController = incentivesController;</span></span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
-<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">        6952 :     _domainSeparator = _calculateDomainSeparator();</span></span>
+<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">      172697 :     _domainSeparator = _calculateDomainSeparator();</span></span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">        6952 :     emit Initialized(</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">      172697 :     emit Initialized(</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :       underlyingAsset,</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :       address(POOL),</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :       address(incentivesController),</span>
@@ -122,8 +122,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/index-sort-b.html b/report/instances/index-sort-b.html
similarity index 58%
rename from report/core/instances/src/core/instances/index-sort-b.html
rename to report/instances/index-sort-b.html
index 028d3cdd..c211fc71 100644
--- a/report/core/instances/src/core/instances/index-sort-b.html
+++ b/report/instances/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - core/instances/src/core/instances</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - instances</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">94.1&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
-            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html">ATokenInstance.sol</a></td>
+              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/ATokenInstance.sol">ATokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">10</td>
@@ -107,13 +107,13 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html">PoolConfiguratorInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolConfiguratorInstance.sol">PoolConfiguratorInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">3</td>
@@ -126,57 +126,42 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolInstance.sol.gcov.html">PoolInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolInstance.sol">PoolInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">2</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="StableDebtTokenInstance.sol.gcov.html">StableDebtTokenInstance.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
-              </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html">VariableDebtTokenInstance.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/VariableDebtTokenInstance.sol">VariableDebtTokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/index-sort-f.html b/report/instances/index-sort-f.html
similarity index 58%
rename from report/core/instances/src/core/instances/index-sort-f.html
rename to report/instances/index-sort-f.html
index ac8828b3..bdf13aeb 100644
--- a/report/core/instances/src/core/instances/index-sort-f.html
+++ b/report/instances/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - core/instances/src/core/instances</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - instances</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">94.1&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
-            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,39 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtTokenInstance.sol.gcov.html">StableDebtTokenInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolConfiguratorInstance.sol">PoolConfiguratorInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html">VariableDebtTokenInstance.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
-              </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
               <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html">ATokenInstance.sol</a></td>
+              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/ATokenInstance.sol">ATokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">10</td>
@@ -137,46 +122,46 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html">PoolConfiguratorInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolInstance.sol">PoolInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolInstance.sol.gcov.html">PoolInstance.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/VariableDebtTokenInstance.sol">VariableDebtTokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/index-sort-l.html b/report/instances/index-sort-l.html
similarity index 58%
rename from report/core/instances/src/core/instances/index-sort-l.html
rename to report/instances/index-sort-l.html
index 4cf73f34..9da9aab6 100644
--- a/report/core/instances/src/core/instances/index-sort-l.html
+++ b/report/instances/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - core/instances/src/core/instances</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - instances</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">94.1&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
-            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,39 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtTokenInstance.sol.gcov.html">StableDebtTokenInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolInstance.sol">PoolInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html">VariableDebtTokenInstance.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
-              </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html">PoolConfiguratorInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolConfiguratorInstance.sol">PoolConfiguratorInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">3</td>
@@ -141,24 +126,24 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolInstance.sol.gcov.html">PoolInstance.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/VariableDebtTokenInstance.sol">VariableDebtTokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html">ATokenInstance.sol</a></td>
+              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/ATokenInstance.sol">ATokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">10</td>
@@ -167,16 +152,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/instances/src/core/instances/index.html b/report/instances/index.html
similarity index 58%
rename from report/core/instances/src/core/instances/index.html
rename to report/instances/index.html
index 71308d47..cc65427a 100644
--- a/report/core/instances/src/core/instances/index.html
+++ b/report/instances/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/instances/src/core/instances</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - instances</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../index.html">top level</a> - core/instances/src/core/instances</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - instances</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">94.1&nbsp;%</td>
-            <td class="headerCovTableEntry">34</td>
-            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">80.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html">ATokenInstance.sol</a></td>
+              <td class="coverFile"><a href="ATokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/ATokenInstance.sol">ATokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">10</td>
@@ -107,13 +107,13 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html">PoolConfiguratorInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolConfiguratorInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolConfiguratorInstance.sol">PoolConfiguratorInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">3</td>
@@ -126,57 +126,42 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolInstance.sol.gcov.html">PoolInstance.sol</a></td>
+              <td class="coverFile"><a href="PoolInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/PoolInstance.sol">PoolInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">2</td>
               <td class="coverNumDflt">2</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="StableDebtTokenInstance.sol.gcov.html">StableDebtTokenInstance.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
-              </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html">VariableDebtTokenInstance.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtTokenInstance.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/instances/VariableDebtTokenInstance.sol">VariableDebtTokenInstance.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../amber.png" width=89 height=10 alt="88.9%"><img src="../../../../../snow.png" width=11 height=10 alt="88.9%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.9&nbsp;%</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerLo">50.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func-c.html b/report/misc/AaveOracle.sol.func-c.html
similarity index 65%
rename from report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func-c.html
rename to report/misc/AaveOracle.sol.func-c.html
index 05b9424a..45980202 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func-c.html
+++ b/report/misc/AaveOracle.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/AaveOracle.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/AaveOracle.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (<a href="AaveOracle.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (<a href="AaveOracle.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">25</td>
-            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntryMed">81.2&nbsp;%</td>
+            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AaveOracle.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AaveOracle.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L45">AaveOracle.</a></td>
+              
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -91,6 +98,13 @@
               <td class="coverFnHi">4</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L30">AaveOracle.onlyAssetListingOrPoolAdmins</a></td>
+              
+              <td class="coverFnHi">4</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L70">AaveOracle.setFallbackOracle</a></td>
@@ -102,35 +116,35 @@
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L81">AaveOracle._setAssetsSources</a></td>
               
-              <td class="coverFnHi">590</td>
+              <td class="coverFnHi">659</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L62">AaveOracle.setAssetSources</a></td>
               
-              <td class="coverFnHi">591</td>
+              <td class="coverFnHi">660</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L137">AaveOracle._onlyAssetListingOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">595</td>
+              <td class="coverFnHi">664</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L128">AaveOracle.getSourceOfAsset</a></td>
               
-              <td class="coverFnHi">3030</td>
+              <td class="coverFnHi">4115</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L99">AaveOracle.getAssetPrice</a></td>
               
-              <td class="coverFnHi">69942</td>
+              <td class="coverFnHi">111429</td>
               
               
             </tr>
@@ -138,8 +152,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func.html b/report/misc/AaveOracle.sol.func.html
similarity index 65%
rename from report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func.html
rename to report/misc/AaveOracle.sol.func.html
index ac9e07c2..c7bd647e 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.func.html
+++ b/report/misc/AaveOracle.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/AaveOracle.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/AaveOracle.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (<a href="AaveOracle.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (<a href="AaveOracle.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">25</td>
-            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntryMed">81.2&nbsp;%</td>
+            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AaveOracle.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AaveOracle.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L45">AaveOracle.</a></td>
+              
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L137">AaveOracle._onlyAssetListingOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">595</td>
+              <td class="coverFnHi">664</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L81">AaveOracle._setAssetsSources</a></td>
               
-              <td class="coverFnHi">590</td>
+              <td class="coverFnHi">659</td>
               
               
             </tr>
@@ -95,7 +102,7 @@
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L99">AaveOracle.getAssetPrice</a></td>
               
-              <td class="coverFnHi">69942</td>
+              <td class="coverFnHi">111429</td>
               
               
             </tr>
@@ -116,14 +123,21 @@
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L128">AaveOracle.getSourceOfAsset</a></td>
               
-              <td class="coverFnHi">3030</td>
+              <td class="coverFnHi">4115</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L30">AaveOracle.onlyAssetListingOrPoolAdmins</a></td>
+              
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AaveOracle.sol.gcov.html#L62">AaveOracle.setAssetSources</a></td>
               
-              <td class="coverFnHi">591</td>
+              <td class="coverFnHi">660</td>
               
               
             </tr>
@@ -138,8 +152,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.gcov.html b/report/misc/AaveOracle.sol.gcov.html
similarity index 80%
rename from report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.gcov.html
rename to report/misc/AaveOracle.sol.gcov.html
index a334d9fd..e3d70004 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/AaveOracle.sol.gcov.html
+++ b/report/misc/AaveOracle.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc/AaveOracle.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/AaveOracle.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/misc/src/core/contracts/misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (source / <a href="AaveOracle.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - AaveOracle.sol<span style="font-size: 80%;"> (source / <a href="AaveOracle.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">25</td>
-            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntryMed">81.2&nbsp;%</td>
+            <td class="headerCovTableEntry">32</td>
+            <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">9</td>
-            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntryHi">90.9&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -101,7 +101,7 @@
 <span id="L30"><span class="lineNum">      30</span>                 :             :    * @dev Only asset listing or pool admin can call functions marked by this modifier.</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :    */</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :   modifier onlyAssetListingOrPoolAdmins() {</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :     _onlyAssetListingOrPoolAdmins();</span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC tlaBgGNC">           4 :     _onlyAssetListingOrPoolAdmins();</span></span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :     _;</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :   }</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
@@ -123,27 +123,27 @@
 <span id="L52"><span class="lineNum">      52</span>                 :             :     address baseCurrency,</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     uint256 baseCurrencyUnit</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :     ADDRESSES_PROVIDER = provider;</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :     _setFallbackOracle(fallbackOracle);</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :     _setAssetsSources(assets, sources);</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :     BASE_CURRENCY = baseCurrency;</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :     BASE_CURRENCY_UNIT = baseCurrencyUnit;</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :     emit BaseCurrencySet(baseCurrency, baseCurrencyUnit);</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaUNC">           0 :     _setFallbackOracle(fallbackOracle);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaUNC">           0 :     _setAssetsSources(assets, sources);</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaUNC">           0 :     BASE_CURRENCY = baseCurrency;</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaUNC">           0 :     BASE_CURRENCY_UNIT = baseCurrencyUnit;</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaUNC">           0 :     emit BaseCurrencySet(baseCurrency, baseCurrencyUnit);</span></span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   }</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :   /// @inheritdoc IAaveOracle</span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC tlaBgGNC">         591 :   function setAssetSources(</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   function setAssetSources(</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     address[] calldata assets,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     address[] calldata sources</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   ) external override onlyAssetListingOrPoolAdmins {</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">        1180 :     _setAssetsSources(assets, sources);</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC tlaBgGNC">         659 :     _setAssetsSources(assets, sources);</span></span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   }</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :   /// @inheritdoc IAaveOracle</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           4 :   function setFallbackOracle(</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   function setFallbackOracle(</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     address fallbackOracle</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   ) external override onlyAssetListingOrPoolAdmins {</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           8 :     _setFallbackOracle(fallbackOracle);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           4 :     _setFallbackOracle(fallbackOracle);</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   }</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :   /**</span>
@@ -151,11 +151,11 @@
 <span id="L80"><span class="lineNum">      80</span>                 :             :    * @param assets The addresses of the assets</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :    * @param sources The address of the source of each asset</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :    */</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">         590 :   function _setAssetsSources(address[] memory assets, address[] memory sources) internal {</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        1180 :     require(assets.length == sources.length, Errors.INCONSISTENT_PARAMS_LENGTH);</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        5273 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">        3506 :       assetsSources[assets[i]] = AggregatorInterface(sources[i]);</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        3506 :       emit AssetSourceUpdated(assets[i], sources[i]);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function _setAssetsSources(address[] memory assets, address[] memory sources) internal {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">         659 :     require(assets.length == sources.length, Errors.INCONSISTENT_PARAMS_LENGTH);</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">         658 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">        1954 :       assetsSources[assets[i]] = AggregatorInterface(sources[i]);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        1954 :       emit AssetSourceUpdated(assets[i], sources[i]);</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :     }</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   }</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
@@ -163,53 +163,53 @@
 <span id="L92"><span class="lineNum">      92</span>                 :             :    * @notice Internal function to set the fallback oracle</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :    * @param fallbackOracle The address of the fallback oracle</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :    */</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           4 :   function _setFallbackOracle(address fallbackOracle) internal {</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           8 :     _fallbackOracle = IPriceOracleGetter(fallbackOracle);</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           8 :     emit FallbackOracleUpdated(fallbackOracle);</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   function _setFallbackOracle(address fallbackOracle) internal {</span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           4 :     _fallbackOracle = IPriceOracleGetter(fallbackOracle);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           4 :     emit FallbackOracleUpdated(fallbackOracle);</span></span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : </span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :   /// @inheritdoc IPriceOracleGetter</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">       69942 :   function getAssetPrice(address asset) public view override returns (uint256) {</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">      139890 :     AggregatorInterface source = assetsSources[asset];</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :   function getAssetPrice(address asset) public view override returns (uint256) {</span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">      111432 :     AggregatorInterface source = assetsSources[asset];</span></span>
 <span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">      139890 :     if (asset == BASE_CURRENCY) {</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           4 :       return BASE_CURRENCY_UNIT;</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">      279772 :     } else if (address(source) == address(0)) {</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           9 :       return _fallbackOracle.getAssetPrice(asset);</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">      111432 :     if (asset == BASE_CURRENCY) {</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           2 :       return BASE_CURRENCY_UNIT;</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">      111430 :     } else if (address(source) == address(0)) {</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           3 :       return _fallbackOracle.getAssetPrice(asset);</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :     } else {</span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">      209820 :       int256 price = source.latestAnswer();</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">      139880 :       if (price &gt; 0) {</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">      209811 :         return uint256(price);</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">      111427 :       int256 price = source.latestAnswer();</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">      111427 :       if (price &gt; 0) {</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">      111424 :         return uint256(price);</span></span>
 <span id="L112"><span class="lineNum">     112</span>                 :             :       } else {</span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           9 :         return _fallbackOracle.getAssetPrice(asset);</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           3 :         return _fallbackOracle.getAssetPrice(asset);</span></span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :       }</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :     }</span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :   }</span>
 <span id="L117"><span class="lineNum">     117</span>                 :             : </span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :   /// @inheritdoc IAaveOracle</span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">           3 :   function getAssetsPrices(</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :   function getAssetsPrices(</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :     address[] calldata assets</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :   ) external view override returns (uint256[] memory) {</span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">           9 :     uint256[] memory prices = new uint256[](assets.length);</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">          13 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">           6 :       prices[i] = getAssetPrice(assets[i]);</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">           3 :     uint256[] memory prices = new uint256[](assets.length);</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">           3 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">           3 :       prices[i] = getAssetPrice(assets[i]);</span></span>
 <span id="L125"><span class="lineNum">     125</span>                 :             :     }</span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           4 :     return prices;</span></span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           2 :     return prices;</span></span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :   }</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             : </span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :   /// @inheritdoc IAaveOracle</span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        3030 :   function getSourceOfAsset(address asset) external view override returns (address) {</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">        9090 :     return address(assetsSources[asset]);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :   function getSourceOfAsset(address asset) external view override returns (address) {</span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">        4115 :     return address(assetsSources[asset]);</span></span>
 <span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
 <span id="L133"><span class="lineNum">     133</span>                 :             : </span>
 <span id="L134"><span class="lineNum">     134</span>                 :             :   /// @inheritdoc IAaveOracle</span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           3 :   function getFallbackOracle() external view returns (address) {</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           9 :     return address(_fallbackOracle);</span></span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :   function getFallbackOracle() external view returns (address) {</span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           3 :     return address(_fallbackOracle);</span></span>
 <span id="L137"><span class="lineNum">     137</span>                 :             :   }</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             : </span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">         595 :   function _onlyAssetListingOrPoolAdmins() internal view {</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">        1785 :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">        1190 :     require(</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :   function _onlyAssetListingOrPoolAdmins() internal view {</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">         664 :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">         664 :     require(</span></span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :       aclManager.isAssetListingAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
 <span id="L143"><span class="lineNum">     143</span>                 :             :       Errors.CALLER_NOT_ASSET_LISTING_OR_POOL_ADMIN</span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :     );</span>
@@ -222,8 +222,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func-c.html b/report/misc/DefaultReserveInterestRateStrategyV2.sol.func-c.html
similarity index 64%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func-c.html
rename to report/misc/DefaultReserveInterestRateStrategyV2.sol.func-c.html
index 529f1d46..3c30b0e5 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func-c.html
+++ b/report/misc/DefaultReserveInterestRateStrategyV2.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/DefaultReserveInterestRateStrategyV2.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (<a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (<a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">43</td>
-            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">39</td>
+            <td class="headerCovTableEntry">39</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">14</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,112 +53,119 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="DefaultReserveInterestRateStrategyV2.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="DefaultReserveInterestRateStrategyV2.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L71">DefaultReserveInterestRateStrategyV2.getInterestRateData</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L59">DefaultReserveInterestRateStrategyV2.</a></td>
+              
+              <td class="coverFnHi">242</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L81">DefaultReserveInterestRateStrategyV2.getInterestRateData</a></td>
               
               <td class="coverFnHi">1000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L76">DefaultReserveInterestRateStrategyV2.getInterestRateDataBps</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L86">DefaultReserveInterestRateStrategyV2.getInterestRateDataBps</a></td>
               
               <td class="coverFnHi">1000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L101">DefaultReserveInterestRateStrategyV2.getMaxVariableBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L111">DefaultReserveInterestRateStrategyV2.getMaxVariableBorrowRate</a></td>
               
-              <td class="coverFnHi">3002</td>
+              <td class="coverFnHi">5084</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L91">DefaultReserveInterestRateStrategyV2.getVariableRateSlope2</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L101">DefaultReserveInterestRateStrategyV2.getVariableRateSlope2</a></td>
               
-              <td class="coverFnHi">3004</td>
+              <td class="coverFnHi">5088</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L81">DefaultReserveInterestRateStrategyV2.getOptimalUsageRatio</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L91">DefaultReserveInterestRateStrategyV2.getOptimalUsageRatio</a></td>
               
-              <td class="coverFnHi">6003</td>
+              <td class="coverFnHi">8088</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L86">DefaultReserveInterestRateStrategyV2.getVariableRateSlope1</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L96">DefaultReserveInterestRateStrategyV2.getVariableRateSlope1</a></td>
               
-              <td class="coverFnHi">6008</td>
+              <td class="coverFnHi">8092</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L96">DefaultReserveInterestRateStrategyV2.getBaseVariableBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L106">DefaultReserveInterestRateStrategyV2.getBaseVariableBorrowRate</a></td>
               
-              <td class="coverFnHi">9008</td>
+              <td class="coverFnHi">11092</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L182">DefaultReserveInterestRateStrategyV2._getOverallBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L123">DefaultReserveInterestRateStrategyV2.calculateInterestRates</a></td>
               
-              <td class="coverFnHi">23756</td>
+              <td class="coverFnHi">92717</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L206">DefaultReserveInterestRateStrategyV2._setInterestRateParams</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L223">DefaultReserveInterestRateStrategyV2._rayifyRateData</a></td>
               
-              <td class="coverFnHi">23891</td>
+              <td class="coverFnHi">93717</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L55">DefaultReserveInterestRateStrategyV2.setInterestRateParams</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L47">DefaultReserveInterestRateStrategyV2.onlyPoolConfigurator</a></td>
               
-              <td class="coverFnHi">25891</td>
+              <td class="coverFnHi">190067</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L113">DefaultReserveInterestRateStrategyV2.calculateInterestRates</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L182">DefaultReserveInterestRateStrategyV2._setInterestRateParams</a></td>
               
-              <td class="coverFnHi">49547</td>
+              <td class="coverFnHi">198067</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L247">DefaultReserveInterestRateStrategyV2._rayifyRateData</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L65">DefaultReserveInterestRateStrategyV2.setInterestRateParams</a></td>
               
-              <td class="coverFnHi">50547</td>
+              <td class="coverFnHi">201067</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L260">DefaultReserveInterestRateStrategyV2._bpsToRay</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L236">DefaultReserveInterestRateStrategyV2._bpsToRay</a></td>
               
-              <td class="coverFnHi">229213</td>
+              <td class="coverFnHi">412312</td>
               
               
             </tr>
@@ -166,8 +173,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func.html b/report/misc/DefaultReserveInterestRateStrategyV2.sol.func.html
similarity index 64%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func.html
rename to report/misc/DefaultReserveInterestRateStrategyV2.sol.func.html
index 7c05a933..c58484f3 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.func.html
+++ b/report/misc/DefaultReserveInterestRateStrategyV2.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/DefaultReserveInterestRateStrategyV2.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (<a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (<a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">43</td>
-            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">39</td>
+            <td class="headerCovTableEntry">39</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">14</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,112 +53,119 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="DefaultReserveInterestRateStrategyV2.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="DefaultReserveInterestRateStrategyV2.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L260">DefaultReserveInterestRateStrategyV2._bpsToRay</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L59">DefaultReserveInterestRateStrategyV2.</a></td>
               
-              <td class="coverFnHi">229213</td>
+              <td class="coverFnHi">242</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L182">DefaultReserveInterestRateStrategyV2._getOverallBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L236">DefaultReserveInterestRateStrategyV2._bpsToRay</a></td>
               
-              <td class="coverFnHi">23756</td>
+              <td class="coverFnHi">412312</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L247">DefaultReserveInterestRateStrategyV2._rayifyRateData</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L223">DefaultReserveInterestRateStrategyV2._rayifyRateData</a></td>
               
-              <td class="coverFnHi">50547</td>
+              <td class="coverFnHi">93717</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L206">DefaultReserveInterestRateStrategyV2._setInterestRateParams</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L182">DefaultReserveInterestRateStrategyV2._setInterestRateParams</a></td>
               
-              <td class="coverFnHi">23891</td>
+              <td class="coverFnHi">198067</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L113">DefaultReserveInterestRateStrategyV2.calculateInterestRates</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L123">DefaultReserveInterestRateStrategyV2.calculateInterestRates</a></td>
               
-              <td class="coverFnHi">49547</td>
+              <td class="coverFnHi">92717</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L96">DefaultReserveInterestRateStrategyV2.getBaseVariableBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L106">DefaultReserveInterestRateStrategyV2.getBaseVariableBorrowRate</a></td>
               
-              <td class="coverFnHi">9008</td>
+              <td class="coverFnHi">11092</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L71">DefaultReserveInterestRateStrategyV2.getInterestRateData</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L81">DefaultReserveInterestRateStrategyV2.getInterestRateData</a></td>
               
               <td class="coverFnHi">1000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L76">DefaultReserveInterestRateStrategyV2.getInterestRateDataBps</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L86">DefaultReserveInterestRateStrategyV2.getInterestRateDataBps</a></td>
               
               <td class="coverFnHi">1000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L101">DefaultReserveInterestRateStrategyV2.getMaxVariableBorrowRate</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L111">DefaultReserveInterestRateStrategyV2.getMaxVariableBorrowRate</a></td>
               
-              <td class="coverFnHi">3002</td>
+              <td class="coverFnHi">5084</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L81">DefaultReserveInterestRateStrategyV2.getOptimalUsageRatio</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L91">DefaultReserveInterestRateStrategyV2.getOptimalUsageRatio</a></td>
               
-              <td class="coverFnHi">6003</td>
+              <td class="coverFnHi">8088</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L86">DefaultReserveInterestRateStrategyV2.getVariableRateSlope1</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L96">DefaultReserveInterestRateStrategyV2.getVariableRateSlope1</a></td>
               
-              <td class="coverFnHi">6008</td>
+              <td class="coverFnHi">8092</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L91">DefaultReserveInterestRateStrategyV2.getVariableRateSlope2</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L101">DefaultReserveInterestRateStrategyV2.getVariableRateSlope2</a></td>
               
-              <td class="coverFnHi">3004</td>
+              <td class="coverFnHi">5088</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L55">DefaultReserveInterestRateStrategyV2.setInterestRateParams</a></td>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L47">DefaultReserveInterestRateStrategyV2.onlyPoolConfigurator</a></td>
               
-              <td class="coverFnHi">25891</td>
+              <td class="coverFnHi">190067</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html#L65">DefaultReserveInterestRateStrategyV2.setInterestRateParams</a></td>
+              
+              <td class="coverFnHi">201067</td>
               
               
             </tr>
@@ -166,8 +173,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.gcov.html b/report/misc/DefaultReserveInterestRateStrategyV2.sol.gcov.html
similarity index 70%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.gcov.html
rename to report/misc/DefaultReserveInterestRateStrategyV2.sol.gcov.html
index 4e879f02..b12fad4c 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol.gcov.html
+++ b/report/misc/DefaultReserveInterestRateStrategyV2.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/DefaultReserveInterestRateStrategyV2.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (source / <a href="DefaultReserveInterestRateStrategyV2.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - DefaultReserveInterestRateStrategyV2.sol<span style="font-size: 80%;"> (source / <a href="DefaultReserveInterestRateStrategyV2.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">43</td>
-            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">39</td>
+            <td class="headerCovTableEntry">39</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">14</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,14 +72,14 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {WadRayMath} from '../libraries/math/WadRayMath.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from '../libraries/math/PercentageMath.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {DataTypes} from '../libraries/types/DataTypes.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {IReserveInterestRateStrategy} from '../../interfaces/IReserveInterestRateStrategy.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {WadRayMath} from '../protocol/libraries/math/WadRayMath.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from '../protocol/libraries/math/PercentageMath.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../protocol/libraries/helpers/Errors.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IDefaultInterestRateStrategyV2} from '../interfaces/IDefaultInterestRateStrategyV2.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {IReserveInterestRateStrategy} from '../interfaces/IReserveInterestRateStrategy.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             : </span>
 <span id="L13"><span class="lineNum">      13</span>                 :             : /**</span>
 <span id="L14"><span class="lineNum">      14</span>                 :             :  * @title DefaultReserveInterestRateStrategyV2 contract</span>
@@ -93,247 +93,223 @@
 <span id="L22"><span class="lineNum">      22</span>                 :             :   using WadRayMath for uint256;</span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :   using PercentageMath for uint256;</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             : </span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :   IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             : </span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   uint256 public constant MAX_BORROW_RATE = 1000_00;</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :   uint256 public constant MIN_OPTIMAL_POINT = 1_00;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   struct CalcInterestRatesLocalVars {</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :     uint256 availableLiquidity;</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :     uint256 currentVariableBorrowRate;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :     uint256 currentLiquidityRate;</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :     uint256 borrowUsageRatio;</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :     uint256 supplyUsageRatio;</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :     uint256 availableLiquidityPlusDebt;</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :   uint256 public constant MAX_OPTIMAL_POINT = 99_00;</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :   /// @dev Underlying asset listed on the Aave pool =&gt; rate data</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :   mapping(address reserve =&gt; InterestRateData) internal _interestRateData;</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   uint256 public constant MAX_BORROW_RATE = 1000_00;</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             : </span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :   /**</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :    * @param provider The address of the PoolAddressesProvider of the associated Aave pool</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :    */</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :   constructor(address provider) {</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     require(provider != address(0), Errors.INVALID_ADDRESSES_PROVIDER);</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     ADDRESSES_PROVIDER = IPoolAddressesProvider(provider);</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :   }</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             : </span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :   modifier onlyPoolConfigurator() {</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     require(</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :       msg.sender == ADDRESSES_PROVIDER.getPoolConfigurator(),</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :       Errors.CALLER_NOT_POOL_CONFIGURATOR</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :     );</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :     _;</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   }</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :   /// @inheritdoc IReserveInterestRateStrategy</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC tlaBgGNC">       25891 :   function setInterestRateParams(</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :     address reserve,</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :     bytes calldata rateData</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :   ) external onlyPoolConfigurator {</span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">       37782 :     _setInterestRateParams(reserve, abi.decode(rateData, (InterestRateData)));</span></span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :   }</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             : </span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :   function setInterestRateParams(</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :     address reserve,</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :     InterestRateData calldata rateData</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :   ) external onlyPoolConfigurator {</span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">       10000 :     _setInterestRateParams(reserve, rateData);</span></span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :   }</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             : </span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">        1000 :   function getInterestRateData(address reserve) external view returns (InterestRateDataRay memory) {</span></span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">        3000 :     return _rayifyRateData(_interestRateData[reserve]);</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :   }</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             : </span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">        1000 :   function getInterestRateDataBps(address reserve) external view returns (InterestRateData memory) {</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">        2000 :     return _interestRateData[reserve];</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :   uint256 public constant MIN_OPTIMAL_POINT = 1_00;</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             : </span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   uint256 public constant MAX_OPTIMAL_POINT = 99_00;</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             : </span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   /// @dev Map of reserves address and their interest rate data (reserveAddress =&gt; interestRateData)</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   mapping(address =&gt; InterestRateData) internal _interestRateData;</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   modifier onlyPoolConfigurator() {</span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC tlaBgGNC">      190067 :     require(</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :       msg.sender == ADDRESSES_PROVIDER.getPoolConfigurator(),</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :       Errors.CALLER_NOT_POOL_CONFIGURATOR</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :     );</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :     _;</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   }</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             : </span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   /**</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :    * @dev Constructor.</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :    * @param provider The address of the PoolAddressesProvider of the associated Aave pool</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :    */</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :   constructor(address provider) {</span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">         147 :     require(provider != address(0), Errors.INVALID_ADDRESSES_PROVIDER);</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">         165 :     ADDRESSES_PROVIDER = IPoolAddressesProvider(provider);</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   }</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             : </span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   /// @inheritdoc IReserveInterestRateStrategy</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   function setInterestRateParams(</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :     address reserve,</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :     bytes calldata rateData</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   ) external onlyPoolConfigurator {</span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">      188067 :     _setInterestRateParams(reserve, abi.decode(rateData, (InterestRateData)));</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             : </span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   function setInterestRateParams(</span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :     address reserve,</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :     InterestRateData calldata rateData</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :   ) external onlyPoolConfigurator {</span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       10000 :     _setInterestRateParams(reserve, rateData);</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">        6003 :   function getOptimalUsageRatio(address reserve) external view returns (uint256) {</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">       18009 :     return _bpsToRay(uint256(_interestRateData[reserve].optimalUsageRatio));</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function getInterestRateData(address reserve) external view returns (InterestRateDataRay memory) {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        1000 :     return _rayifyRateData(_interestRateData[reserve]);</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :   }</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             : </span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">        6008 :   function getVariableRateSlope1(address reserve) external view returns (uint256) {</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">       18024 :     return _bpsToRay(uint256(_interestRateData[reserve].variableRateSlope1));</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   function getInterestRateDataBps(address reserve) external view returns (InterestRateData memory) {</span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">        1000 :     return _interestRateData[reserve];</span></span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :   }</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             : </span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        3004 :   function getVariableRateSlope2(address reserve) external view returns (uint256) {</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">        9012 :     return _bpsToRay(uint256(_interestRateData[reserve].variableRateSlope2));</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :   function getOptimalUsageRatio(address reserve) external view returns (uint256) {</span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">        8088 :     return _bpsToRay(uint256(_interestRateData[reserve].optimalUsageRatio));</span></span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :   }</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             : </span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">        9008 :   function getBaseVariableBorrowRate(address reserve) external view override returns (uint256) {</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">       27024 :     return _bpsToRay(uint256(_interestRateData[reserve].baseVariableBorrowRate));</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :   function getVariableRateSlope1(address reserve) external view returns (uint256) {</span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">        8092 :     return _bpsToRay(uint256(_interestRateData[reserve].variableRateSlope1));</span></span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :   }</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             : </span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">        3002 :   function getMaxVariableBorrowRate(address reserve) external view override returns (uint256) {</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">        6004 :     return</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">        6004 :       _bpsToRay(</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :             :         uint256(</span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :           _interestRateData[reserve].baseVariableBorrowRate +</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :             _interestRateData[reserve].variableRateSlope1 +</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :             _interestRateData[reserve].variableRateSlope2</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             :         )</span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :       );</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :   }</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             : </span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :   /// @inheritdoc IReserveInterestRateStrategy</span>
-<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">       49547 :   function calculateInterestRates(</span></span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :     DataTypes.CalculateInterestRatesParams memory params</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :   ) public view virtual override returns (uint256, uint256, uint256) {</span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">      148641 :     InterestRateDataRay memory rateData = _rayifyRateData(_interestRateData[params.reserve]);</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :             : </span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :     // @note This is a short circuit to allow mintable assets, which by definition cannot be supplied</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :     // and thus do not use virtual underlying balances.</span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">       99094 :     if (!params.usingVirtualBalance) {</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        2000 :       return (0, 0, rateData.baseVariableBorrowRate);</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :     }</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             : </span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">       97094 :     CalcInterestRatesLocalVars memory vars;</span></span>
-<span id="L127"><span class="lineNum">     127</span>                 :             : </span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">       97094 :     vars.totalDebt = params.totalStableDebt + params.totalVariableDebt;</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :   function getVariableRateSlope2(address reserve) external view returns (uint256) {</span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">        5088 :     return _bpsToRay(uint256(_interestRateData[reserve].variableRateSlope2));</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   }</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             : </span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   function getBaseVariableBorrowRate(address reserve) external view override returns (uint256) {</span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       11092 :     return _bpsToRay(uint256(_interestRateData[reserve].baseVariableBorrowRate));</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             : </span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :   /// @inheritdoc IDefaultInterestRateStrategyV2</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :   function getMaxVariableBorrowRate(address reserve) external view override returns (uint256) {</span>
+<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">        5084 :     return</span></span>
+<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">        5084 :       _bpsToRay(</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :         uint256(</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :           _interestRateData[reserve].baseVariableBorrowRate +</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :             _interestRateData[reserve].variableRateSlope1 +</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :             _interestRateData[reserve].variableRateSlope2</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :         )</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :       );</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             : </span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IReserveInterestRateStrategy</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   function calculateInterestRates(</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     DataTypes.CalculateInterestRatesParams memory params</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :   ) external view virtual override returns (uint256, uint256) {</span>
+<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">       92717 :     InterestRateDataRay memory rateData = _rayifyRateData(_interestRateData[params.reserve]);</span></span>
 <span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">       97094 :     vars.currentLiquidityRate = 0;</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">       97094 :     vars.currentVariableBorrowRate = rateData.baseVariableBorrowRate;</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :             : </span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">       97094 :     if (vars.totalDebt != 0) {</span></span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">       47514 :       vars.availableLiquidity =</span></span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :         params.virtualUnderlyingBalance +</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :         params.liquidityAdded -</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :         params.liquidityTaken;</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             : </span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">       47512 :       vars.availableLiquidityPlusDebt = vars.availableLiquidity + vars.totalDebt;</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">       47512 :       vars.borrowUsageRatio = vars.totalDebt.rayDiv(vars.availableLiquidityPlusDebt);</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">       47512 :       vars.supplyUsageRatio = vars.totalDebt.rayDiv(</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :         vars.availableLiquidityPlusDebt + params.unbacked</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :       );</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :     } else {</span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">       49580 :       return (0, 0, vars.currentVariableBorrowRate);</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :     }</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             : </span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">       47512 :     if (vars.borrowUsageRatio &gt; rateData.optimalUsageRatio) {</span></span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       12192 :       uint256 excessBorrowUsageRatio = (vars.borrowUsageRatio - rateData.optimalUsageRatio).rayDiv(</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :         WadRayMath.RAY - rateData.optimalUsageRatio</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :     // @note This is a short circuit to allow mintable assets (ex. GHO), which by definition cannot be supplied</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :     // and thus do not use virtual underlying balances.</span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">       92717 :     if (!params.usingVirtualBalance) {</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">        1000 :       return (0, rateData.baseVariableBorrowRate);</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :     }</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             : </span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       91717 :     CalcInterestRatesLocalVars memory vars;</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :             : </span>
+<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">       91717 :     vars.currentLiquidityRate = 0;</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">       91717 :     vars.currentVariableBorrowRate = rateData.baseVariableBorrowRate;</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :             : </span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">       91717 :     if (params.totalDebt != 0) {</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">       32099 :       vars.availableLiquidity =</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :         params.virtualUnderlyingBalance +</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :         params.liquidityAdded -</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :         params.liquidityTaken;</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             : </span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">       32098 :       vars.availableLiquidityPlusDebt = vars.availableLiquidity + params.totalDebt;</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">       32098 :       vars.borrowUsageRatio = params.totalDebt.rayDiv(vars.availableLiquidityPlusDebt);</span></span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       32098 :       vars.supplyUsageRatio = params.totalDebt.rayDiv(</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :         vars.availableLiquidityPlusDebt + params.unbacked</span>
 <span id="L151"><span class="lineNum">     151</span>                 :             :       );</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             : </span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        8128 :       vars.currentVariableBorrowRate +=</span></span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :         rateData.variableRateSlope1 +</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :         rateData.variableRateSlope2.rayMul(excessBorrowUsageRatio);</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :     } else {</span>
-<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">       39384 :       vars.currentVariableBorrowRate += rateData</span></span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :         .variableRateSlope1</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :         .rayMul(vars.borrowUsageRatio)</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :         .rayDiv(rateData.optimalUsageRatio);</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :     }</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             : </span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">       47512 :     vars.currentLiquidityRate = _getOverallBorrowRate(</span></span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :       params.totalStableDebt,</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :       params.totalVariableDebt,</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :       vars.currentVariableBorrowRate,</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :       params.averageStableBorrowRate</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :     ).rayMul(vars.supplyUsageRatio).percentMul(</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :         PercentageMath.PERCENTAGE_FACTOR - params.reserveFactor</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :       );</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             : </span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">       47512 :     return (vars.currentLiquidityRate, 0, vars.currentVariableBorrowRate);</span></span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :   }</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             : </span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :   /**</span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :    * @dev Calculates the overall borrow rate as the weighted average between the total variable debt and total stable</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :    * debt</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :    * @param totalStableDebt The total borrowed from the reserve at a stable rate</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :    * @param totalVariableDebt The total borrowed from the reserve at a variable rate</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :    * @param currentVariableBorrowRate The current variable borrow rate of the reserve</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :    * @param currentAverageStableBorrowRate The current weighted average of all the stable rate loans</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :    * @return The weighted averaged borrow rate</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :     } else {</span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">       59618 :       return (0, vars.currentVariableBorrowRate);</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :     }</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             : </span>
+<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">       32098 :     if (vars.borrowUsageRatio &gt; rateData.optimalUsageRatio) {</span></span>
+<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">        6390 :       uint256 excessBorrowUsageRatio = (vars.borrowUsageRatio - rateData.optimalUsageRatio).rayDiv(</span></span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :         WadRayMath.RAY - rateData.optimalUsageRatio</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :       );</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             : </span>
+<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">        6390 :       vars.currentVariableBorrowRate +=</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :         rateData.variableRateSlope1 +</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :         rateData.variableRateSlope2.rayMul(excessBorrowUsageRatio);</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :     } else {</span>
+<span id="L165"><span class="lineNum">     165</span>                 :<span class="tlaGNC">       25708 :       vars.currentVariableBorrowRate += rateData</span></span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :         .variableRateSlope1</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :         .rayMul(vars.borrowUsageRatio)</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :         .rayDiv(rateData.optimalUsageRatio);</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :     }</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             : </span>
+<span id="L171"><span class="lineNum">     171</span>                 :<span class="tlaGNC">       32098 :     vars.currentLiquidityRate = vars</span></span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :       .currentVariableBorrowRate</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :       .rayMul(vars.supplyUsageRatio)</span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :       .percentMul(PercentageMath.PERCENTAGE_FACTOR - params.reserveFactor);</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             : </span>
+<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">       32098 :     return (vars.currentLiquidityRate, vars.currentVariableBorrowRate);</span></span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :   }</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             : </span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :   /**</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :    * @dev Doing validations and data update for an asset</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :    * @param reserve address of the underlying asset of the reserve</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :    * @param rateData Encoded reserve interest rate data to apply</span>
 <span id="L183"><span class="lineNum">     183</span>                 :             :    */</span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">       23756 :   function _getOverallBorrowRate(</span></span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :     uint256 totalStableDebt,</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :     uint256 totalVariableDebt,</span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :     uint256 currentVariableBorrowRate,</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             :     uint256 currentAverageStableBorrowRate</span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :   ) internal pure returns (uint256) {</span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">       71268 :     uint256 totalDebt = totalStableDebt + totalVariableDebt;</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :             : </span>
-<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">       71268 :     uint256 weightedVariableRate = totalVariableDebt.wadToRay().rayMul(currentVariableBorrowRate);</span></span>
-<span id="L193"><span class="lineNum">     193</span>                 :             : </span>
-<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">       71268 :     uint256 weightedStableRate = totalStableDebt.wadToRay().rayMul(currentAverageStableBorrowRate);</span></span>
-<span id="L195"><span class="lineNum">     195</span>                 :             : </span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">       71268 :     uint256 overallBorrowRate = (weightedVariableRate + weightedStableRate).rayDiv(</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :       totalDebt.wadToRay()</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :     );</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             : </span>
-<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">       47512 :     return overallBorrowRate;</span></span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :   }</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             : </span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :   /**</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :    * @dev Doing validations and data update for an asset</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :    * @param reserve address of the underlying asset of the reserve</span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :    * @param rateData Encoded eserve interest rate data to apply</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :    */</span>
-<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">       23891 :   function _setInterestRateParams(address reserve, InterestRateData memory rateData) internal {</span></span>
-<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">       47782 :     require(reserve != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
-<span id="L210"><span class="lineNum">     210</span>                 :             : </span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">       43782 :     require(</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :       rateData.optimalUsageRatio &lt;= MAX_OPTIMAL_POINT &amp;&amp;</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :         rateData.optimalUsageRatio &gt;= MIN_OPTIMAL_POINT,</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :       Errors.INVALID_OPTIMAL_USAGE_RATIO</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :     );</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :   function _setInterestRateParams(address reserve, InterestRateData memory rateData) internal {</span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">      198067 :     require(reserve != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L186"><span class="lineNum">     186</span>                 :             : </span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">      194067 :     require(</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :       rateData.optimalUsageRatio &lt;= MAX_OPTIMAL_POINT &amp;&amp;</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :         rateData.optimalUsageRatio &gt;= MIN_OPTIMAL_POINT,</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :       Errors.INVALID_OPTIMAL_USAGE_RATIO</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :     );</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             : </span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">      186067 :     require(</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :       rateData.variableRateSlope1 &lt;= rateData.variableRateSlope2,</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :       Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :     );</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             : </span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :     // The maximum rate should not be above certain threshold</span>
+<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">      182067 :     require(</span></span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :       uint256(rateData.baseVariableBorrowRate) +</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :         uint256(rateData.variableRateSlope1) +</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :         uint256(rateData.variableRateSlope2) &lt;=</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :         MAX_BORROW_RATE,</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :       Errors.INVALID_MAX_RATE</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :     );</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             : </span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">      178067 :     _interestRateData[reserve] = rateData;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">      178067 :     emit RateDataUpdate(</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :       reserve,</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             :       rateData.optimalUsageRatio,</span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :       rateData.baseVariableBorrowRate,</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :       rateData.variableRateSlope1,</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :       rateData.variableRateSlope2</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :     );</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :   }</span>
 <span id="L216"><span class="lineNum">     216</span>                 :             : </span>
-<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">       35782 :     require(</span></span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :       rateData.variableRateSlope1 &lt;= rateData.variableRateSlope2,</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             :       Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1</span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :     );</span>
-<span id="L221"><span class="lineNum">     221</span>                 :             : </span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :     // The maximum rate should not be above certain threshold</span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">       31782 :     require(</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :       uint256(rateData.baseVariableBorrowRate) +</span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :         uint256(rateData.variableRateSlope1) +</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :         uint256(rateData.variableRateSlope2) &lt;=</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             :         MAX_BORROW_RATE,</span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :       Errors.INVALID_MAXRATE</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :     );</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             : </span>
-<span id="L231"><span class="lineNum">     231</span>                 :<span class="tlaGNC">       27782 :     _interestRateData[reserve] = rateData;</span></span>
-<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">       27782 :     emit RateDataUpdate(</span></span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :       reserve,</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :       rateData.optimalUsageRatio,</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :       rateData.baseVariableBorrowRate,</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :       rateData.variableRateSlope1,</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :       rateData.variableRateSlope2</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :     );</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :   }</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             : </span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :   /**</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :    * @dev Transforms an InterestRateData struct to an InterestRateDataRay struct by multiplying all values</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :    * by 1e23, turning them into ray values</span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :    *</span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :    * @param data The InterestRateData struct to transform</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             :    *</span>
-<span id="L247"><span class="lineNum">     247</span>                 :             :    * @return The resulting InterestRateDataRay struct</span>
-<span id="L248"><span class="lineNum">     248</span>                 :             :    */</span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">       50547 :   function _rayifyRateData(</span></span>
-<span id="L250"><span class="lineNum">     250</span>                 :             :     InterestRateData memory data</span>
-<span id="L251"><span class="lineNum">     251</span>                 :             :   ) internal pure returns (InterestRateDataRay memory) {</span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">      101094 :     return</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :<span class="tlaGNC">      101094 :       InterestRateDataRay({</span></span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :         optimalUsageRatio: _bpsToRay(uint256(data.optimalUsageRatio)),</span>
-<span id="L255"><span class="lineNum">     255</span>                 :             :         baseVariableBorrowRate: _bpsToRay(uint256(data.baseVariableBorrowRate)),</span>
-<span id="L256"><span class="lineNum">     256</span>                 :             :         variableRateSlope1: _bpsToRay(uint256(data.variableRateSlope1)),</span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :         variableRateSlope2: _bpsToRay(uint256(data.variableRateSlope2))</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :       });</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :   }</span>
-<span id="L260"><span class="lineNum">     260</span>                 :             : </span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :   // @dev helper function added here, as generally the protocol doesn't use bps</span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">      229213 :   function _bpsToRay(uint256 n) internal pure returns (uint256) {</span></span>
-<span id="L263"><span class="lineNum">     263</span>                 :<span class="tlaGNC">      687639 :     return n * 1e23;</span></span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :   }</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             : }</span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :   /**</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :    * @dev Transforms an InterestRateData struct to an InterestRateDataRay struct by multiplying all values</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :    * by 1e23, turning them into ray values</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :    *</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :    * @param data The InterestRateData struct to transform</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :    *</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :    * @return The resulting InterestRateDataRay struct</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :    */</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :   function _rayifyRateData(</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :     InterestRateData memory data</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :   ) internal pure returns (InterestRateDataRay memory) {</span>
+<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">       93717 :     return</span></span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :       InterestRateDataRay({</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :         optimalUsageRatio: _bpsToRay(uint256(data.optimalUsageRatio)),</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :         baseVariableBorrowRate: _bpsToRay(uint256(data.baseVariableBorrowRate)),</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :         variableRateSlope1: _bpsToRay(uint256(data.variableRateSlope1)),</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :         variableRateSlope2: _bpsToRay(uint256(data.variableRateSlope2))</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :       });</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :   }</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             : </span>
+<span id="L237"><span class="lineNum">     237</span>                 :             :   // @dev helper function added here, as generally the protocol doesn't use bps</span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :   function _bpsToRay(uint256 n) internal pure returns (uint256) {</span>
+<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">      412312 :     return n * 1e23;</span></span>
+<span id="L240"><span class="lineNum">     240</span>                 :             :   }</span>
+<span id="L241"><span class="lineNum">     241</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -341,8 +317,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func-c.html b/report/misc/PriceOracleSentinel.sol.func-c.html
similarity index 67%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func-c.html
rename to report/misc/PriceOracleSentinel.sol.func-c.html
index d63dff30..6e8daa7d 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func-c.html
+++ b/report/misc/PriceOracleSentinel.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/PriceOracleSentinel.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (<a href="PriceOracleSentinel.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (<a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PriceOracleSentinel.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PriceOracleSentinel.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -84,6 +84,20 @@
               <td class="coverFnHi">1</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L19">PriceOracleSentinel.onlyPoolAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L28">PriceOracleSentinel.onlyRiskOrPoolAdmins</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L81">PriceOracleSentinel.setGracePeriod</a></td>
@@ -119,13 +133,20 @@
               <td class="coverFnHi">10</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L49">PriceOracleSentinel.</a></td>
+              
+              <td class="coverFnHi">50</td>
+              
+              
             </tr>
           </table>
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func.html b/report/misc/PriceOracleSentinel.sol.func.html
similarity index 67%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func.html
rename to report/misc/PriceOracleSentinel.sol.func.html
index 7b4171e0..e024a865 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.func.html
+++ b/report/misc/PriceOracleSentinel.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/PriceOracleSentinel.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (<a href="PriceOracleSentinel.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (<a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PriceOracleSentinel.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PriceOracleSentinel.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L49">PriceOracleSentinel.</a></td>
+              
+              <td class="coverFnHi">50</td>
               
               
             </tr>
@@ -105,6 +112,20 @@
               <td class="coverFnHi">5</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L19">PriceOracleSentinel.onlyPoolAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L28">PriceOracleSentinel.onlyRiskOrPoolAdmins</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="PriceOracleSentinel.sol.gcov.html#L81">PriceOracleSentinel.setGracePeriod</a></td>
@@ -124,8 +145,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.gcov.html b/report/misc/PriceOracleSentinel.sol.gcov.html
similarity index 77%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.gcov.html
rename to report/misc/PriceOracleSentinel.sol.gcov.html
index bcae9cb6..b3ade1e7 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol.gcov.html
+++ b/report/misc/PriceOracleSentinel.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/PriceOracleSentinel.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (source / <a href="PriceOracleSentinel.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc">misc</a> - PriceOracleSentinel.sol<span style="font-size: 80%;"> (source / <a href="PriceOracleSentinel.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">10</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,11 +72,11 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPriceOracleSentinel} from '../../interfaces/IPriceOracleSentinel.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {ISequencerOracle} from '../../interfaces/ISequencerOracle.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IACLManager} from '../../interfaces/IACLManager.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {Errors} from '../protocol/libraries/helpers/Errors.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPriceOracleSentinel} from '../interfaces/IPriceOracleSentinel.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {ISequencerOracle} from '../interfaces/ISequencerOracle.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IACLManager} from '../interfaces/IACLManager.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : </span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : /**</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :  * @title PriceOracleSentinel</span>
@@ -90,8 +90,8 @@
 <span id="L19"><span class="lineNum">      19</span>                 :             :    * @dev Only pool admin can call functions marked by this modifier.</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :    */</span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :   modifier onlyPoolAdmin() {</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span>
+<span id="L22"><span class="lineNum">      22</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span></span>
+<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">           2 :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span></span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :     _;</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   }</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             : </span>
@@ -99,8 +99,8 @@
 <span id="L28"><span class="lineNum">      28</span>                 :             :    * @dev Only risk or pool admin can call functions marked by this modifier.</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :    */</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :   modifier onlyRiskOrPoolAdmins() {</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :     require(</span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">           2 :     IACLManager aclManager = IACLManager(ADDRESSES_PROVIDER.getACLManager());</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">           2 :     require(</span></span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :       aclManager.isRiskAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :       Errors.CALLER_NOT_RISK_OR_POOL_ADMIN</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :     );</span>
@@ -120,50 +120,50 @@
 <span id="L49"><span class="lineNum">      49</span>                 :             :    * @param gracePeriod The duration of the grace period in seconds</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :    */</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   constructor(IPoolAddressesProvider provider, ISequencerOracle oracle, uint256 gracePeriod) {</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :     ADDRESSES_PROVIDER = provider;</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :     _sequencerOracle = oracle;</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :     _gracePeriod = gracePeriod;</span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">          31 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">          28 :     _sequencerOracle = oracle;</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">          20 :     _gracePeriod = gracePeriod;</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :   }</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC tlaBgGNC">           5 :   function isBorrowAllowed() public view override returns (bool) {</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">          15 :     return _isUpAndGracePeriodPassed();</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :   function isBorrowAllowed() external view override returns (bool) {</span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           5 :     return _isUpAndGracePeriodPassed();</span></span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   }</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             : </span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           5 :   function isLiquidationAllowed() public view override returns (bool) {</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">          15 :     return _isUpAndGracePeriodPassed();</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   function isLiquidationAllowed() external view override returns (bool) {</span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           5 :     return _isUpAndGracePeriodPassed();</span></span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             : </span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   /**</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :    * @notice Checks the sequencer oracle is healthy: is up and grace period passed.</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :    * @return True if the SequencerOracle is up and the grace period passed, false otherwise</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :    */</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          10 :   function _isUpAndGracePeriodPassed() internal view returns (bool) {</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          30 :     (, int256 answer, uint256 startedAt, , ) = _sequencerOracle.latestRoundData();</span></span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          48 :     return answer == 0 &amp;&amp; block.timestamp - startedAt &gt; _gracePeriod;</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   function _isUpAndGracePeriodPassed() internal view returns (bool) {</span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">          10 :     (, int256 answer, uint256 startedAt, , ) = _sequencerOracle.latestRoundData();</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          10 :     return answer == 0 &amp;&amp; block.timestamp - startedAt &gt; _gracePeriod;</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   }</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             : </span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           2 :   function setSequencerOracle(address newSequencerOracle) public onlyPoolAdmin {</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           2 :     _sequencerOracle = ISequencerOracle(newSequencerOracle);</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           2 :     emit SequencerOracleUpdated(newSequencerOracle);</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   function setSequencerOracle(address newSequencerOracle) external onlyPoolAdmin {</span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           1 :     _sequencerOracle = ISequencerOracle(newSequencerOracle);</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           1 :     emit SequencerOracleUpdated(newSequencerOracle);</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">           2 :   function setGracePeriod(uint256 newGracePeriod) public onlyRiskOrPoolAdmins {</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           2 :     _gracePeriod = newGracePeriod;</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">           2 :     emit GracePeriodUpdated(newGracePeriod);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function setGracePeriod(uint256 newGracePeriod) external onlyRiskOrPoolAdmins {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           1 :     _gracePeriod = newGracePeriod;</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">           1 :     emit GracePeriodUpdated(newGracePeriod);</span></span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :   }</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             : </span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">           1 :   function getSequencerOracle() public view returns (address) {</span></span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">           3 :     return address(_sequencerOracle);</span></span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :   function getSequencerOracle() external view returns (address) {</span>
+<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">           1 :     return address(_sequencerOracle);</span></span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :   }</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             : </span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :   /// @inheritdoc IPriceOracleSentinel</span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           1 :   function getGracePeriod() public view returns (uint256) {</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           2 :     return _gracePeriod;</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :   function getGracePeriod() external view returns (uint256) {</span>
+<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           1 :     return _gracePeriod;</span></span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   }</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             : }</span>
         </pre>
@@ -173,8 +173,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html
similarity index 63%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html
rename to report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html
index 6e5d290f..eeea7ea9 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html
+++ b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L25">BaseImmutableAdminUpgradeabilityProxy.ifAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
               
               
             </tr>
@@ -95,14 +102,21 @@
             <tr>
               <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L67">BaseImmutableAdminUpgradeabilityProxy.upgradeToAndCall</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">13</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L21">BaseImmutableAdminUpgradeabilityProxy.</a></td>
+              
+              <td class="coverFnHi">46</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L79">BaseImmutableAdminUpgradeabilityProxy._willFallback</a></td>
               
-              <td class="coverFnHi">723623</td>
+              <td class="coverFnHi">2165226</td>
               
               
             </tr>
@@ -110,8 +124,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html
similarity index 63%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html
rename to report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html
index eaed6f00..181045ea 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html
+++ b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td></td>
@@ -53,28 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L21">BaseImmutableAdminUpgradeabilityProxy.</a></td>
+              
+              <td class="coverFnHi">46</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L79">BaseImmutableAdminUpgradeabilityProxy._willFallback</a></td>
               
-              <td class="coverFnHi">723623</td>
+              <td class="coverFnHi">2165226</td>
               
               
             </tr>
@@ -84,6 +91,13 @@
               <td class="coverFnHi">8</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L25">BaseImmutableAdminUpgradeabilityProxy.ifAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L45">BaseImmutableAdminUpgradeabilityProxy.implementation</a></td>
@@ -102,7 +116,7 @@
             <tr>
               <td class="coverFn"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html#L67">BaseImmutableAdminUpgradeabilityProxy.upgradeToAndCall</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">13</td>
               
               
             </tr>
@@ -110,8 +124,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html
similarity index 81%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html
rename to report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html
index c8f68263..52c8d83b 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html
+++ b/report/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (source / <a href="BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - BaseImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (source / <a href="BaseImmutableAdminUpgradeabilityProxy.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,7 +72,7 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {BaseUpgradeabilityProxy} from '../../../dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {BaseUpgradeabilityProxy} from '../../dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : </span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : /**</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             :  * @title BaseImmutableAdminUpgradeabilityProxy</span>
@@ -92,14 +92,14 @@
 <span id="L21"><span class="lineNum">      21</span>                 :             :    * @param admin_ The address of the admin</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             :    */</span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :   constructor(address admin_) {</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :     _admin = admin_;</span>
+<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaGNC tlaBgGNC">          46 :     _admin = admin_;</span></span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   }</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             : </span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   modifier ifAdmin() {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :     if (msg.sender == _admin) {</span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">           2 :     if (msg.sender == _admin) {</span></span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :       _;</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :     } else {</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :       _fallback();</span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">           1 :       _fallback();</span></span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :     }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :   }</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             : </span>
@@ -107,16 +107,16 @@
 <span id="L36"><span class="lineNum">      36</span>                 :             :    * @notice Return the admin address</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :    * @return The address of the proxy admin.</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :    */</span>
-<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC tlaBgGNC">           8 :   function admin() external ifAdmin returns (address) {</span></span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">          16 :     return _admin;</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   function admin() external ifAdmin returns (address) {</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">           8 :     return _admin;</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   }</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             : </span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :   /**</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :    * @notice Return the implementation address</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :    * @return The address of the implementation.</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :    */</span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           3 :   function implementation() external ifAdmin returns (address) {</span></span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           9 :     return _implementation();</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   function implementation() external ifAdmin returns (address) {</span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           3 :     return _implementation();</span></span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             : </span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   /**</span>
@@ -124,8 +124,8 @@
 <span id="L53"><span class="lineNum">      53</span>                 :             :    * @dev Only the admin can call this function.</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :    * @param newImplementation The address of the new implementation.</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :    */</span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           2 :   function upgradeTo(address newImplementation) external ifAdmin {</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           2 :     _upgradeTo(newImplementation);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   function upgradeTo(address newImplementation) external ifAdmin {</span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           1 :     _upgradeTo(newImplementation);</span></span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :   }</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   /**</span>
@@ -137,21 +137,21 @@
 <span id="L66"><span class="lineNum">      66</span>                 :             :    * It should include the signature and the parameters of the function to be called, as described in</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :    * https://solidity.readthedocs.io/en/v0.4.24/abi-spec.html#function-selector-and-argument-encoding.</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :    */</span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">          14 :   function upgradeToAndCall(</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :   function upgradeToAndCall(</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :     address newImplementation,</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :     bytes calldata data</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   ) external payable ifAdmin {</span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          26 :     _upgradeTo(newImplementation);</span></span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          39 :     (bool success, ) = newImplementation.delegatecall(data);</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          26 :     require(success);</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          12 :     _upgradeTo(newImplementation);</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          12 :     (bool success, ) = newImplementation.delegatecall(data);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          12 :     require(success);</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   }</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :   /**</span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :    * @notice Only fall back when the sender is not the admin.</span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :    */</span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">      723623 :   function _willFallback() internal virtual override {</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">     1447246 :     require(msg.sender != _admin, 'Cannot call fallback function from the proxy admin');</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">     1447246 :     super._willFallback();</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :   function _willFallback() internal virtual override {</span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">     2165226 :     require(msg.sender != _admin, 'Cannot call fallback function from the proxy admin');</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">     2165226 :     super._willFallback();</span></span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   }</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : }</span>
         </pre>
@@ -161,8 +161,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html
rename to report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html
index 4d2f52d6..bf41678a 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html
+++ b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td></td>
@@ -53,28 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html#L19">InitializableImmutableAdminUpgradeabilityProxy.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnHi">142</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html#L24">InitializableImmutableAdminUpgradeabilityProxy._willFallback</a></td>
               
-              <td class="coverFnHi">723623</td>
+              <td class="coverFnHi">2165226</td>
               
               
             </tr>
@@ -82,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html
rename to report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html
index d1d87275..11f67cbb 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html
+++ b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (<a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td></td>
@@ -53,28 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html#L19">InitializableImmutableAdminUpgradeabilityProxy.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnHi">142</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html#L24">InitializableImmutableAdminUpgradeabilityProxy._willFallback</a></td>
               
-              <td class="coverFnHi">723623</td>
+              <td class="coverFnHi">2165226</td>
               
               
             </tr>
@@ -82,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html
similarity index 75%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html
rename to report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html
index 248a1551..07ba6326 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html
+++ b/report/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (source / <a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - InitializableImmutableAdminUpgradeabilityProxy.sol<span style="font-size: 80%;"> (source / <a href="InitializableImmutableAdminUpgradeabilityProxy.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,8 +72,8 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {InitializableUpgradeabilityProxy} from '../../../dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {Proxy} from '../../../dependencies/openzeppelin/upgradeability/Proxy.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {InitializableUpgradeabilityProxy} from '../../dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {Proxy} from '../../dependencies/openzeppelin/upgradeability/Proxy.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {BaseImmutableAdminUpgradeabilityProxy} from './BaseImmutableAdminUpgradeabilityProxy.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : </span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
@@ -94,8 +94,8 @@
 <span id="L23"><span class="lineNum">      23</span>                 :             :   }</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             : </span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   /// @inheritdoc BaseImmutableAdminUpgradeabilityProxy</span>
-<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC tlaBgGNC">      723623 :   function _willFallback() internal override(BaseImmutableAdminUpgradeabilityProxy, Proxy) {</span></span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">     1447246 :     BaseImmutableAdminUpgradeabilityProxy._willFallback();</span></span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :   function _willFallback() internal override(BaseImmutableAdminUpgradeabilityProxy, Proxy) {</span>
+<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC tlaBgGNC">     2165226 :     BaseImmutableAdminUpgradeabilityProxy._willFallback();</span></span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :   }</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             : }</span>
         </pre>
@@ -105,8 +105,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/misc/aave-upgradeability/VersionedInitializable.sol.func-c.html b/report/misc/aave-upgradeability/VersionedInitializable.sol.func-c.html
new file mode 100644
index 00000000..e6d9f827
--- /dev/null
+++ b/report/misc/aave-upgradeability/VersionedInitializable.sol.func-c.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/VersionedInitializable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (<a href="VersionedInitializable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VersionedInitializable.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L28">VersionedInitializable.initializer</a></td>
+              
+              <td class="coverFnHi">346987</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L59">VersionedInitializable.isConstructor</a></td>
+              
+              <td class="coverFnHi">346987</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/aave-upgradeability/VersionedInitializable.sol.func.html b/report/misc/aave-upgradeability/VersionedInitializable.sol.func.html
new file mode 100644
index 00000000..c9988d86
--- /dev/null
+++ b/report/misc/aave-upgradeability/VersionedInitializable.sol.func.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/VersionedInitializable.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (<a href="VersionedInitializable.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VersionedInitializable.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L28">VersionedInitializable.initializer</a></td>
+              
+              <td class="coverFnHi">346987</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VersionedInitializable.sol.gcov.html#L59">VersionedInitializable.isConstructor</a></td>
+              
+              <td class="coverFnHi">346987</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.gcov.html b/report/misc/aave-upgradeability/VersionedInitializable.sol.gcov.html
similarity index 83%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.gcov.html
rename to report/misc/aave-upgradeability/VersionedInitializable.sol.gcov.html
index 41805ea2..298962d7 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol.gcov.html
+++ b/report/misc/aave-upgradeability/VersionedInitializable.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability/VersionedInitializable.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (source / <a href="VersionedInitializable.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/aave-upgradeability">misc/aave-upgradeability</a> - VersionedInitializable.sol<span style="font-size: 80%;"> (source / <a href="VersionedInitializable.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -99,22 +99,22 @@
 <span id="L28"><span class="lineNum">      28</span>                 :             :    * @dev Modifier to use in the initializer function of a contract.</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :    */</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :   modifier initializer() {</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     uint256 revision = getRevision();</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :     require(</span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC tlaBgGNC">      346987 :     uint256 revision = getRevision();</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">      346987 :     require(</span></span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :       initializing || isConstructor() || revision &gt; lastInitializedRevision,</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :       'Contract instance has already been initialized'</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :     );</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     bool isTopLevelCall = !initializing;</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     if (isTopLevelCall) {</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :       initializing = true;</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :       lastInitializedRevision = revision;</span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">      345986 :     bool isTopLevelCall = !initializing;</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">      345986 :     if (isTopLevelCall) {</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC">      345986 :       initializing = true;</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">      345986 :       lastInitializedRevision = revision;</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :     }</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             : </span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :     _;</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             : </span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     if (isTopLevelCall) {</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :       initializing = false;</span>
+<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">      344984 :     if (isTopLevelCall) {</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">      344984 :       initializing = false;</span></span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :     }</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :   }</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             : </span>
@@ -129,18 +129,18 @@
 <span id="L58"><span class="lineNum">      58</span>                 :             :    * @notice Returns true if and only if the function is running in the constructor</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :    * @return True if the function is running in the constructor</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :    */</span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC tlaBgGNC">       15381 :   function isConstructor() private view returns (bool) {</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :   function isConstructor() private view returns (bool) {</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :     // extcodesize checks the size of the code stored in an address, and</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :     // address returns the current address. Since the code is still not</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     // deployed when running a constructor, any checks on its code size will</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     // yield zero, making it an effective way to detect if a contract is</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     // under construction or not.</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">       30762 :     uint256 cs;</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">      346987 :     uint256 cs;</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     //solium-disable-next-line</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     assembly {</span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">       30762 :       cs := extcodesize(address())</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">      346987 :       cs := extcodesize(address())</span></span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :     }</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       46143 :     return cs == 0;</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">      346987 :     return cs == 0;</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :   }</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   // Reserved storage space to allow for layout changes in the future.</span>
@@ -153,8 +153,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-b.html b/report/misc/aave-upgradeability/index-sort-b.html
similarity index 59%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-b.html
rename to report/misc/aave-upgradeability/index-sort-b.html
index e9076aeb..6fbec03e 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-b.html
+++ b/report/misc/aave-upgradeability/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - misc/aave-upgradeability</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">1</td>
@@ -122,31 +122,31 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html">VersionedInitializable.sol</a></td>
+              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/VersionedInitializable.sol">VersionedInitializable.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-f.html b/report/misc/aave-upgradeability/index-sort-f.html
similarity index 59%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-f.html
rename to report/misc/aave-upgradeability/index-sort-f.html
index b5084b97..c743f57f 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-f.html
+++ b/report/misc/aave-upgradeability/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - misc/aave-upgradeability</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">1</td>
@@ -107,46 +107,46 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html">VersionedInitializable.sol</a></td>
+              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/VersionedInitializable.sol">VersionedInitializable.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-l.html b/report/misc/aave-upgradeability/index-sort-l.html
similarity index 59%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-l.html
rename to report/misc/aave-upgradeability/index-sort-l.html
index 9ecef43f..b8ae0b74 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index-sort-l.html
+++ b/report/misc/aave-upgradeability/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - misc/aave-upgradeability</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">1</td>
@@ -107,46 +107,46 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html">VersionedInitializable.sol</a></td>
+              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/VersionedInitializable.sol">VersionedInitializable.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html b/report/misc/aave-upgradeability/index.html
similarity index 59%
rename from report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html
rename to report/misc/aave-upgradeability/index.html
index db271224..2fc18e97 100644
--- a/report/core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability/index.html
+++ b/report/misc/aave-upgradeability/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/aave-upgradeability</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/aave-upgradeability/src/core/contracts/protocol/libraries/aave-upgradeability</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - misc/aave-upgradeability</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">11</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="BaseImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol">BaseImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
+              <td class="coverFile"><a href="InitializableImmutableAdminUpgradeabilityProxy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol">InitializableImmutableAdminUpgradeabilityProxy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">1</td>
@@ -122,31 +122,31 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html">VersionedInitializable.sol</a></td>
+              <td class="coverFile"><a href="VersionedInitializable.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/aave-upgradeability/VersionedInitializable.sol">VersionedInitializable.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">11</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func-c.html b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func-c.html
new file mode 100644
index 00000000..a035c960
--- /dev/null
+++ b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func-c.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanReceiverBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanReceiverBase.sol<span style="font-size: 80%;"> (<a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="FlashLoanReceiverBase.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="FlashLoanReceiverBase.sol.gcov.html#L15">FlashLoanReceiverBase.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func.html b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func.html
new file mode 100644
index 00000000..cf8732da
--- /dev/null
+++ b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.func.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanReceiverBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanReceiverBase.sol<span style="font-size: 80%;"> (<a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="FlashLoanReceiverBase.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="FlashLoanReceiverBase.sol.gcov.html#L15">FlashLoanReceiverBase.</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.gcov.html b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.gcov.html
similarity index 54%
rename from report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.gcov.html
rename to report/misc/flashloan/base/FlashLoanReceiverBase.sol.gcov.html
index 8762d67b..540e9e6e 100644
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.gcov.html
+++ b/report/misc/flashloan/base/FlashLoanReceiverBase.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanReceiverBase.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a> - DataTypesHelper.sol<span style="font-size: 80%;"> (source / <a href="DataTypesHelper.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanReceiverBase.sol<span style="font-size: 80%;"> (source / <a href="FlashLoanReceiverBase.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">0</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
             <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">0</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,32 +72,24 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : </span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : /**</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             :  * @title DataTypesHelper</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             :  * @author Aave</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             :  * @dev Helper library to track user current debt balance, used by WrappedTokenGatewayV3</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             :  */</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : library DataTypesHelper {</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             :   /**</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             :    * @notice Fetches the user current stable and variable debt balances</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             :    * @param user The user address</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :    * @param reserve The reserve data object</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :    * @return The stable debt balance</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :    * @return The variable debt balance</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :    **/</span>
-<span id="L20"><span class="lineNum">      20</span>                 :<span class="tlaGNC tlaBgGNC">           5 :   function getUserCurrentDebt(</span></span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :     address user,</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :     DataTypes.ReserveDataLegacy memory reserve</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :   ) internal view returns (uint256, uint256) {</span>
-<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaGNC">          10 :     return (</span></span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :       IERC20(reserve.stableDebtTokenAddress).balanceOf(user),</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :       IERC20(reserve.variableDebtTokenAddress).balanceOf(user)</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :     );</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   }</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             : }</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IFlashLoanReceiver} from '../interfaces/IFlashLoanReceiver.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPool} from '../../../interfaces/IPool.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : </span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             :  * @title FlashLoanReceiverBase</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             :  * @author Aave</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             :  * @notice Base contract to develop a flashloan-receiver contract.</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             :  */</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : abstract contract FlashLoanReceiverBase is IFlashLoanReceiver {</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             :   IPoolAddressesProvider public immutable override ADDRESSES_PROVIDER;</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             :   IPool public immutable override POOL;</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : </span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :   constructor(IPoolAddressesProvider provider) {</span>
+<span id="L18"><span class="lineNum">      18</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L19"><span class="lineNum">      19</span>                 :<span class="tlaUNC">           0 :     POOL = IPool(provider.getPool());</span></span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   }</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -105,8 +97,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func-c.html b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func-c.html
similarity index 65%
rename from report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func-c.html
rename to report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func-c.html
index d37d5d7d..c50fb247 100644
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func-c.html
+++ b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanSimpleReceiverBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a> - DataTypesHelper.sol<span style="font-size: 80%;"> (<a href="DataTypesHelper.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanSimpleReceiverBase.sol<span style="font-size: 80%;"> (<a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="DataTypesHelper.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="FlashLoanSimpleReceiverBase.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DataTypesHelper.sol.gcov.html#L18">DataTypesHelper.getUserCurrentDebt</a></td>
+              <td class="coverFn"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html#L15">FlashLoanSimpleReceiverBase.</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">58</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func.html b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func.html
similarity index 65%
rename from report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func.html
rename to report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func.html
index e8c58a59..882c4121 100644
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol.func.html
+++ b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries/DataTypesHelper.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanSimpleReceiverBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/libraries/src/periphery/contracts/libraries</a> - DataTypesHelper.sol<span style="font-size: 80%;"> (<a href="DataTypesHelper.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanSimpleReceiverBase.sol<span style="font-size: 80%;"> (<a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="DataTypesHelper.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="FlashLoanSimpleReceiverBase.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DataTypesHelper.sol.gcov.html#L18">DataTypesHelper.getUserCurrentDebt</a></td>
+              <td class="coverFn"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html#L15">FlashLoanSimpleReceiverBase.</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">58</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.gcov.html b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.gcov.html
similarity index 57%
rename from report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.gcov.html
rename to report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.gcov.html
index 17c7eb68..786fcf67 100644
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.gcov.html
+++ b/report/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - misc/flashloan/base/FlashLoanSimpleReceiverBase.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a> - Helpers.sol<span style="font-size: 80%;"> (source / <a href="Helpers.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory misc/flashloan/base">misc/flashloan/base</a> - FlashLoanSimpleReceiverBase.sol<span style="font-size: 80%;"> (source / <a href="FlashLoanSimpleReceiverBase.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -70,33 +70,26 @@
 <pre class="sourceHeading">             Branch data     Line data    Source code</pre>
 <pre class="source">
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: MIT</span>
-<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.0;</span>
+<span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : </span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : /**</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             :  * @title Helpers library</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             :  * @author Aave</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             :  */</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : library Helpers {</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             :   /**</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             :    * @notice Fetches the user current stable and variable debt balances</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             :    * @param user The user address</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             :    * @param reserveCache The reserve cache data object</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :    * @return The stable debt balance</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :    * @return The variable debt balance</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :    */</span>
-<span id="L19"><span class="lineNum">      19</span>                 :<span class="tlaGNC tlaBgGNC">       16329 :   function getUserCurrentDebt(</span></span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :     address user,</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :     DataTypes.ReserveCache memory reserveCache</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :   ) internal view returns (uint256, uint256) {</span>
-<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">       32658 :     return (</span></span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :       IERC20(reserveCache.stableDebtTokenAddress).balanceOf(user),</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :       IERC20(reserveCache.variableDebtTokenAddress).balanceOf(user)</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :     );</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :   }</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             : }</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IFlashLoanSimpleReceiver} from '../interfaces/IFlashLoanSimpleReceiver.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPool} from '../../../interfaces/IPool.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : </span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             :  * @title FlashLoanSimpleReceiverBase</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             :  * @author Aave</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             :  * @notice Base contract to develop a flashloan-receiver contract.</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             :  */</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : abstract contract FlashLoanSimpleReceiverBase is IFlashLoanSimpleReceiver {</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             :   IPoolAddressesProvider public immutable override ADDRESSES_PROVIDER;</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             :   IPool public immutable override POOL;</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : </span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :   constructor(IPoolAddressesProvider provider) {</span>
+<span id="L18"><span class="lineNum">      18</span>                 :<span class="tlaGNC tlaBgGNC">          58 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L19"><span class="lineNum">      19</span>                 :<span class="tlaGNC">          68 :     POOL = IPool(provider.getPool());</span></span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   }</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -104,8 +97,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/misc/flashloan/base/index-sort-b.html b/report/misc/flashloan/base/index-sort-b.html
new file mode 100644
index 00000000..b77bf200
--- /dev/null
+++ b/report/misc/flashloan/base/index-sort-b.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - misc/flashloan/base</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">1</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol">FlashLoanReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../snow.png" width=100 height=10 alt="0.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt"></td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol">FlashLoanSimpleReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/flashloan/base/index-sort-f.html b/report/misc/flashloan/base/index-sort-f.html
new file mode 100644
index 00000000..95df52ec
--- /dev/null
+++ b/report/misc/flashloan/base/index-sort-f.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - misc/flashloan/base</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">1</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol">FlashLoanReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../snow.png" width=100 height=10 alt="0.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt"></td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol">FlashLoanSimpleReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/flashloan/base/index-sort-l.html b/report/misc/flashloan/base/index-sort-l.html
new file mode 100644
index 00000000..6dfece1e
--- /dev/null
+++ b/report/misc/flashloan/base/index-sort-l.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - misc/flashloan/base</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">1</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol">FlashLoanReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../snow.png" width=100 height=10 alt="0.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt"></td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol">FlashLoanSimpleReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/flashloan/base/index.html b/report/misc/flashloan/base/index.html
new file mode 100644
index 00000000..7ce3a1d7
--- /dev/null
+++ b/report/misc/flashloan/base/index.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc/flashloan/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - misc/flashloan/base</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">50.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">1</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol">FlashLoanReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../snow.png" width=100 height=10 alt="0.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt"></td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="FlashLoanSimpleReceiverBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol">FlashLoanSimpleReceiverBase.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/index-sort-b.html b/report/misc/index-sort-b.html
new file mode 100644
index 00000000..4dab1ea9
--- /dev/null
+++ b/report/misc/index-sort-b.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - misc</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">88</td>
+            <td class="headerCovTableEntry">82</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntry">34</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="AaveOracle.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/AaveOracle.sol">AaveOracle.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../amber.png" width=81 height=10 alt="81.2%"><img src="../snow.png" width=19 height=10 alt="81.2%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">81.2&nbsp;%</td>
+              <td class="coverNumDflt">32</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol">DefaultReserveInterestRateStrategyV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">14</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/PriceOracleSentinel.sol">PriceOracleSentinel.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/index-sort-f.html b/report/misc/index-sort-f.html
new file mode 100644
index 00000000..eb5ba0f1
--- /dev/null
+++ b/report/misc/index-sort-f.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - misc</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">88</td>
+            <td class="headerCovTableEntry">82</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntry">34</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="AaveOracle.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/AaveOracle.sol">AaveOracle.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../amber.png" width=81 height=10 alt="81.2%"><img src="../snow.png" width=19 height=10 alt="81.2%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">81.2&nbsp;%</td>
+              <td class="coverNumDflt">32</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/PriceOracleSentinel.sol">PriceOracleSentinel.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol">DefaultReserveInterestRateStrategyV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">14</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/index-sort-l.html b/report/misc/index-sort-l.html
new file mode 100644
index 00000000..01bfd04d
--- /dev/null
+++ b/report/misc/index-sort-l.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - misc</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">88</td>
+            <td class="headerCovTableEntry">82</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntry">34</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="AaveOracle.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/AaveOracle.sol">AaveOracle.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../amber.png" width=81 height=10 alt="81.2%"><img src="../snow.png" width=19 height=10 alt="81.2%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">81.2&nbsp;%</td>
+              <td class="coverNumDflt">32</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/PriceOracleSentinel.sol">PriceOracleSentinel.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol">DefaultReserveInterestRateStrategyV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">14</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/misc/index.html b/report/misc/index.html
new file mode 100644
index 00000000..8c76bd84
--- /dev/null
+++ b/report/misc/index.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - misc</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - misc</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">93.2&nbsp;%</td>
+            <td class="headerCovTableEntry">88</td>
+            <td class="headerCovTableEntry">82</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">97.1&nbsp;%</td>
+            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntry">34</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="AaveOracle.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/AaveOracle.sol">AaveOracle.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../amber.png" width=81 height=10 alt="81.2%"><img src="../snow.png" width=19 height=10 alt="81.2%"></td></tr></table>
+              </td>
+              <td class="coverPerMed">81.2&nbsp;%</td>
+              <td class="coverNumDflt">32</td>
+              <td class="coverNumDflt">26</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">90.9&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="DefaultReserveInterestRateStrategyV2.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol">DefaultReserveInterestRateStrategyV2.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverNumDflt">39</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">14</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PriceOracleSentinel.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/misc/PriceOracleSentinel.sol">PriceOracleSentinel.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">10</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func-c.html b/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func-c.html
deleted file mode 100644
index ef077afb..00000000
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func-c.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapBuyAdapter.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
-            <td class="headerCovTableEntry">24</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapBuyAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L41">BaseParaSwapBuyAdapter._buyOnParaSwap</a></td>
-              
-              <td class="coverFnHi">6</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func.html b/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func.html
deleted file mode 100644
index 5c15c254..00000000
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol.func.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapBuyAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapBuyAdapter.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
-            <td class="headerCovTableEntry">24</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapBuyAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BaseParaSwapBuyAdapter.sol.gcov.html#L41">BaseParaSwapBuyAdapter._buyOnParaSwap</a></td>
-              
-              <td class="coverFnHi">6</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func-c.html b/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func-c.html
deleted file mode 100644
index 72e640e0..00000000
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func-c.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapSellAdapter.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">21</td>
-            <td class="headerCovTableEntry">21</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BaseParaSwapSellAdapter.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L43">BaseParaSwapSellAdapter._sellOnParaSwap</a></td>
-              
-              <td class="coverFnHi">9</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func.html b/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func.html
deleted file mode 100644
index 9953c476..00000000
--- a/report/periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol.func.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/adapters/paraswap/src/periphery/contracts/adapters/paraswap</a> - BaseParaSwapSellAdapter.sol<span style="font-size: 80%;"> (<a href="BaseParaSwapSellAdapter.sol.gcov.html">source</a> / functions)</span></td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">21</td>
-            <td class="headerCovTableEntry">21</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table cellpadding=1 cellspacing=1 border=0>
-            <tr><td><br></td></tr>
-            <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
-              
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BaseParaSwapSellAdapter.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="BaseParaSwapSellAdapter.sol.gcov.html#L43">BaseParaSwapSellAdapter._sellOnParaSwap</a></td>
-              
-              <td class="coverFnHi">9</td>
-              
-              
-            </tr>
-          </table>
-          <br>
-          </center>
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-b.html b/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-b.html
deleted file mode 100644
index b0c9d92c..00000000
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-b.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/libraries/src/periphery/contracts/libraries</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DataTypesHelper.sol.gcov.html">DataTypesHelper.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-f.html b/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-f.html
deleted file mode 100644
index 48dbe985..00000000
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-f.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/libraries/src/periphery/contracts/libraries</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DataTypesHelper.sol.gcov.html">DataTypesHelper.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-l.html b/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-l.html
deleted file mode 100644
index 3adc162a..00000000
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index-sort-l.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/libraries/src/periphery/contracts/libraries</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DataTypesHelper.sol.gcov.html">DataTypesHelper.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index.html b/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index.html
deleted file mode 100644
index 5055d076..00000000
--- a/report/periphery/contracts/libraries/src/periphery/contracts/libraries/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/libraries/src/periphery/contracts/libraries</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/libraries/src/periphery/contracts/libraries</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="DataTypesHelper.sol.gcov.html">DataTypesHelper.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">1</td>
-              <td class="coverNumDflt">1</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-b.html b/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-b.html
deleted file mode 100644
index 0f9f4c34..00000000
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-b.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/misc/src/periphery/contracts/misc</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html">WrappedTokenGatewayV3.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-f.html b/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-f.html
deleted file mode 100644
index 491ae36d..00000000
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-f.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/misc/src/periphery/contracts/misc</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html">WrappedTokenGatewayV3.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-l.html b/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-l.html
deleted file mode 100644
index 949ca423..00000000
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/index-sort-l.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/misc/src/periphery/contracts/misc</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html">WrappedTokenGatewayV3.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/periphery/contracts/misc/src/periphery/contracts/misc/index.html b/report/periphery/contracts/misc/src/periphery/contracts/misc/index.html
deleted file mode 100644
index 6a4c8cf0..00000000
--- a/report/periphery/contracts/misc/src/periphery/contracts/misc/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/misc/src/periphery/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
-</head>
-
-<body>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-
-            <tr>
-              <td width="100%">
-                <table cellpadding=1 border=0 width="100%">
-          <tr>
-            <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/misc/src/periphery/contracts/misc</td>
-            <td width="5%"></td>
-            <td width="5%"></td>
-            <td width="5%" class="headerCovTableHead">Coverage</td>
-            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
-            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test:</td>
-            <td class="headerValue">lcov.info.p</td>
-            <td></td>
-            <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">38</td>
-            <td class="headerCovTableEntry">38</td>
-          </tr>
-          <tr>
-            <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
-            <td></td>
-            <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
-          </tr>
-          <tr>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td class="headerItem">Branches:</td>
-            <td class="headerCovTableEntryHi">-</td>
-            <td class="headerCovTableEntry">0</td>
-            <td class="headerCovTableEntry">0</td>
-          </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-                </table>
-              </td>
-            </tr>
-
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-          </table>
-
-          <center>
-          <table width="80%" cellpadding=1 cellspacing=1 border=0>
-
-            <tr>
-              <td width="40%"><br></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            <td width="6%"></td>
-            </tr>
-
-            <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
-            </tr>
-            <tr>
-                    <td class="tableHead" colspan=2> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-                    <td class="tableHead"> Rate</td>
-                    <td class="tableHead"> Total</td>
-                    <td class="tableHead"> Hit</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="WrappedTokenGatewayV3.sol.gcov.html">WrappedTokenGatewayV3.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
-            </tr>
-          </table>
-          </center>
-          <br>
-
-          <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
-          </table>
-          <br>
-
-</body>
-</html>
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func-c.html b/report/protocol/configuration/ACLManager.sol.func-c.html
similarity index 75%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func-c.html
rename to report/protocol/configuration/ACLManager.sol.func-c.html
index 9a24bbad..5f6427f2 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func-c.html
+++ b/report/protocol/configuration/ACLManager.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/ACLManager.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (<a href="ACLManager.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (<a href="ACLManager.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryMed">82.6&nbsp;%</td>
+            <td class="headerCovTableEntry">23</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ACLManager.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ACLManager.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ACLManager.sol.gcov.html#L27">ACLManager.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -133,13 +140,6 @@
               <td class="coverFnHi">6</td>
               
               
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ACLManager.sol.gcov.html#L98">ACLManager.isFlashBorrower</a></td>
-              
-              <td class="coverFnHi">11</td>
-              
-              
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L103">ACLManager.addBridge</a></td>
@@ -165,42 +165,49 @@
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L58">ACLManager.addEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">608</td>
+              <td class="coverFnHi">683</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ACLManager.sol.gcov.html#L98">ACLManager.isFlashBorrower</a></td>
+              
+              <td class="coverFnHi">1012</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L43">ACLManager.addPoolAdmin</a></td>
               
-              <td class="coverFnHi">1794</td>
+              <td class="coverFnHi">2028</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L128">ACLManager.isAssetListingAdmin</a></td>
               
-              <td class="coverFnHi">3188</td>
+              <td class="coverFnHi">10317</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L68">ACLManager.isEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">10004</td>
+              <td class="coverFnHi">17013</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L83">ACLManager.isRiskAdmin</a></td>
               
-              <td class="coverFnHi">25336</td>
+              <td class="coverFnHi">84695</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L53">ACLManager.isPoolAdmin</a></td>
               
-              <td class="coverFnHi">51690</td>
+              <td class="coverFnHi">140446</td>
               
               
             </tr>
@@ -208,8 +215,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func.html b/report/protocol/configuration/ACLManager.sol.func.html
similarity index 75%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func.html
rename to report/protocol/configuration/ACLManager.sol.func.html
index 093dcf6d..59cf45d2 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.func.html
+++ b/report/protocol/configuration/ACLManager.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/ACLManager.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (<a href="ACLManager.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (<a href="ACLManager.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryMed">82.6&nbsp;%</td>
+            <td class="headerCovTableEntry">23</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ACLManager.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ACLManager.sol.gcov.html#L27">ACLManager.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ACLManager.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -88,7 +95,7 @@
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L58">ACLManager.addEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">608</td>
+              <td class="coverFnHi">683</td>
               
               
             </tr>
@@ -102,7 +109,7 @@
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L43">ACLManager.addPoolAdmin</a></td>
               
-              <td class="coverFnHi">1794</td>
+              <td class="coverFnHi">2028</td>
               
               
             </tr>
@@ -116,7 +123,7 @@
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L128">ACLManager.isAssetListingAdmin</a></td>
               
-              <td class="coverFnHi">3188</td>
+              <td class="coverFnHi">10317</td>
               
               
             </tr>
@@ -130,28 +137,28 @@
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L68">ACLManager.isEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">10004</td>
+              <td class="coverFnHi">17013</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L98">ACLManager.isFlashBorrower</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">1012</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L53">ACLManager.isPoolAdmin</a></td>
               
-              <td class="coverFnHi">51690</td>
+              <td class="coverFnHi">140446</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ACLManager.sol.gcov.html#L83">ACLManager.isRiskAdmin</a></td>
               
-              <td class="coverFnHi">25336</td>
+              <td class="coverFnHi">84695</td>
               
               
             </tr>
@@ -208,8 +215,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.gcov.html b/report/protocol/configuration/ACLManager.sol.gcov.html
similarity index 75%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.gcov.html
rename to report/protocol/configuration/ACLManager.sol.gcov.html
index bf60ee78..9f69f4dd 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol.gcov.html
+++ b/report/protocol/configuration/ACLManager.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/ACLManager.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/ACLManager.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (source / <a href="ACLManager.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - ACLManager.sol<span style="font-size: 80%;"> (source / <a href="ACLManager.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryMed">82.6&nbsp;%</td>
+            <td class="headerCovTableEntry">23</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntryHi">95.0&nbsp;%</td>
+            <td class="headerCovTableEntry">20</td>
             <td class="headerCovTableEntry">19</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -98,108 +98,108 @@
 <span id="L27"><span class="lineNum">      27</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :    */</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :   constructor(IPoolAddressesProvider provider) {</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     ADDRESSES_PROVIDER = provider;</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     address aclAdmin = provider.getACLAdmin();</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :     require(aclAdmin != address(0), Errors.ACL_ADMIN_CANNOT_BE_ZERO);</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :     _setupRole(DEFAULT_ADMIN_ROLE, aclAdmin);</span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaUNC">           0 :     address aclAdmin = provider.getACLAdmin();</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaUNC">           0 :     require(aclAdmin != address(0), Errors.ACL_ADMIN_CANNOT_BE_ZERO);</span></span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaUNC">           0 :     _setupRole(DEFAULT_ADMIN_ROLE, aclAdmin);</span></span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   }</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC tlaBgGNC">           6 :   function setRoleAdmin(</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   function setRoleAdmin(</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     bytes32 role,</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :     bytes32 adminRole</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :   ) external override onlyRole(DEFAULT_ADMIN_ROLE) {</span>
-<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">          10 :     _setRoleAdmin(role, adminRole);</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC tlaBgGNC">           5 :     _setRoleAdmin(role, adminRole);</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">        1794 :   function addPoolAdmin(address admin) external override {</span></span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">        3588 :     grantRole(POOL_ADMIN_ROLE, admin);</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function addPoolAdmin(address admin) external override {</span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">        2028 :     grantRole(POOL_ADMIN_ROLE, admin);</span></span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :   }</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             : </span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">           1 :   function removePoolAdmin(address admin) external override {</span></span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           2 :     revokeRole(POOL_ADMIN_ROLE, admin);</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   function removePoolAdmin(address admin) external override {</span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           1 :     revokeRole(POOL_ADMIN_ROLE, admin);</span></span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :   }</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             : </span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">       51690 :   function isPoolAdmin(address admin) external view override returns (bool) {</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">      155070 :     return hasRole(POOL_ADMIN_ROLE, admin);</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   function isPoolAdmin(address admin) external view override returns (bool) {</span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">      140446 :     return hasRole(POOL_ADMIN_ROLE, admin);</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             : </span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">         608 :   function addEmergencyAdmin(address admin) external override {</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">        1216 :     grantRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   function addEmergencyAdmin(address admin) external override {</span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">         683 :     grantRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :   }</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             : </span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">           1 :   function removeEmergencyAdmin(address admin) external override {</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           2 :     revokeRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :   function removeEmergencyAdmin(address admin) external override {</span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           1 :     revokeRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   }</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">       10004 :   function isEmergencyAdmin(address admin) external view override returns (bool) {</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">       30012 :     return hasRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   function isEmergencyAdmin(address admin) external view override returns (bool) {</span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">       17013 :     return hasRole(EMERGENCY_ADMIN_ROLE, admin);</span></span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             : </span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          14 :   function addRiskAdmin(address admin) external override {</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">          28 :     grantRole(RISK_ADMIN_ROLE, admin);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   function addRiskAdmin(address admin) external override {</span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">          14 :     grantRole(RISK_ADMIN_ROLE, admin);</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           1 :   function removeRiskAdmin(address admin) external override {</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">           2 :     revokeRole(RISK_ADMIN_ROLE, admin);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function removeRiskAdmin(address admin) external override {</span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">           1 :     revokeRole(RISK_ADMIN_ROLE, admin);</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   }</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">       25336 :   function isRiskAdmin(address admin) external view override returns (bool) {</span></span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       76008 :     return hasRole(RISK_ADMIN_ROLE, admin);</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :   function isRiskAdmin(address admin) external view override returns (bool) {</span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       84695 :     return hasRole(RISK_ADMIN_ROLE, admin);</span></span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
 <span id="L88"><span class="lineNum">      88</span>                 :             : </span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">           4 :   function addFlashBorrower(address borrower) external override {</span></span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">           8 :     grantRole(FLASH_BORROWER_ROLE, borrower);</span></span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :   function addFlashBorrower(address borrower) external override {</span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">           4 :     grantRole(FLASH_BORROWER_ROLE, borrower);</span></span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   }</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             : </span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           2 :   function removeFlashBorrower(address borrower) external override {</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           4 :     revokeRole(FLASH_BORROWER_ROLE, borrower);</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   function removeFlashBorrower(address borrower) external override {</span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           2 :     revokeRole(FLASH_BORROWER_ROLE, borrower);</span></span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :   }</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             : </span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">          11 :   function isFlashBorrower(address borrower) external view override returns (bool) {</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">          33 :     return hasRole(FLASH_BORROWER_ROLE, borrower);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   function isFlashBorrower(address borrower) external view override returns (bool) {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">        1012 :     return hasRole(FLASH_BORROWER_ROLE, borrower);</span></span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             : </span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">          14 :   function addBridge(address bridge) external override {</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          28 :     grantRole(BRIDGE_ROLE, bridge);</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   function addBridge(address bridge) external override {</span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          14 :     grantRole(BRIDGE_ROLE, bridge);</span></span>
 <span id="L107"><span class="lineNum">     107</span>                 :             :   }</span>
 <span id="L108"><span class="lineNum">     108</span>                 :             : </span>
 <span id="L109"><span class="lineNum">     109</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           1 :   function removeBridge(address bridge) external override {</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           2 :     revokeRole(BRIDGE_ROLE, bridge);</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   function removeBridge(address bridge) external override {</span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           1 :     revokeRole(BRIDGE_ROLE, bridge);</span></span>
 <span id="L112"><span class="lineNum">     112</span>                 :             :   }</span>
 <span id="L113"><span class="lineNum">     113</span>                 :             : </span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">          26 :   function isBridge(address bridge) external view override returns (bool) {</span></span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">          78 :     return hasRole(BRIDGE_ROLE, bridge);</span></span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :   function isBridge(address bridge) external view override returns (bool) {</span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">          26 :     return hasRole(BRIDGE_ROLE, bridge);</span></span>
 <span id="L117"><span class="lineNum">     117</span>                 :             :   }</span>
 <span id="L118"><span class="lineNum">     118</span>                 :             : </span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">           3 :   function addAssetListingAdmin(address admin) external override {</span></span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           6 :     grantRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :   function addAssetListingAdmin(address admin) external override {</span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           3 :     grantRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
 <span id="L123"><span class="lineNum">     123</span>                 :             : </span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           2 :   function removeAssetListingAdmin(address admin) external override {</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           4 :     revokeRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   function removeAssetListingAdmin(address admin) external override {</span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           2 :     revokeRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :   }</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             : </span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :   /// @inheritdoc IACLManager</span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        3188 :   function isAssetListingAdmin(address admin) external view override returns (bool) {</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">        9564 :     return hasRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :   function isAssetListingAdmin(address admin) external view override returns (bool) {</span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">       10317 :     return hasRole(ASSET_LISTING_ADMIN_ROLE, admin);</span></span>
 <span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
 <span id="L133"><span class="lineNum">     133</span>                 :             : }</span>
         </pre>
@@ -209,8 +209,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func-c.html b/report/protocol/configuration/PoolAddressesProvider.sol.func-c.html
similarity index 72%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func-c.html
rename to report/protocol/configuration/PoolAddressesProvider.sol.func-c.html
index bd71f553..04404e4a 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func-c.html
+++ b/report/protocol/configuration/PoolAddressesProvider.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProvider.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProvider.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">56</td>
-            <td class="headerCovTableEntry">56</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">58</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,175 +53,182 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolAddressesProvider.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolAddressesProvider.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L185">PoolAddressesProvider._setMarketId</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L45">PoolAddressesProvider.setMarketId</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L45">PoolAddressesProvider.setMarketId</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L40">PoolAddressesProvider.getMarketId</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L55">PoolAddressesProvider.setAddress</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L40">PoolAddressesProvider.getMarketId</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L138">PoolAddressesProvider.setPriceOracleSentinel</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">21</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L138">PoolAddressesProvider.setPriceOracleSentinel</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L185">PoolAddressesProvider._setMarketId</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">446</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L114">PoolAddressesProvider.setACLManager</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L90">PoolAddressesProvider.setPoolConfiguratorImpl</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L62">PoolAddressesProvider.setAddressAsProxy</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L150">PoolAddressesProvider.setPoolDataProvider</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L90">PoolAddressesProvider.setPoolConfiguratorImpl</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L78">PoolAddressesProvider.setPoolImpl</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L150">PoolAddressesProvider.setPoolDataProvider</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L102">PoolAddressesProvider.setPriceOracle</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L78">PoolAddressesProvider.setPoolImpl</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L62">PoolAddressesProvider.setAddressAsProxy</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L102">PoolAddressesProvider.setPriceOracle</a></td>
               
-              <td class="coverFnHi">610</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L50">PoolAddressesProvider.getAddress</a></td>
               
-              <td class="coverFnHi">613</td>
+              <td class="coverFnHi">688</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L121">PoolAddressesProvider.getACLAdmin</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L34">PoolAddressesProvider.</a></td>
               
-              <td class="coverFnHi">632</td>
+              <td class="coverFnHi">1116</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L126">PoolAddressesProvider.setACLAdmin</a></td>
               
-              <td class="coverFnHi">1234</td>
+              <td class="coverFnHi">1384</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L145">PoolAddressesProvider.getPoolDataProvider</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L121">PoolAddressesProvider.getACLAdmin</a></td>
               
-              <td class="coverFnHi">1783</td>
+              <td class="coverFnHi">1711</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L198">PoolAddressesProvider._getProxyImplementation</a></td>
               
-              <td class="coverFnHi">1824</td>
+              <td class="coverFnHi">2048</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L165">PoolAddressesProvider._updateImpl</a></td>
               
-              <td class="coverFnHi">1824</td>
+              <td class="coverFnHi">2048</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L133">PoolAddressesProvider.getPriceOracleSentinel</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L145">PoolAddressesProvider.getPoolDataProvider</a></td>
               
-              <td class="coverFnHi">20415</td>
+              <td class="coverFnHi">3034</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L73">PoolAddressesProvider.getPool</a></td>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L133">PoolAddressesProvider.getPriceOracleSentinel</a></td>
               
-              <td class="coverFnHi">21433</td>
+              <td class="coverFnHi">30644</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L97">PoolAddressesProvider.getPriceOracle</a></td>
               
-              <td class="coverFnHi">24761</td>
+              <td class="coverFnHi">71014</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L109">PoolAddressesProvider.getACLManager</a></td>
               
-              <td class="coverFnHi">46744</td>
+              <td class="coverFnHi">119508</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L73">PoolAddressesProvider.getPool</a></td>
+              
+              <td class="coverFnHi">165196</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L85">PoolAddressesProvider.getPoolConfigurator</a></td>
               
-              <td class="coverFnHi">106989</td>
+              <td class="coverFnHi">649253</td>
               
               
             </tr>
@@ -229,8 +236,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func.html b/report/protocol/configuration/PoolAddressesProvider.sol.func.html
similarity index 72%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func.html
rename to report/protocol/configuration/PoolAddressesProvider.sol.func.html
index 605822fa..a5f4ebac 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.func.html
+++ b/report/protocol/configuration/PoolAddressesProvider.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProvider.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProvider.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">56</td>
-            <td class="headerCovTableEntry">56</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">58</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,63 +53,70 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolAddressesProvider.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolAddressesProvider.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L34">PoolAddressesProvider.</a></td>
+              
+              <td class="coverFnHi">1116</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L198">PoolAddressesProvider._getProxyImplementation</a></td>
               
-              <td class="coverFnHi">1824</td>
+              <td class="coverFnHi">2048</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L185">PoolAddressesProvider._setMarketId</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">446</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L165">PoolAddressesProvider._updateImpl</a></td>
               
-              <td class="coverFnHi">1824</td>
+              <td class="coverFnHi">2048</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L121">PoolAddressesProvider.getACLAdmin</a></td>
               
-              <td class="coverFnHi">632</td>
+              <td class="coverFnHi">1711</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L109">PoolAddressesProvider.getACLManager</a></td>
               
-              <td class="coverFnHi">46744</td>
+              <td class="coverFnHi">119508</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L50">PoolAddressesProvider.getAddress</a></td>
               
-              <td class="coverFnHi">613</td>
+              <td class="coverFnHi">688</td>
               
               
             </tr>
@@ -123,63 +130,63 @@
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L73">PoolAddressesProvider.getPool</a></td>
               
-              <td class="coverFnHi">21433</td>
+              <td class="coverFnHi">165196</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L85">PoolAddressesProvider.getPoolConfigurator</a></td>
               
-              <td class="coverFnHi">106989</td>
+              <td class="coverFnHi">649253</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L145">PoolAddressesProvider.getPoolDataProvider</a></td>
               
-              <td class="coverFnHi">1783</td>
+              <td class="coverFnHi">3034</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L97">PoolAddressesProvider.getPriceOracle</a></td>
               
-              <td class="coverFnHi">24761</td>
+              <td class="coverFnHi">71014</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L133">PoolAddressesProvider.getPriceOracleSentinel</a></td>
               
-              <td class="coverFnHi">20415</td>
+              <td class="coverFnHi">30644</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L126">PoolAddressesProvider.setACLAdmin</a></td>
               
-              <td class="coverFnHi">1234</td>
+              <td class="coverFnHi">1384</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L114">PoolAddressesProvider.setACLManager</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L55">PoolAddressesProvider.setAddress</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L62">PoolAddressesProvider.setAddressAsProxy</a></td>
               
-              <td class="coverFnHi">610</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
@@ -193,35 +200,35 @@
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L90">PoolAddressesProvider.setPoolConfiguratorImpl</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L150">PoolAddressesProvider.setPoolDataProvider</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L78">PoolAddressesProvider.setPoolImpl</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L102">PoolAddressesProvider.setPriceOracle</a></td>
               
-              <td class="coverFnHi">609</td>
+              <td class="coverFnHi">684</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProvider.sol.gcov.html#L138">PoolAddressesProvider.setPriceOracleSentinel</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">21</td>
               
               
             </tr>
@@ -229,8 +236,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.gcov.html b/report/protocol/configuration/PoolAddressesProvider.sol.gcov.html
similarity index 75%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.gcov.html
rename to report/protocol/configuration/PoolAddressesProvider.sol.gcov.html
index 6cab0271..d8d491d9 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol.gcov.html
+++ b/report/protocol/configuration/PoolAddressesProvider.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProvider.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (source / <a href="PoolAddressesProvider.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProvider.sol<span style="font-size: 80%;"> (source / <a href="PoolAddressesProvider.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">56</td>
-            <td class="headerCovTableEntry">56</td>
+            <td class="headerCovTableEntry">58</td>
+            <td class="headerCovTableEntry">58</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -74,7 +74,7 @@
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {InitializableImmutableAdminUpgradeabilityProxy} from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {InitializableImmutableAdminUpgradeabilityProxy} from '../../misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : </span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             :  * @title PoolAddressesProvider</span>
@@ -105,125 +105,125 @@
 <span id="L34"><span class="lineNum">      34</span>                 :             :    * @param owner The owner address of this contract.</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :    */</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   constructor(string memory marketId, address owner) {</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     _setMarketId(marketId);</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     transferOwnership(owner);</span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC tlaBgGNC">         419 :     _setMarketId(marketId);</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">         627 :     transferOwnership(owner);</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC tlaBgGNC">           6 :   function getMarketId() external view override returns (string memory) {</span></span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">          12 :     return _marketId;</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   function getMarketId() external view override returns (string memory) {</span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">           6 :     return _marketId;</span></span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   }</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             : </span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           2 :   function setMarketId(string memory newMarketId) external override onlyOwner {</span></span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           2 :     _setMarketId(newMarketId);</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   function setMarketId(string memory newMarketId) external override onlyOwner {</span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           1 :     _setMarketId(newMarketId);</span></span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             : </span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">         613 :   function getAddress(bytes32 id) public view override returns (address) {</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">      446740 :     return _addresses[id];</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   function getAddress(bytes32 id) public view override returns (address) {</span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">     1041048 :     return _addresses[id];</span></span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   }</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           5 :   function setAddress(bytes32 id, address newAddress) external override onlyOwner {</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           6 :     address oldAddress = _addresses[id];</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           6 :     _addresses[id] = newAddress;</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           6 :     emit AddressSet(id, oldAddress, newAddress);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   function setAddress(bytes32 id, address newAddress) external override onlyOwner {</span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           4 :     address oldAddress = _addresses[id];</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           4 :     _addresses[id] = newAddress;</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           4 :     emit AddressSet(id, oldAddress, newAddress);</span></span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   }</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">         610 :   function setAddressAsProxy(</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   function setAddressAsProxy(</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     bytes32 id,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     address newImplementationAddress</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   ) external override onlyOwner {</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">        1216 :     address proxyAddress = _addresses[id];</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">        1824 :     address oldImplementationAddress = _getProxyImplementation(id);</span></span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">        1216 :     _updateImpl(id, newImplementationAddress);</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">        1216 :     emit AddressSetAsProxy(id, proxyAddress, oldImplementationAddress, newImplementationAddress);</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">         682 :     address proxyAddress = _addresses[id];</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">         682 :     address oldImplementationAddress = _getProxyImplementation(id);</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">         682 :     _updateImpl(id, newImplementationAddress);</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">         682 :     emit AddressSetAsProxy(id, proxyAddress, oldImplementationAddress, newImplementationAddress);</span></span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             : </span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       21433 :   function getPool() external view override returns (address) {</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       64299 :     return getAddress(POOL);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   function getPool() external view override returns (address) {</span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">      165196 :     return getAddress(POOL);</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">         609 :   function setPoolImpl(address newPoolImpl) external override onlyOwner {</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">        1824 :     address oldPoolImpl = _getProxyImplementation(POOL);</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">        1216 :     _updateImpl(POOL, newPoolImpl);</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">        1216 :     emit PoolUpdated(oldPoolImpl, newPoolImpl);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function setPoolImpl(address newPoolImpl) external override onlyOwner {</span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">         683 :     address oldPoolImpl = _getProxyImplementation(POOL);</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">         683 :     _updateImpl(POOL, newPoolImpl);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">         683 :     emit PoolUpdated(oldPoolImpl, newPoolImpl);</span></span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   }</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : </span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">      106989 :   function getPoolConfigurator() external view override returns (address) {</span></span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">      320967 :     return getAddress(POOL_CONFIGURATOR);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :   function getPoolConfigurator() external view override returns (address) {</span>
+<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">      649253 :     return getAddress(POOL_CONFIGURATOR);</span></span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   }</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">         609 :   function setPoolConfiguratorImpl(address newPoolConfiguratorImpl) external override onlyOwner {</span></span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        1824 :     address oldPoolConfiguratorImpl = _getProxyImplementation(POOL_CONFIGURATOR);</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">        1216 :     _updateImpl(POOL_CONFIGURATOR, newPoolConfiguratorImpl);</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">        1216 :     emit PoolConfiguratorUpdated(oldPoolConfiguratorImpl, newPoolConfiguratorImpl);</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function setPoolConfiguratorImpl(address newPoolConfiguratorImpl) external override onlyOwner {</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">         683 :     address oldPoolConfiguratorImpl = _getProxyImplementation(POOL_CONFIGURATOR);</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">         683 :     _updateImpl(POOL_CONFIGURATOR, newPoolConfiguratorImpl);</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">         683 :     emit PoolConfiguratorUpdated(oldPoolConfiguratorImpl, newPoolConfiguratorImpl);</span></span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   }</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             : </span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">       24761 :   function getPriceOracle() external view override returns (address) {</span></span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">       74283 :     return getAddress(PRICE_ORACLE);</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :   function getPriceOracle() external view override returns (address) {</span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">       71014 :     return getAddress(PRICE_ORACLE);</span></span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :   }</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             : </span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">         609 :   function setPriceOracle(address newPriceOracle) external override onlyOwner {</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">        1216 :     address oldPriceOracle = _addresses[PRICE_ORACLE];</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">        1216 :     _addresses[PRICE_ORACLE] = newPriceOracle;</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">        1216 :     emit PriceOracleUpdated(oldPriceOracle, newPriceOracle);</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   function setPriceOracle(address newPriceOracle) external override onlyOwner {</span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">         683 :     address oldPriceOracle = _addresses[PRICE_ORACLE];</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">         683 :     _addresses[PRICE_ORACLE] = newPriceOracle;</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">         683 :     emit PriceOracleUpdated(oldPriceOracle, newPriceOracle);</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
 <span id="L109"><span class="lineNum">     109</span>                 :             : </span>
 <span id="L110"><span class="lineNum">     110</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       46744 :   function getACLManager() external view override returns (address) {</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">      140232 :     return getAddress(ACL_MANAGER);</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :   function getACLManager() external view override returns (address) {</span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">      119508 :     return getAddress(ACL_MANAGER);</span></span>
 <span id="L113"><span class="lineNum">     113</span>                 :             :   }</span>
 <span id="L114"><span class="lineNum">     114</span>                 :             : </span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">         609 :   function setACLManager(address newAclManager) external override onlyOwner {</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">        1216 :     address oldAclManager = _addresses[ACL_MANAGER];</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">        1216 :     _addresses[ACL_MANAGER] = newAclManager;</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">        1216 :     emit ACLManagerUpdated(oldAclManager, newAclManager);</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function setACLManager(address newAclManager) external override onlyOwner {</span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">         683 :     address oldAclManager = _addresses[ACL_MANAGER];</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">         683 :     _addresses[ACL_MANAGER] = newAclManager;</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">         683 :     emit ACLManagerUpdated(oldAclManager, newAclManager);</span></span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :   }</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             : </span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">         632 :   function getACLAdmin() external view override returns (address) {</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        1896 :     return getAddress(ACL_ADMIN);</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   function getACLAdmin() external view override returns (address) {</span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        1711 :     return getAddress(ACL_ADMIN);</span></span>
 <span id="L125"><span class="lineNum">     125</span>                 :             :   }</span>
 <span id="L126"><span class="lineNum">     126</span>                 :             : </span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">        1234 :   function setACLAdmin(address newAclAdmin) external override onlyOwner {</span></span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">        2466 :     address oldAclAdmin = _addresses[ACL_ADMIN];</span></span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        2466 :     _addresses[ACL_ADMIN] = newAclAdmin;</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">        2466 :     emit ACLAdminUpdated(oldAclAdmin, newAclAdmin);</span></span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :   function setACLAdmin(address newAclAdmin) external override onlyOwner {</span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">        1383 :     address oldAclAdmin = _addresses[ACL_ADMIN];</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        1383 :     _addresses[ACL_ADMIN] = newAclAdmin;</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">        1383 :     emit ACLAdminUpdated(oldAclAdmin, newAclAdmin);</span></span>
 <span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
 <span id="L133"><span class="lineNum">     133</span>                 :             : </span>
 <span id="L134"><span class="lineNum">     134</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">       20415 :   function getPriceOracleSentinel() external view override returns (address) {</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       61245 :     return getAddress(PRICE_ORACLE_SENTINEL);</span></span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :   function getPriceOracleSentinel() external view override returns (address) {</span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       30644 :     return getAddress(PRICE_ORACLE_SENTINEL);</span></span>
 <span id="L137"><span class="lineNum">     137</span>                 :             :   }</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             : </span>
 <span id="L139"><span class="lineNum">     139</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           6 :   function setPriceOracleSentinel(address newPriceOracleSentinel) external override onlyOwner {</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">          10 :     address oldPriceOracleSentinel = _addresses[PRICE_ORACLE_SENTINEL];</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">          10 :     _addresses[PRICE_ORACLE_SENTINEL] = newPriceOracleSentinel;</span></span>
-<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">          10 :     emit PriceOracleSentinelUpdated(oldPriceOracleSentinel, newPriceOracleSentinel);</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :   function setPriceOracleSentinel(address newPriceOracleSentinel) external override onlyOwner {</span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">          20 :     address oldPriceOracleSentinel = _addresses[PRICE_ORACLE_SENTINEL];</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">          20 :     _addresses[PRICE_ORACLE_SENTINEL] = newPriceOracleSentinel;</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">          20 :     emit PriceOracleSentinelUpdated(oldPriceOracleSentinel, newPriceOracleSentinel);</span></span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :   }</span>
 <span id="L145"><span class="lineNum">     145</span>                 :             : </span>
 <span id="L146"><span class="lineNum">     146</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">        1783 :   function getPoolDataProvider() external view override returns (address) {</span></span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">        5349 :     return getAddress(DATA_PROVIDER);</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :   function getPoolDataProvider() external view override returns (address) {</span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">        3034 :     return getAddress(DATA_PROVIDER);</span></span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :   }</span>
 <span id="L150"><span class="lineNum">     150</span>                 :             : </span>
 <span id="L151"><span class="lineNum">     151</span>                 :             :   /// @inheritdoc IPoolAddressesProvider</span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">         609 :   function setPoolDataProvider(address newDataProvider) external override onlyOwner {</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        1216 :     address oldDataProvider = _addresses[DATA_PROVIDER];</span></span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">        1216 :     _addresses[DATA_PROVIDER] = newDataProvider;</span></span>
-<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">        1216 :     emit PoolDataProviderUpdated(oldDataProvider, newDataProvider);</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :   function setPoolDataProvider(address newDataProvider) external override onlyOwner {</span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">         683 :     address oldDataProvider = _addresses[DATA_PROVIDER];</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">         683 :     _addresses[DATA_PROVIDER] = newDataProvider;</span></span>
+<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">         683 :     emit PoolDataProviderUpdated(oldDataProvider, newDataProvider);</span></span>
 <span id="L156"><span class="lineNum">     156</span>                 :             :   }</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             : </span>
 <span id="L158"><span class="lineNum">     158</span>                 :             :   /**</span>
@@ -235,19 +235,19 @@
 <span id="L164"><span class="lineNum">     164</span>                 :             :    * @param id The id of the proxy to be updated</span>
 <span id="L165"><span class="lineNum">     165</span>                 :             :    * @param newAddress The address of the new implementation</span>
 <span id="L166"><span class="lineNum">     166</span>                 :             :    */</span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        1824 :   function _updateImpl(bytes32 id, address newAddress) internal {</span></span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        3648 :     address proxyAddress = _addresses[id];</span></span>
-<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">        3648 :     InitializableImmutableAdminUpgradeabilityProxy proxy;</span></span>
-<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">        5472 :     bytes memory params = abi.encodeWithSignature('initialize(address)', address(this));</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :   function _updateImpl(bytes32 id, address newAddress) internal {</span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        2048 :     address proxyAddress = _addresses[id];</span></span>
+<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">        2048 :     InitializableImmutableAdminUpgradeabilityProxy proxy;</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">        2048 :     bytes memory params = abi.encodeWithSignature('initialize(address)', address(this));</span></span>
 <span id="L171"><span class="lineNum">     171</span>                 :             : </span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">        5472 :     if (proxyAddress == address(0)) {</span></span>
-<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">        3642 :       proxy = new InitializableImmutableAdminUpgradeabilityProxy(address(this));</span></span>
-<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">        3642 :       _addresses[id] = proxyAddress = address(proxy);</span></span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">        3642 :       proxy.initialize(newAddress, params);</span></span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">        3642 :       emit ProxyCreated(id, proxyAddress, newAddress);</span></span>
+<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">        2048 :     if (proxyAddress == address(0)) {</span></span>
+<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">        2045 :       proxy = new InitializableImmutableAdminUpgradeabilityProxy(address(this));</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">        2045 :       _addresses[id] = proxyAddress = address(proxy);</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">        2045 :       proxy.initialize(newAddress, params);</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">        2045 :       emit ProxyCreated(id, proxyAddress, newAddress);</span></span>
 <span id="L177"><span class="lineNum">     177</span>                 :             :     } else {</span>
-<span id="L178"><span class="lineNum">     178</span>                 :<span class="tlaGNC">           6 :       proxy = InitializableImmutableAdminUpgradeabilityProxy(payable(proxyAddress));</span></span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           6 :       proxy.upgradeToAndCall(newAddress, params);</span></span>
+<span id="L178"><span class="lineNum">     178</span>                 :<span class="tlaGNC">           3 :       proxy = InitializableImmutableAdminUpgradeabilityProxy(payable(proxyAddress));</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           3 :       proxy.upgradeToAndCall(newAddress, params);</span></span>
 <span id="L180"><span class="lineNum">     180</span>                 :             :     }</span>
 <span id="L181"><span class="lineNum">     181</span>                 :             :   }</span>
 <span id="L182"><span class="lineNum">     182</span>                 :             : </span>
@@ -255,10 +255,10 @@
 <span id="L184"><span class="lineNum">     184</span>                 :             :    * @notice Updates the identifier of the Aave market.</span>
 <span id="L185"><span class="lineNum">     185</span>                 :             :    * @param newMarketId The new id of the market</span>
 <span id="L186"><span class="lineNum">     186</span>                 :             :    */</span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           1 :   function _setMarketId(string memory newMarketId) internal {</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">           2 :     string memory oldMarketId = _marketId;</span></span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">           2 :     _marketId = newMarketId;</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">           2 :     emit MarketIdSet(oldMarketId, newMarketId);</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :   function _setMarketId(string memory newMarketId) internal {</span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">         380 :     string memory oldMarketId = _marketId;</span></span>
+<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">         377 :     _marketId = newMarketId;</span></span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">         265 :     emit MarketIdSet(oldMarketId, newMarketId);</span></span>
 <span id="L191"><span class="lineNum">     191</span>                 :             :   }</span>
 <span id="L192"><span class="lineNum">     192</span>                 :             : </span>
 <span id="L193"><span class="lineNum">     193</span>                 :             :   /**</span>
@@ -268,13 +268,13 @@
 <span id="L197"><span class="lineNum">     197</span>                 :             :    * @param id The id</span>
 <span id="L198"><span class="lineNum">     198</span>                 :             :    * @return The address of the implementation contract</span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :    */</span>
-<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">        1824 :   function _getProxyImplementation(bytes32 id) internal returns (address) {</span></span>
-<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        3648 :     address proxyAddress = _addresses[id];</span></span>
-<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">        5472 :     if (proxyAddress == address(0)) {</span></span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        5463 :       return address(0);</span></span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :   function _getProxyImplementation(bytes32 id) internal returns (address) {</span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        2048 :     address proxyAddress = _addresses[id];</span></span>
+<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">        2048 :     if (proxyAddress == address(0)) {</span></span>
+<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        2045 :       return address(0);</span></span>
 <span id="L204"><span class="lineNum">     204</span>                 :             :     } else {</span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">           9 :       address payable payableProxyAddress = payable(proxyAddress);</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           9 :       return InitializableImmutableAdminUpgradeabilityProxy(payableProxyAddress).implementation();</span></span>
+<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">           3 :       address payable payableProxyAddress = payable(proxyAddress);</span></span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           3 :       return InitializableImmutableAdminUpgradeabilityProxy(payableProxyAddress).implementation();</span></span>
 <span id="L207"><span class="lineNum">     207</span>                 :             :     }</span>
 <span id="L208"><span class="lineNum">     208</span>                 :             :   }</span>
 <span id="L209"><span class="lineNum">     209</span>                 :             : }</span>
@@ -285,8 +285,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html
similarity index 69%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html
rename to report/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html
index 699162a0..053a501b 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html
+++ b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProviderRegistry.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProviderRegistry.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">26</td>
+            <td class="headerCovTableEntryHi">96.3&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolAddressesProviderRegistry.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolAddressesProviderRegistry.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L27">PoolAddressesProviderRegistry.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -109,14 +116,14 @@
             <tr>
               <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L77">PoolAddressesProviderRegistry._addToAddressesProvidersList</a></td>
               
-              <td class="coverFnHi">628</td>
+              <td class="coverFnHi">710</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L37">PoolAddressesProviderRegistry.registerAddressesProvider</a></td>
               
-              <td class="coverFnHi">629</td>
+              <td class="coverFnHi">711</td>
               
               
             </tr>
@@ -124,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html
similarity index 69%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html
rename to report/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html
index f7e1688d..c2a87e04 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html
+++ b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProviderRegistry.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProviderRegistry.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (<a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">26</td>
+            <td class="headerCovTableEntryHi">96.3&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
@@ -53,28 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolAddressesProviderRegistry.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L27">PoolAddressesProviderRegistry.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolAddressesProviderRegistry.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L77">PoolAddressesProviderRegistry._addToAddressesProvidersList</a></td>
               
-              <td class="coverFnHi">628</td>
+              <td class="coverFnHi">710</td>
               
               
             </tr>
@@ -109,7 +116,7 @@
             <tr>
               <td class="coverFn"><a href="PoolAddressesProviderRegistry.sol.gcov.html#L37">PoolAddressesProviderRegistry.registerAddressesProvider</a></td>
               
-              <td class="coverFnHi">629</td>
+              <td class="coverFnHi">711</td>
               
               
             </tr>
@@ -124,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html
similarity index 77%
rename from report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html
rename to report/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html
index 2addb373..acb39b7e 100644
--- a/report/core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html
+++ b/report/protocol/configuration/PoolAddressesProviderRegistry.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/configuration/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration/PoolAddressesProviderRegistry.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/configuration/src/core/contracts/protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (source / <a href="PoolAddressesProviderRegistry.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/configuration">protocol/configuration</a> - PoolAddressesProviderRegistry.sol<span style="font-size: 80%;"> (source / <a href="PoolAddressesProviderRegistry.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">26</td>
+            <td class="headerCovTableEntryHi">96.3&nbsp;%</td>
+            <td class="headerCovTableEntry">27</td>
             <td class="headerCovTableEntry">26</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
+            <td class="headerCovTableEntry">8</td>
             <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -98,77 +98,77 @@
 <span id="L27"><span class="lineNum">      27</span>                 :             :    * @param owner The owner address of this contract.</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :    */</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :   constructor(address owner) {</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     transferOwnership(owner);</span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     transferOwnership(owner);</span></span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :   }</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             : </span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :   /// @inheritdoc IPoolAddressesProviderRegistry</span>
-<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC tlaBgGNC">           5 :   function getAddressesProvidersList() external view override returns (address[] memory) {</span></span>
-<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC">          10 :     return _addressesProvidersList;</span></span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :   function getAddressesProvidersList() external view override returns (address[] memory) {</span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC tlaBgGNC">           5 :     return _addressesProvidersList;</span></span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   }</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             : </span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :   /// @inheritdoc IPoolAddressesProviderRegistry</span>
-<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC">         629 :   function registerAddressesProvider(address provider, uint256 id) external override onlyOwner {</span></span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">        1258 :     require(id != 0, Errors.INVALID_ADDRESSES_PROVIDER_ID);</span></span>
-<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">        1256 :     require(_idToAddressesProvider[id] == address(0), Errors.INVALID_ADDRESSES_PROVIDER_ID);</span></span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">        1256 :     require(_addressesProviderToId[provider] == 0, Errors.ADDRESSES_PROVIDER_ALREADY_ADDED);</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   function registerAddressesProvider(address provider, uint256 id) external override onlyOwner {</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">         711 :     require(id != 0, Errors.INVALID_ADDRESSES_PROVIDER_ID);</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">         710 :     require(_idToAddressesProvider[id] == address(0), Errors.INVALID_ADDRESSES_PROVIDER_ID);</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">         710 :     require(_addressesProviderToId[provider] == 0, Errors.ADDRESSES_PROVIDER_ALREADY_ADDED);</span></span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">        1256 :     _addressesProviderToId[provider] = id;</span></span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">        1256 :     _idToAddressesProvider[id] = provider;</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">         710 :     _addressesProviderToId[provider] = id;</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">         710 :     _idToAddressesProvider[id] = provider;</span></span>
 <span id="L46"><span class="lineNum">      46</span>                 :             : </span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">        1256 :     _addToAddressesProvidersList(provider);</span></span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">        1256 :     emit AddressesProviderRegistered(provider, id);</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">         710 :     _addToAddressesProvidersList(provider);</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">         710 :     emit AddressesProviderRegistered(provider, id);</span></span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             : </span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   /// @inheritdoc IPoolAddressesProviderRegistry</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">           4 :   function unregisterAddressesProvider(address provider) external override onlyOwner {</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">           8 :     require(_addressesProviderToId[provider] != 0, Errors.ADDRESSES_PROVIDER_NOT_REGISTERED);</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">           6 :     uint256 oldId = _addressesProviderToId[provider];</span></span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           6 :     _idToAddressesProvider[oldId] = address(0);</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           6 :     _addressesProviderToId[provider] = 0;</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   function unregisterAddressesProvider(address provider) external override onlyOwner {</span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">           4 :     require(_addressesProviderToId[provider] != 0, Errors.ADDRESSES_PROVIDER_NOT_REGISTERED);</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">           3 :     uint256 oldId = _addressesProviderToId[provider];</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           3 :     _idToAddressesProvider[oldId] = address(0);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           3 :     _addressesProviderToId[provider] = 0;</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           6 :     _removeFromAddressesProvidersList(provider);</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           3 :     _removeFromAddressesProvidersList(provider);</span></span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           6 :     emit AddressesProviderUnregistered(provider, oldId);</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           3 :     emit AddressesProviderUnregistered(provider, oldId);</span></span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   }</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :   /// @inheritdoc IPoolAddressesProviderRegistry</span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           6 :   function getAddressesProviderIdByAddress(</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   function getAddressesProviderIdByAddress(</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     address addressesProvider</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :   ) external view override returns (uint256) {</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">          12 :     return _addressesProviderToId[addressesProvider];</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           6 :     return _addressesProviderToId[addressesProvider];</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :   }</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             : </span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :   /// @inheritdoc IPoolAddressesProviderRegistry</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           4 :   function getAddressesProviderAddressById(uint256 id) external view override returns (address) {</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           8 :     return _idToAddressesProvider[id];</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   function getAddressesProviderAddressById(uint256 id) external view override returns (address) {</span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           4 :     return _idToAddressesProvider[id];</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :   }</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   /**</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :    * @notice Adds the addresses provider address to the list.</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :    */</span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">         628 :   function _addToAddressesProvidersList(address provider) internal {</span></span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">        1256 :     _addressesProvidersIndexes[provider] = _addressesProvidersList.length;</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">        1256 :     _addressesProvidersList.push(provider);</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :   function _addToAddressesProvidersList(address provider) internal {</span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">         710 :     _addressesProvidersIndexes[provider] = _addressesProvidersList.length;</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">         710 :     _addressesProvidersList.push(provider);</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   }</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   /**</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :    * @notice Removes the addresses provider address from the list.</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :    */</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">           3 :   function _removeFromAddressesProvidersList(address provider) internal {</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">           6 :     uint256 index = _addressesProvidersIndexes[provider];</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   function _removeFromAddressesProvidersList(address provider) internal {</span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">           3 :     uint256 index = _addressesProvidersIndexes[provider];</span></span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">           6 :     _addressesProvidersIndexes[provider] = 0;</span></span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">           3 :     _addressesProvidersIndexes[provider] = 0;</span></span>
 <span id="L92"><span class="lineNum">      92</span>                 :             : </span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :     // Swap the index of the last addresses provider in the list with the index of the provider to remove</span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           9 :     uint256 lastIndex = _addressesProvidersList.length - 1;</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           6 :     if (index &lt; lastIndex) {</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           2 :       address lastProvider = _addressesProvidersList[lastIndex];</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           2 :       _addressesProvidersList[index] = lastProvider;</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           2 :       _addressesProvidersIndexes[lastProvider] = index;</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           3 :     uint256 lastIndex = _addressesProvidersList.length - 1;</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           3 :     if (index &lt; lastIndex) {</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           1 :       address lastProvider = _addressesProvidersList[lastIndex];</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           1 :       _addressesProvidersList[index] = lastProvider;</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           1 :       _addressesProvidersIndexes[lastProvider] = index;</span></span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :     }</span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           6 :     _addressesProvidersList.pop();</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           3 :     _addressesProvidersList.pop();</span></span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :   }</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             : }</span>
         </pre>
@@ -178,8 +178,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-b.html b/report/protocol/configuration/index-sort-b.html
similarity index 53%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-b.html
rename to report/protocol/configuration/index-sort-b.html
index ab2df64c..984082d6 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-b.html
+++ b/report/protocol/configuration/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/configuration</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">90.5&nbsp;%</td>
-            <td class="headerCovTableEntry">74</td>
-            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">108</td>
+            <td class="headerCovTableEntry">103</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">47</td>
-            <td class="headerCovTableEntry">47</td>
+            <td class="headerCovTableEntryHi">96.1&nbsp;%</td>
+            <td class="headerCovTableEntry">51</td>
+            <td class="headerCovTableEntry">49</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AToken.sol.gcov.html">AToken.sol</a></td>
+              <td class="coverFile"><a href="ACLManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/ACLManager.sol">ACLManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.6%"><img src="../../snow.png" width=17 height=10 alt="82.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverPerMed">82.6&nbsp;%</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">19</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtToken.sol.gcov.html">StableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProvider.sol">PoolAddressesProvider.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../ruby.png" width=63 height=10 alt="63.2%"><img src="../../../../../../../../../snow.png" width=37 height=10 alt="63.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerLo">63.2&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">58</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html">VariableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol">PoolAddressesProviderRegistry.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">96.3&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerMed">87.5&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">7</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-f.html b/report/protocol/configuration/index-sort-f.html
similarity index 53%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-f.html
rename to report/protocol/configuration/index-sort-f.html
index 292c8f20..3a7ac3a3 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-f.html
+++ b/report/protocol/configuration/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/configuration</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">90.5&nbsp;%</td>
-            <td class="headerCovTableEntry">74</td>
-            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">108</td>
+            <td class="headerCovTableEntry">103</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">47</td>
-            <td class="headerCovTableEntry">47</td>
+            <td class="headerCovTableEntryHi">96.1&nbsp;%</td>
+            <td class="headerCovTableEntry">51</td>
+            <td class="headerCovTableEntry">49</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html">VariableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol">PoolAddressesProviderRegistry.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">96.3&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerMed">87.5&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AToken.sol.gcov.html">AToken.sol</a></td>
+              <td class="coverFile"><a href="ACLManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/ACLManager.sol">ACLManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.6%"><img src="../../snow.png" width=17 height=10 alt="82.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverPerMed">82.6&nbsp;%</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">19</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtToken.sol.gcov.html">StableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProvider.sol">PoolAddressesProvider.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../ruby.png" width=63 height=10 alt="63.2%"><img src="../../../../../../../../../snow.png" width=37 height=10 alt="63.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerLo">63.2&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">58</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-l.html b/report/protocol/configuration/index-sort-l.html
similarity index 53%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-l.html
rename to report/protocol/configuration/index-sort-l.html
index 8e982fdb..af67b94b 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index-sort-l.html
+++ b/report/protocol/configuration/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/configuration</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">90.5&nbsp;%</td>
-            <td class="headerCovTableEntry">74</td>
-            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">108</td>
+            <td class="headerCovTableEntry">103</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">47</td>
-            <td class="headerCovTableEntry">47</td>
+            <td class="headerCovTableEntryHi">96.1&nbsp;%</td>
+            <td class="headerCovTableEntry">51</td>
+            <td class="headerCovTableEntry">49</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtToken.sol.gcov.html">StableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="ACLManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/ACLManager.sol">ACLManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../ruby.png" width=63 height=10 alt="63.2%"><img src="../../../../../../../../../snow.png" width=37 height=10 alt="63.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.6%"><img src="../../snow.png" width=17 height=10 alt="82.6%"></td></tr></table>
               </td>
-              <td class="coverPerLo">63.2&nbsp;%</td>
+              <td class="coverPerMed">82.6&nbsp;%</td>
+              <td class="coverNumDflt">23</td>
               <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">12</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
               <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html">VariableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol">PoolAddressesProviderRegistry.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">96.3&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerMed">87.5&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AToken.sol.gcov.html">AToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProvider.sol">PoolAddressesProvider.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">58</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html b/report/protocol/configuration/index.html
similarity index 53%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html
rename to report/protocol/configuration/index.html
index 8353c61b..7c2000b3 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/index.html
+++ b/report/protocol/configuration/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/configuration</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/configuration</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">90.5&nbsp;%</td>
-            <td class="headerCovTableEntry">74</td>
-            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntryHi">95.4&nbsp;%</td>
+            <td class="headerCovTableEntry">108</td>
+            <td class="headerCovTableEntry">103</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">47</td>
-            <td class="headerCovTableEntry">47</td>
+            <td class="headerCovTableEntryHi">96.1&nbsp;%</td>
+            <td class="headerCovTableEntry">51</td>
+            <td class="headerCovTableEntry">49</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AToken.sol.gcov.html">AToken.sol</a></td>
+              <td class="coverFile"><a href="ACLManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/ACLManager.sol">ACLManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../amber.png" width=83 height=10 alt="82.6%"><img src="../../snow.png" width=17 height=10 alt="82.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">37</td>
-              <td class="coverNumDflt">37</td>
+              <td class="coverPerMed">82.6&nbsp;%</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">19</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverPerHi">95.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">19</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StableDebtToken.sol.gcov.html">StableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProvider.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProvider.sol">PoolAddressesProvider.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../ruby.png" width=63 height=10 alt="63.2%"><img src="../../../../../../../../../snow.png" width=37 height=10 alt="63.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerLo">63.2&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">58</td>
+              <td class="coverNumDflt">58</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">19</td>
-              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">23</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html">VariableDebtToken.sol</a></td>
+              <td class="coverFile"><a href="PoolAddressesProviderRegistry.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol">PoolAddressesProviderRegistry.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverPerHi">96.3&nbsp;%</td>
+              <td class="coverNumDflt">27</td>
+              <td class="coverNumDflt">26</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverPerMed">87.5&nbsp;%</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">7</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/protocol/libraries/logic/BorrowLogic.sol.func-c.html b/report/protocol/libraries/logic/BorrowLogic.sol.func-c.html
new file mode 100644
index 00000000..84a67cc3
--- /dev/null
+++ b/report/protocol/libraries/logic/BorrowLogic.sol.func-c.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BorrowLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (<a href="BorrowLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">41</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BorrowLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L152">BorrowLogic.executeRepay</a></td>
+              
+              <td class="coverFnHi">5030</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L58">BorrowLogic.executeBorrow</a></td>
+              
+              <td class="coverFnHi">16110</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/protocol/libraries/logic/BorrowLogic.sol.func.html b/report/protocol/libraries/logic/BorrowLogic.sol.func.html
new file mode 100644
index 00000000..bb80c94e
--- /dev/null
+++ b/report/protocol/libraries/logic/BorrowLogic.sol.func.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BorrowLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (<a href="BorrowLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">41</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BorrowLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L58">BorrowLogic.executeBorrow</a></td>
+              
+              <td class="coverFnHi">16110</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="BorrowLogic.sol.gcov.html#L152">BorrowLogic.executeRepay</a></td>
+              
+              <td class="coverFnHi">5030</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.gcov.html b/report/protocol/libraries/logic/BorrowLogic.sol.gcov.html
similarity index 56%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.gcov.html
rename to report/protocol/libraries/logic/BorrowLogic.sol.gcov.html
index dc79b92f..ef740d79 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/BorrowLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BorrowLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (source / <a href="BorrowLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BorrowLogic.sol<span style="font-size: 80%;"> (source / <a href="BorrowLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">88.1&nbsp;%</td>
-            <td class="headerCovTableEntry">67</td>
-            <td class="headerCovTableEntry">59</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">41</td>
+            <td class="headerCovTableEntry">41</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">2</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -75,357 +75,234 @@
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {Helpers} from '../helpers/Helpers.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : import {IsolationModeLogic} from './IsolationModeLogic.sol';</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             : </span>
-<span id="L18"><span class="lineNum">      18</span>                 :             : /**</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :  * @title BorrowLogic library</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :  * @author Aave</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :  * @notice Implements the base logic for all the actions related to borrowing</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :  */</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             : library BorrowLogic {</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   using SafeCast for uint256;</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   // See `IPool` for descriptions</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :   event Borrow(</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :     address indexed reserve,</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :     address user,</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     address indexed onBehalfOf,</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :     uint256 amount,</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     uint256 borrowRate,</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :     uint16 indexed referralCode</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :   );</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :   event Repay(</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :     address indexed reserve,</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :     address indexed user,</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     address indexed repayer,</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     uint256 amount,</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :     bool useATokens</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   );</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :   event RebalanceStableBorrowRate(address indexed reserve, address indexed user);</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :   event SwapBorrowRateMode(</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :     address indexed reserve,</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :     address indexed user,</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :     DataTypes.InterestRateMode interestRateMode</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :   );</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   event IsolationModeTotalDebtUpdated(address indexed asset, uint256 totalDebt);</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             : </span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :   /**</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :    * @notice Implements the borrow feature. Borrowing allows users that provided collateral to draw liquidity from the</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :    * Aave protocol proportionally to their collateralization power. For isolated positions, it also increases the</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :    * isolated debt.</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :    * @dev  Emits the `Borrow()` event</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :    * @param params The additional parameters needed to execute the borrow function</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :    */</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC tlaBgGNC">        9117 :   function executeBorrow(</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     DataTypes.ExecuteBorrowParams memory params</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :   ) public {</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       18234 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       27351 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {IsolationModeLogic} from './IsolationModeLogic.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : </span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : /**</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  * @title BorrowLogic library</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  * @author Aave</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :  * @notice Implements the base logic for all the actions related to borrowing</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :  */</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : library BorrowLogic {</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   using SafeCast for uint256;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             : </span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   // See `IPool` for descriptions</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   event Borrow(</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :     address indexed reserve,</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :     address user,</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :     address indexed onBehalfOf,</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :     uint256 amount,</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :     uint256 borrowRate,</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :     uint16 indexed referralCode</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   );</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   event Repay(</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :     address indexed reserve,</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :     address indexed user,</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :     address indexed repayer,</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :     uint256 amount,</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :     bool useATokens</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   );</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   event IsolationModeTotalDebtUpdated(address indexed asset, uint256 totalDebt);</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   /**</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :    * @notice Implements the borrow feature. Borrowing allows users that provided collateral to draw liquidity from the</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :    * Aave protocol proportionally to their collateralization power. For isolated positions, it also increases the</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :    * isolated debt.</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :    * @dev  Emits the `Borrow()` event</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :    * @param params The additional parameters needed to execute the borrow function</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :    */</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   function executeBorrow(</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :     DataTypes.ExecuteBorrowParams memory params</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   ) external {</span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC tlaBgGNC">       16110 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">       16110 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :             : </span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">       16110 :     reserve.updateState(reserveCache);</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             : </span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       16110 :     (</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :       bool isolationModeActive,</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :       address isolationModeCollateralAddress,</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :       uint256 isolationModeDebtCeiling</span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       16110 :     ) = userConfig.getIsolationModeState(reservesData, reservesList);</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       18234 :     reserve.updateState(reserveCache);</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :             : </span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">       18234 :     (</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :       bool isolationModeActive,</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :       address isolationModeCollateralAddress,</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :       uint256 isolationModeDebtCeiling</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">       18234 :     ) = userConfig.getIsolationModeState(reservesData, reservesList);</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :             : </span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       18234 :     ValidationLogic.validateBorrow(</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :       reservesData,</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :       reservesList,</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :       eModeCategories,</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :       DataTypes.ValidateBorrowParams({</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :         reserveCache: reserveCache,</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :         userConfig: userConfig,</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :         asset: params.asset,</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :         userAddress: params.onBehalfOf,</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :         amount: params.amount,</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :         interestRateMode: params.interestRateMode,</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :         maxStableLoanPercent: params.maxStableRateBorrowSizePercent,</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :         reservesCount: params.reservesCount,</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :         oracle: params.oracle,</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :         userEModeCategory: params.userEModeCategory,</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :         priceOracleSentinel: params.priceOracleSentinel,</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :         isolationModeActive: isolationModeActive,</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :         isolationModeCollateralAddress: isolationModeCollateralAddress,</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :         isolationModeDebtCeiling: isolationModeDebtCeiling</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             :       })</span>
-<span id="L106"><span class="lineNum">     106</span>                 :             :     );</span>
-<span id="L107"><span class="lineNum">     107</span>                 :             : </span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">       18192 :     uint256 currentStableRate = 0;</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       18192 :     bool isFirstBorrowing = false;</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :             : </span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       18192 :     if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">           2 :       currentStableRate = reserve.currentStableBorrowRate;</span></span>
-<span id="L113"><span class="lineNum">     113</span>                 :             : </span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">           2 :       (</span></span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :         isFirstBorrowing,</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :         reserveCache.nextTotalStableDebt,</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :         reserveCache.nextAvgStableBorrowRate</span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :       ) = IStableDebtToken(reserveCache.stableDebtTokenAddress).mint(</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :         params.user,</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :         params.onBehalfOf,</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :         params.amount,</span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :         currentStableRate</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             :       );</span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :     } else {</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">       18190 :       (isFirstBorrowing, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :         reserveCache.variableDebtTokenAddress</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :       ).mint(params.user, params.onBehalfOf, params.amount, reserveCache.nextVariableBorrowIndex);</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :     }</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        9095 :     if (isFirstBorrowing) {</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">       18188 :       userConfig.setBorrowing(reserve.id, true);</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :     }</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">        9095 :     if (isolationModeActive) {</span></span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">          24 :       uint256 nextIsolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :         .isolationModeTotalDebt += (params.amount /</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :         10 **</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :           (reserveCache.reserveConfiguration.getDecimals() -</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :             ReserveConfiguration.DEBT_CEILING_DECIMALS)).toUint128();</span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">          16 :       emit IsolationModeTotalDebtUpdated(</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :             :         isolationModeCollateralAddress,</span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :         nextIsolationModeTotalDebt</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :       );</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :     }</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             : </span>
-<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">       18190 :     reserve.updateInterestRatesAndVirtualBalance(</span></span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :       reserveCache,</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :       params.asset,</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :       0,</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :       params.releaseUnderlying ? params.amount : 0</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :     );</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             : </span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        9094 :     if (params.releaseUnderlying) {</span></span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">       18186 :       IAToken(reserveCache.aTokenAddress).transferUnderlyingTo(params.user, params.amount);</span></span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :     }</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             : </span>
-<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">       18188 :     emit Borrow(</span></span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :       params.asset,</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :       params.user,</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :       params.onBehalfOf,</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :       params.amount,</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :       params.interestRateMode,</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :       params.interestRateMode == DataTypes.InterestRateMode.STABLE</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :         ? currentStableRate</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :         : reserve.currentVariableBorrowRate,</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :       params.referralCode</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :     );</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :   }</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             : </span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :   /**</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :    * @notice Implements the repay feature. Repaying transfers the underlying back to the aToken and clears the</span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :    * equivalent amount of debt for the user by burning the corresponding debt token. For isolated positions, it also</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :    * reduces the isolated debt.</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :    * @dev  Emits the `Repay()` event</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :    * @param params The additional parameters needed to execute the repay function</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :    * @return The actual amount being repaid</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :    */</span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">        5029 :   function executeRepay(</span></span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :     DataTypes.ExecuteRepayParams memory params</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :   ) external returns (uint256) {</span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">       10058 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       15087 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">       10058 :     reserve.updateState(reserveCache);</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :             : </span>
-<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">       15087 :     (uint256 stableDebt, uint256 variableDebt) = Helpers.getUserCurrentDebt(</span></span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :       params.onBehalfOf,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :       reserveCache</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :     );</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             : </span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">       10058 :     ValidationLogic.validateRepay(</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :       reserveCache,</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :       params.amount,</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :       params.interestRateMode,</span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :       params.onBehalfOf,</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :       stableDebt,</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :       variableDebt</span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :     );</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             : </span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">       15072 :     uint256 paybackAmount = params.interestRateMode == DataTypes.InterestRateMode.STABLE</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :       ? stableDebt</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :       : variableDebt;</span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       16110 :     ValidationLogic.validateBorrow(</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :       reservesData,</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :       reservesList,</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :       eModeCategories,</span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :       DataTypes.ValidateBorrowParams({</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :         reserveCache: reserveCache,</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :         userConfig: userConfig,</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :         asset: params.asset,</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :         userAddress: params.onBehalfOf,</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :         amount: params.amount,</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :         interestRateMode: params.interestRateMode,</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :         reservesCount: params.reservesCount,</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :         oracle: params.oracle,</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :         userEModeCategory: params.userEModeCategory,</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :         priceOracleSentinel: params.priceOracleSentinel,</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :         isolationModeActive: isolationModeActive,</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :         isolationModeCollateralAddress: isolationModeCollateralAddress,</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :         isolationModeDebtCeiling: isolationModeDebtCeiling</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :       })</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :     );</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             : </span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">       15091 :     bool isFirstBorrowing = false;</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             : </span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">       15091 :     (isFirstBorrowing, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :       reserveCache.variableDebtTokenAddress</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :     ).mint(params.user, params.onBehalfOf, params.amount, reserveCache.nextVariableBorrowIndex);</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">       15091 :     if (isFirstBorrowing) {</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">       15090 :       userConfig.setBorrowing(reserve.id, true);</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     }</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             : </span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       15091 :     if (isolationModeActive) {</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           8 :       uint256 nextIsolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :         .isolationModeTotalDebt += (params.amount /</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :         10 **</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :           (reserveCache.reserveConfiguration.getDecimals() -</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :             ReserveConfiguration.DEBT_CEILING_DECIMALS)).toUint128();</span>
+<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">           8 :       emit IsolationModeTotalDebtUpdated(</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :         isolationModeCollateralAddress,</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :         nextIsolationModeTotalDebt</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :       );</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :     }</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             : </span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">       15091 :     reserve.updateInterestRatesAndVirtualBalance(</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :       reserveCache,</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :       params.asset,</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :       0,</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :       params.releaseUnderlying ? params.amount : 0</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     );</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             : </span>
+<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">       15090 :     if (params.releaseUnderlying) {</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">       15089 :       IAToken(reserveCache.aTokenAddress).transferUnderlyingTo(params.user, params.amount);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :     }</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             : </span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">       15090 :     emit Borrow(</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :       params.asset,</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :       params.user,</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :       params.onBehalfOf,</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :       params.amount,</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :       DataTypes.InterestRateMode.VARIABLE,</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :       reserve.currentVariableBorrowRate,</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :       params.referralCode</span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :     );</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :   }</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             : </span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :   /**</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :    * @notice Implements the repay feature. Repaying transfers the underlying back to the aToken and clears the</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :    * equivalent amount of debt for the user by burning the corresponding debt token. For isolated positions, it also</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :    * reduces the isolated debt.</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :    * @dev  Emits the `Repay()` event</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :    * @param params The additional parameters needed to execute the repay function</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :    * @return The actual amount being repaid</span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :    */</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   function executeRepay(</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :     DataTypes.ExecuteRepayParams memory params</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :   ) external returns (uint256) {</span>
+<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">        5030 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
+<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">        5030 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">        5030 :     reserve.updateState(reserveCache);</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :             : </span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">        5030 :     uint256 variableDebt = IERC20(reserveCache.variableDebtTokenAddress).balanceOf(</span></span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :       params.onBehalfOf</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :     );</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             : </span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        5030 :     ValidationLogic.validateRepay(</span></span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :       reserveCache,</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :       params.amount,</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :       params.interestRateMode,</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :       params.onBehalfOf,</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :       variableDebt</span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :     );</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             : </span>
+<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">        5024 :     uint256 paybackAmount = variableDebt;</span></span>
+<span id="L177"><span class="lineNum">     177</span>                 :             : </span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :     // Allows a user to repay with aTokens without leaving dust from interest.</span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">        5024 :     if (params.useATokens &amp;&amp; params.amount == type(uint256).max) {</span></span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">           4 :       params.amount = IAToken(reserveCache.aTokenAddress).balanceOf(msg.sender);</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :     }</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             : </span>
+<span id="L183"><span class="lineNum">     183</span>                 :<span class="tlaGNC">        5024 :     if (params.amount &lt; paybackAmount) {</span></span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">        4971 :       paybackAmount = params.amount;</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :     }</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             : </span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">        5024 :     reserveCache.nextScaledVariableDebt = IVariableDebtToken(reserveCache.variableDebtTokenAddress)</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :       .burn(params.onBehalfOf, paybackAmount, reserveCache.nextVariableBorrowIndex);</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             : </span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">        5024 :     reserve.updateInterestRatesAndVirtualBalance(</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :       reserveCache,</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :       params.asset,</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :       params.useATokens ? 0 : paybackAmount,</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :       0</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :     );</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             : </span>
+<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">        5024 :     if (variableDebt - paybackAmount == 0) {</span></span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">          53 :       userConfig.setBorrowing(reserve.id, false);</span></span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :     }</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             : </span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        5024 :     IsolationModeLogic.updateIsolatedDebtIfIsolated(</span></span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :       reservesData,</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :       reservesList,</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :       userConfig,</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :       reserveCache,</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :       paybackAmount</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :     );</span>
 <span id="L208"><span class="lineNum">     208</span>                 :             : </span>
-<span id="L209"><span class="lineNum">     209</span>                 :             :     // Allows a user to repay with aTokens without leaving dust from interest.</span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">       11054 :     if (params.useATokens &amp;&amp; params.amount == type(uint256).max) {</span></span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">           8 :       params.amount = IAToken(reserveCache.aTokenAddress).balanceOf(msg.sender);</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :     }</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             : </span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">       10048 :     if (params.amount &lt; paybackAmount) {</span></span>
-<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">        9246 :       paybackAmount = params.amount;</span></span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :     }</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             : </span>
-<span id="L218"><span class="lineNum">     218</span>                 :<span class="tlaGNC">       10048 :     if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {</span></span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       (reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(</span></span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :         reserveCache.stableDebtTokenAddress</span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :       ).burn(params.onBehalfOf, paybackAmount);</span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :     } else {</span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC tlaBgGNC">       10048 :       reserveCache.nextScaledVariableDebt = IVariableDebtToken(</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :         reserveCache.variableDebtTokenAddress</span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :       ).burn(params.onBehalfOf, paybackAmount, reserveCache.nextVariableBorrowIndex);</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :     }</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             : </span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">       10048 :     reserve.updateInterestRatesAndVirtualBalance(</span></span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :       reserveCache,</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :       params.asset,</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :       params.useATokens ? 0 : paybackAmount,</span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :       0</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :     );</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             : </span>
-<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">       20096 :     if (stableDebt + variableDebt - paybackAmount == 0) {</span></span>
-<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">         802 :       userConfig.setBorrowing(reserve.id, false);</span></span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :     }</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             : </span>
-<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">       10048 :     IsolationModeLogic.updateIsolatedDebtIfIsolated(</span></span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :       reservesData,</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :       reservesList,</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :       userConfig,</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :       reserveCache,</span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :       paybackAmount</span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :     );</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             : </span>
-<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">        5024 :     if (params.useATokens) {</span></span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">        2012 :       IAToken(reserveCache.aTokenAddress).burn(</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :             :         msg.sender,</span>
-<span id="L250"><span class="lineNum">     250</span>                 :             :         reserveCache.aTokenAddress,</span>
-<span id="L251"><span class="lineNum">     251</span>                 :             :         paybackAmount,</span>
-<span id="L252"><span class="lineNum">     252</span>                 :             :         reserveCache.nextLiquidityIndex</span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :       );</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :       // in case of aToken repayment the msg.sender must always repay on behalf of itself</span>
-<span id="L255"><span class="lineNum">     255</span>                 :<span class="tlaGNC">        3015 :       if (IAToken(reserveCache.aTokenAddress).scaledBalanceOf(msg.sender) == 0) {</span></span>
-<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">           4 :         userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
-<span id="L257"><span class="lineNum">     257</span>                 :<span class="tlaGNC">           4 :         emit ReserveUsedAsCollateralDisabled(params.asset, msg.sender);</span></span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :       }</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :     } else {</span>
-<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">        8036 :       IERC20(params.asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, paybackAmount);</span></span>
-<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">        6036 :       IAToken(reserveCache.aTokenAddress).handleRepayment(</span></span>
-<span id="L262"><span class="lineNum">     262</span>                 :             :         msg.sender,</span>
-<span id="L263"><span class="lineNum">     263</span>                 :             :         params.onBehalfOf,</span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :         paybackAmount</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :       );</span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :     }</span>
-<span id="L267"><span class="lineNum">     267</span>                 :             : </span>
-<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">        8046 :     emit Repay(params.asset, params.onBehalfOf, msg.sender, paybackAmount, params.useATokens);</span></span>
-<span id="L269"><span class="lineNum">     269</span>                 :             : </span>
-<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">        8046 :     return paybackAmount;</span></span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :   }</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             : </span>
-<span id="L273"><span class="lineNum">     273</span>                 :             :   /**</span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :    * @notice Implements the rebalance stable borrow rate feature. In case of liquidity crunches on the protocol, stable</span>
-<span id="L275"><span class="lineNum">     275</span>                 :             :    * rate borrows might need to be rebalanced to bring back equilibrium between the borrow and supply APYs.</span>
-<span id="L276"><span class="lineNum">     276</span>                 :             :    * @dev The rules that define if a position can be rebalanced are implemented in `ValidationLogic.validateRebalanceStableBorrowRate()`</span>
-<span id="L277"><span class="lineNum">     277</span>                 :             :    * @dev Emits the `RebalanceStableBorrowRate()` event</span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :    * @param reserve The state of the reserve of the asset being repaid</span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :    * @param asset The asset of the position being rebalanced</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :    * @param user The user being rebalanced</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             :    */</span>
-<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">           5 :   function executeRebalanceStableBorrowRate(</span></span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             :     address asset,</span>
-<span id="L285"><span class="lineNum">     285</span>                 :             :     address user</span>
-<span id="L286"><span class="lineNum">     286</span>                 :             :   ) external {</span>
-<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">          15 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">          10 :     reserve.updateState(reserveCache);</span></span>
-<span id="L289"><span class="lineNum">     289</span>                 :             : </span>
-<span id="L290"><span class="lineNum">     290</span>                 :<span class="tlaGNC">          10 :     ValidationLogic.validateRebalanceStableBorrowRate(reserve, reserveCache, asset);</span></span>
-<span id="L291"><span class="lineNum">     291</span>                 :             : </span>
-<span id="L292"><span class="lineNum">     292</span>                 :<span class="tlaGNC">           6 :     IStableDebtToken stableDebtToken = IStableDebtToken(reserveCache.stableDebtTokenAddress);</span></span>
-<span id="L293"><span class="lineNum">     293</span>                 :<span class="tlaGNC">           6 :     uint256 stableDebt = IERC20(address(stableDebtToken)).balanceOf(user);</span></span>
-<span id="L294"><span class="lineNum">     294</span>                 :             : </span>
-<span id="L295"><span class="lineNum">     295</span>                 :<span class="tlaGNC">           4 :     stableDebtToken.burn(user, stableDebt);</span></span>
-<span id="L296"><span class="lineNum">     296</span>                 :             : </span>
-<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     (, reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = stableDebtToken</span></span>
-<span id="L298"><span class="lineNum">     298</span>                 :             :       .mint(user, user, stableDebt, reserve.currentStableBorrowRate);</span>
-<span id="L299"><span class="lineNum">     299</span>                 :             : </span>
-<span id="L300"><span class="lineNum">     300</span>                 :<span class="tlaUNC">           0 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);</span></span>
-<span id="L301"><span class="lineNum">     301</span>                 :             : </span>
-<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaUNC">           0 :     emit RebalanceStableBorrowRate(asset, user);</span></span>
-<span id="L303"><span class="lineNum">     303</span>                 :             :   }</span>
-<span id="L304"><span class="lineNum">     304</span>                 :             : </span>
-<span id="L305"><span class="lineNum">     305</span>                 :             :   /**</span>
-<span id="L306"><span class="lineNum">     306</span>                 :             :    * @notice Implements the swap borrow rate feature. Borrowers can swap from variable to stable positions at any time.</span>
-<span id="L307"><span class="lineNum">     307</span>                 :             :    * @dev Emits the `Swap()` event</span>
-<span id="L308"><span class="lineNum">     308</span>                 :             :    * @param reserve The of the reserve of the asset being repaid</span>
-<span id="L309"><span class="lineNum">     309</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
-<span id="L310"><span class="lineNum">     310</span>                 :             :    * @param asset The asset of the position being swapped</span>
-<span id="L311"><span class="lineNum">     311</span>                 :             :    * @param interestRateMode The current interest rate mode of the position being swapped</span>
-<span id="L312"><span class="lineNum">     312</span>                 :             :    */</span>
-<span id="L313"><span class="lineNum">     313</span>                 :<span class="tlaGNC tlaBgGNC">           8 :   function executeSwapBorrowRateMode(</span></span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L315"><span class="lineNum">     315</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L316"><span class="lineNum">     316</span>                 :             :     address asset,</span>
-<span id="L317"><span class="lineNum">     317</span>                 :             :     address user,</span>
-<span id="L318"><span class="lineNum">     318</span>                 :             :     DataTypes.InterestRateMode interestRateMode</span>
-<span id="L319"><span class="lineNum">     319</span>                 :             :   ) external {</span>
-<span id="L320"><span class="lineNum">     320</span>                 :<span class="tlaGNC">          24 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L321"><span class="lineNum">     321</span>                 :             : </span>
-<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">          16 :     reserve.updateState(reserveCache);</span></span>
-<span id="L323"><span class="lineNum">     323</span>                 :             : </span>
-<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">          24 :     (uint256 stableDebt, uint256 variableDebt) = Helpers.getUserCurrentDebt(user, reserveCache);</span></span>
-<span id="L325"><span class="lineNum">     325</span>                 :             : </span>
-<span id="L326"><span class="lineNum">     326</span>                 :<span class="tlaGNC">          16 :     ValidationLogic.validateSwapRateMode(</span></span>
-<span id="L327"><span class="lineNum">     327</span>                 :             :       reserve,</span>
-<span id="L328"><span class="lineNum">     328</span>                 :             :       reserveCache,</span>
-<span id="L329"><span class="lineNum">     329</span>                 :             :       userConfig,</span>
-<span id="L330"><span class="lineNum">     330</span>                 :             :       stableDebt,</span>
-<span id="L331"><span class="lineNum">     331</span>                 :             :       variableDebt,</span>
-<span id="L332"><span class="lineNum">     332</span>                 :             :       interestRateMode</span>
-<span id="L333"><span class="lineNum">     333</span>                 :             :     );</span>
-<span id="L334"><span class="lineNum">     334</span>                 :             : </span>
-<span id="L335"><span class="lineNum">     335</span>                 :<span class="tlaGNC">           6 :     if (interestRateMode == DataTypes.InterestRateMode.STABLE) {</span></span>
-<span id="L336"><span class="lineNum">     336</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       (reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(</span></span>
-<span id="L337"><span class="lineNum">     337</span>                 :             :         reserveCache.stableDebtTokenAddress</span>
-<span id="L338"><span class="lineNum">     338</span>                 :             :       ).burn(user, stableDebt);</span>
-<span id="L339"><span class="lineNum">     339</span>                 :             : </span>
-<span id="L340"><span class="lineNum">     340</span>                 :<span class="tlaUNC">           0 :       (, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(</span></span>
-<span id="L341"><span class="lineNum">     341</span>                 :             :         reserveCache.variableDebtTokenAddress</span>
-<span id="L342"><span class="lineNum">     342</span>                 :             :       ).mint(user, user, stableDebt, reserveCache.nextVariableBorrowIndex);</span>
-<span id="L343"><span class="lineNum">     343</span>                 :             :     } else {</span>
-<span id="L344"><span class="lineNum">     344</span>                 :<span class="tlaGNC tlaBgGNC">           6 :       reserveCache.nextScaledVariableDebt = IVariableDebtToken(</span></span>
-<span id="L345"><span class="lineNum">     345</span>                 :             :         reserveCache.variableDebtTokenAddress</span>
-<span id="L346"><span class="lineNum">     346</span>                 :             :       ).burn(user, variableDebt, reserveCache.nextVariableBorrowIndex);</span>
-<span id="L347"><span class="lineNum">     347</span>                 :             : </span>
-<span id="L348"><span class="lineNum">     348</span>                 :<span class="tlaGNC">           6 :       (, reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(</span></span>
-<span id="L349"><span class="lineNum">     349</span>                 :             :         reserveCache.stableDebtTokenAddress</span>
-<span id="L350"><span class="lineNum">     350</span>                 :             :       ).mint(user, user, variableDebt, reserve.currentStableBorrowRate);</span>
-<span id="L351"><span class="lineNum">     351</span>                 :             :     }</span>
-<span id="L352"><span class="lineNum">     352</span>                 :             : </span>
-<span id="L353"><span class="lineNum">     353</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);</span></span>
-<span id="L354"><span class="lineNum">     354</span>                 :             : </span>
-<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaUNC">           0 :     emit SwapBorrowRateMode(asset, user, interestRateMode);</span></span>
-<span id="L356"><span class="lineNum">     356</span>                 :             :   }</span>
-<span id="L357"><span class="lineNum">     357</span>                 :             : }</span>
+<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">        5024 :     if (params.useATokens) {</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">        1006 :       IAToken(reserveCache.aTokenAddress).burn(</span></span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :         msg.sender,</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :         reserveCache.aTokenAddress,</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :         paybackAmount,</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :         reserveCache.nextLiquidityIndex</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :       );</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :       // in case of aToken repayment the msg.sender must always repay on behalf of itself</span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">        1005 :       if (IAToken(reserveCache.aTokenAddress).scaledBalanceOf(msg.sender) == 0) {</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :<span class="tlaGNC">           2 :         userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
+<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">           2 :         emit ReserveUsedAsCollateralDisabled(params.asset, msg.sender);</span></span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :       }</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :     } else {</span>
+<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">        4018 :       IERC20(params.asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, paybackAmount);</span></span>
+<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">        3018 :       IAToken(reserveCache.aTokenAddress).handleRepayment(</span></span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :         msg.sender,</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :         params.onBehalfOf,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :         paybackAmount</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :       );</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :     }</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             : </span>
+<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">        4023 :     emit Repay(params.asset, params.onBehalfOf, msg.sender, paybackAmount, params.useATokens);</span></span>
+<span id="L231"><span class="lineNum">     231</span>                 :             : </span>
+<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">        4023 :     return paybackAmount;</span></span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :   }</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -433,8 +310,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func-c.html b/report/protocol/libraries/logic/BridgeLogic.sol.func-c.html
similarity index 68%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func-c.html
rename to report/protocol/libraries/logic/BridgeLogic.sol.func-c.html
index bcdb3d86..7ef58872 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/BridgeLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BridgeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (<a href="BridgeLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (<a href="BridgeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BridgeLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="BridgeLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func.html b/report/protocol/libraries/logic/BridgeLogic.sol.func.html
similarity index 68%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func.html
rename to report/protocol/libraries/logic/BridgeLogic.sol.func.html
index b7642685..b66c60e4 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.func.html
+++ b/report/protocol/libraries/logic/BridgeLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BridgeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (<a href="BridgeLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (<a href="BridgeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BridgeLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="BridgeLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.gcov.html b/report/protocol/libraries/logic/BridgeLogic.sol.gcov.html
similarity index 87%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.gcov.html
rename to report/protocol/libraries/logic/BridgeLogic.sol.gcov.html
index aa403b76..572a41b7 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/BridgeLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/BridgeLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (source / <a href="BridgeLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - BridgeLogic.sol<span style="font-size: 80%;"> (source / <a href="BridgeLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -120,7 +120,7 @@
 <span id="L49"><span class="lineNum">      49</span>                 :             :    * @param referralCode Code used to register the integrator originating the operation, for potential rewards.</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :    *   0 if the action is executed directly by the user, without any middle-man</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :    */</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC tlaBgGNC">          16 :   function executeMintUnbacked(</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   function executeMintUnbacked(</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
@@ -129,26 +129,26 @@
 <span id="L58"><span class="lineNum">      58</span>                 :             :     address onBehalfOf,</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :     uint16 referralCode</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   ) external {</span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">          32 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">          48 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC tlaBgGNC">          16 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">          16 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
 <span id="L63"><span class="lineNum">      63</span>                 :             : </span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">          32 :     reserve.updateState(reserveCache);</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">          16 :     reserve.updateState(reserveCache);</span></span>
 <span id="L65"><span class="lineNum">      65</span>                 :             : </span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">          32 :     ValidationLogic.validateSupply(reserveCache, reserve, amount, onBehalfOf);</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">          16 :     ValidationLogic.validateSupply(reserveCache, reserve, amount, onBehalfOf);</span></span>
 <span id="L67"><span class="lineNum">      67</span>                 :             : </span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">          48 :     uint256 unbackedMintCap = reserveCache.reserveConfiguration.getUnbackedMintCap();</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">          48 :     uint256 reserveDecimals = reserveCache.reserveConfiguration.getDecimals();</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">          16 :     uint256 unbackedMintCap = reserveCache.reserveConfiguration.getUnbackedMintCap();</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">          16 :     uint256 reserveDecimals = reserveCache.reserveConfiguration.getDecimals();</span></span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          48 :     uint256 unbacked = reserve.unbacked += amount.toUint128();</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          16 :     uint256 unbacked = reserve.unbacked += amount.toUint128();</span></span>
 <span id="L72"><span class="lineNum">      72</span>                 :             : </span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          32 :     require(</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">          16 :     require(</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :       unbacked &lt;= unbackedMintCap * (10 ** reserveDecimals),</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :       Errors.UNBACKED_MINT_CAP_EXCEEDED</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :     );</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">          28 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">          14 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);</span></span>
 <span id="L79"><span class="lineNum">      79</span>                 :             : </span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">          42 :     bool isFirstSupply = IAToken(reserveCache.aTokenAddress).mint(</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">          14 :     bool isFirstSupply = IAToken(reserveCache.aTokenAddress).mint(</span></span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :       msg.sender,</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :       onBehalfOf,</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :       amount,</span>
@@ -157,7 +157,7 @@
 <span id="L86"><span class="lineNum">      86</span>                 :             : </span>
 <span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">          14 :     if (isFirstSupply) {</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :       if (</span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">          14 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">           7 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :           reservesData,</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :           reservesList,</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :           userConfig,</span>
@@ -165,12 +165,12 @@
 <span id="L94"><span class="lineNum">      94</span>                 :             :           reserveCache.aTokenAddress</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :         )</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :       ) {</span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">          14 :         userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">          14 :         emit ReserveUsedAsCollateralEnabled(asset, onBehalfOf);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           7 :         userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           7 :         emit ReserveUsedAsCollateralEnabled(asset, onBehalfOf);</span></span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :       }</span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :     }</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             : </span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">          28 :     emit MintUnbacked(asset, msg.sender, onBehalfOf, amount, referralCode);</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">          14 :     emit MintUnbacked(asset, msg.sender, onBehalfOf, amount, referralCode);</span></span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :   }</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             : </span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :   /**</span>
@@ -184,39 +184,39 @@
 <span id="L113"><span class="lineNum">     113</span>                 :             :    * @param protocolFeeBps The fraction of fees in basis points paid to the protocol</span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :    * @return The backed amount</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :    */</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">           9 :   function executeBackUnbacked(</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function executeBackUnbacked(</span>
 <span id="L117"><span class="lineNum">     117</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :     address asset,</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :     uint256 amount,</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :     uint256 fee,</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :     uint256 protocolFeeBps</span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   ) external returns (uint256) {</span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">          27 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">           9 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
 <span id="L124"><span class="lineNum">     124</span>                 :             : </span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">          18 :     reserve.updateState(reserveCache);</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           9 :     reserve.updateState(reserveCache);</span></span>
 <span id="L126"><span class="lineNum">     126</span>                 :             : </span>
-<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">          27 :     uint256 backingAmount = (amount &lt; reserve.unbacked) ? amount : reserve.unbacked;</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">           9 :     uint256 backingAmount = (amount &lt; reserve.unbacked) ? amount : reserve.unbacked;</span></span>
 <span id="L128"><span class="lineNum">     128</span>                 :             : </span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">          27 :     uint256 feeToProtocol = fee.percentMul(protocolFeeBps);</span></span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">          27 :     uint256 feeToLP = fee - feeToProtocol;</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">          27 :     uint256 added = backingAmount + fee;</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">           9 :     uint256 feeToProtocol = fee.percentMul(protocolFeeBps);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           9 :     uint256 feeToLP = fee - feeToProtocol;</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           9 :     uint256 added = backingAmount + fee;</span></span>
 <span id="L132"><span class="lineNum">     132</span>                 :             : </span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">          18 :     reserveCache.nextLiquidityIndex = reserve.cumulateToLiquidityIndex(</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">           9 :     reserveCache.nextLiquidityIndex = reserve.cumulateToLiquidityIndex(</span></span>
 <span id="L134"><span class="lineNum">     134</span>                 :             :       IERC20(reserveCache.aTokenAddress).totalSupply() +</span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :         uint256(reserve.accruedToTreasury).rayMul(reserveCache.nextLiquidityIndex),</span>
 <span id="L136"><span class="lineNum">     136</span>                 :             :       feeToLP</span>
 <span id="L137"><span class="lineNum">     137</span>                 :             :     );</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             : </span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">          18 :     reserve.accruedToTreasury += feeToProtocol.rayDiv(reserveCache.nextLiquidityIndex).toUint128();</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">           9 :     reserve.accruedToTreasury += feeToProtocol.rayDiv(reserveCache.nextLiquidityIndex).toUint128();</span></span>
 <span id="L140"><span class="lineNum">     140</span>                 :             : </span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">          18 :     reserve.unbacked -= backingAmount.toUint128();</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">          18 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, added, 0);</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           9 :     reserve.unbacked -= backingAmount.toUint128();</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">           9 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, added, 0);</span></span>
 <span id="L143"><span class="lineNum">     143</span>                 :             : </span>
-<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">          18 :     IERC20(asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, added);</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">           9 :     IERC20(asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, added);</span></span>
 <span id="L145"><span class="lineNum">     145</span>                 :             : </span>
-<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">          18 :     emit BackUnbacked(asset, msg.sender, backingAmount, fee);</span></span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">           9 :     emit BackUnbacked(asset, msg.sender, backingAmount, fee);</span></span>
 <span id="L147"><span class="lineNum">     147</span>                 :             : </span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">          18 :     return backingAmount;</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">           9 :     return backingAmount;</span></span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :   }</span>
 <span id="L150"><span class="lineNum">     150</span>                 :             : }</span>
         </pre>
@@ -226,8 +226,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func-c.html b/report/protocol/libraries/logic/CalldataLogic.sol.func-c.html
similarity index 65%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func-c.html
rename to report/protocol/libraries/logic/CalldataLogic.sol.func-c.html
index 086a5787..09c229f7 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/CalldataLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/CalldataLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (<a href="CalldataLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (<a href="CalldataLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">72</td>
-            <td class="headerCovTableEntry">72</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">62</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,47 +53,33 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="CalldataLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="CalldataLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L241">CalldataLogic.decodeLiquidationCallParams</a></td>
+              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L199">CalldataLogic.decodeLiquidationCallParams</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L197">CalldataLogic.decodeRebalanceStableBorrowRateParams</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L217">CalldataLogic.decodeSetUserUseReserveAsCollateralParams</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L175">CalldataLogic.decodeSwapBorrowRateModeParams</a></td>
+              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L175">CalldataLogic.decodeSetUserUseReserveAsCollateralParams</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -145,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func.html b/report/protocol/libraries/logic/CalldataLogic.sol.func.html
similarity index 65%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func.html
rename to report/protocol/libraries/logic/CalldataLogic.sol.func.html
index 7e5722ec..6ac13f15 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.func.html
+++ b/report/protocol/libraries/logic/CalldataLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/CalldataLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (<a href="CalldataLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (<a href="CalldataLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">72</td>
-            <td class="headerCovTableEntry">72</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">62</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="CalldataLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="CalldataLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
@@ -79,14 +79,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L241">CalldataLogic.decodeLiquidationCallParams</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L197">CalldataLogic.decodeRebalanceStableBorrowRateParams</a></td>
+              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L199">CalldataLogic.decodeLiquidationCallParams</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -107,7 +100,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L217">CalldataLogic.decodeSetUserUseReserveAsCollateralParams</a></td>
+              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L175">CalldataLogic.decodeSetUserUseReserveAsCollateralParams</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -126,13 +119,6 @@
               <td class="coverFnHi">1000</td>
               
               
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L175">CalldataLogic.decodeSwapBorrowRateModeParams</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
             </tr>
             <tr>
               <td class="coverFn"><a href="CalldataLogic.sol.gcov.html#L65">CalldataLogic.decodeWithdrawParams</a></td>
@@ -145,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.gcov.html b/report/protocol/libraries/logic/CalldataLogic.sol.gcov.html
similarity index 70%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.gcov.html
rename to report/protocol/libraries/logic/CalldataLogic.sol.gcov.html
index f8e61c0a..9e8e2849 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/CalldataLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/CalldataLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (source / <a href="CalldataLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - CalldataLogic.sol<span style="font-size: 80%;"> (source / <a href="CalldataLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">72</td>
-            <td class="headerCovTableEntry">72</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">62</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -86,20 +86,20 @@
 <span id="L15"><span class="lineNum">      15</span>                 :             :    * @return The amount to supply</span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :    * @return The referralCode</span>
 <span id="L17"><span class="lineNum">      17</span>                 :             :    */</span>
-<span id="L18"><span class="lineNum">      18</span>                 :<span class="tlaGNC tlaBgGNC">        1007 :   function decodeSupplyParams(</span></span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :   function decodeSupplyParams(</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :     bytes32 args</span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :   ) internal view returns (address, uint256, uint16) {</span>
-<span id="L22"><span class="lineNum">      22</span>                 :<span class="tlaGNC">        2014 :     uint16 assetId;</span></span>
-<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">        2014 :     uint256 amount;</span></span>
-<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaGNC">        2014 :     uint16 referralCode;</span></span>
+<span id="L22"><span class="lineNum">      22</span>                 :<span class="tlaGNC tlaBgGNC">        1007 :     uint16 assetId;</span></span>
+<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">        1007 :     uint256 amount;</span></span>
+<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaGNC">        1007 :     uint16 referralCode;</span></span>
 <span id="L25"><span class="lineNum">      25</span>                 :             : </span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :     assembly {</span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        2014 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        2014 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">        2014 :       referralCode := and(shr(144, args), 0xFFFF)</span></span>
+<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        1007 :       assetId := and(args, 0xFFFF)</span></span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        1007 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">        1007 :       referralCode := and(shr(144, args), 0xFFFF)</span></span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :     }</span>
-<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        2014 :     return (reservesList[assetId], amount, referralCode);</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        1007 :     return (reservesList[assetId], amount, referralCode);</span></span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :   }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   /**</span>
@@ -112,20 +112,20 @@
 <span id="L41"><span class="lineNum">      41</span>                 :             :    * @return The deadline of the permit</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :    * @return The V value of the permit signature</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :    */</span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">        1000 :   function decodeSupplyWithPermitParams(</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   function decodeSupplyWithPermitParams(</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :     bytes32 args</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :   ) internal view returns (address, uint256, uint16, uint256, uint8) {</span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">        2000 :     uint256 deadline;</span></span>
-<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">        2000 :     uint8 permitV;</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">        1000 :     uint256 deadline;</span></span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">        1000 :     uint8 permitV;</span></span>
 <span id="L50"><span class="lineNum">      50</span>                 :             : </span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :     assembly {</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">        2000 :       deadline := and(shr(160, args), 0xFFFFFFFF)</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">        2000 :       permitV := and(shr(192, args), 0xFF)</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">        1000 :       deadline := and(shr(160, args), 0xFFFFFFFF)</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">        1000 :       permitV := and(shr(192, args), 0xFF)</span></span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :     }</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">        3000 :     (address asset, uint256 amount, uint16 referralCode) = decodeSupplyParams(reservesList, args);</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">        1000 :     (address asset, uint256 amount, uint16 referralCode) = decodeSupplyParams(reservesList, args);</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">        2000 :     return (asset, amount, referralCode, deadline, permitV);</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">        1000 :     return (asset, amount, referralCode, deadline, permitV);</span></span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :   }</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   /**</span>
@@ -135,20 +135,20 @@
 <span id="L64"><span class="lineNum">      64</span>                 :             :    * @return The address of the underlying reserve</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :    * @return The amount to withdraw</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :    */</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           2 :   function decodeWithdrawParams(</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   function decodeWithdrawParams(</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     bytes32 args</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :   ) internal view returns (address, uint256) {</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           4 :     uint16 assetId;</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           4 :     uint256 amount;</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           2 :     uint16 assetId;</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           2 :     uint256 amount;</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     assembly {</span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           4 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           4 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           2 :       assetId := and(args, 0xFFFF)</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           2 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :     }</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           4 :     if (amount == type(uint128).max) {</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           2 :       amount = type(uint256).max;</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           2 :     if (amount == type(uint128).max) {</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           1 :       amount = type(uint256).max;</span></span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :     }</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           4 :     return (reservesList[assetId], amount);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           2 :     return (reservesList[assetId], amount);</span></span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :   }</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             : </span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :   /**</span>
@@ -157,26 +157,26 @@
 <span id="L86"><span class="lineNum">      86</span>                 :             :    * @param args The packed borrow params</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :    * @return The address of the underlying reserve</span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :    * @return The amount to borrow</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :    * @return The interestRateMode, 1 for stable or 2 for variable debt</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :    * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :    * @return The referralCode</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :    */</span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">           3 :   function decodeBorrowParams(</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function decodeBorrowParams(</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :     bytes32 args</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :   ) internal view returns (address, uint256, uint256, uint16) {</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           6 :     uint16 assetId;</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           6 :     uint256 amount;</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           6 :     uint256 interestRateMode;</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">           6 :     uint16 referralCode;</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           3 :     uint16 assetId;</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           3 :     uint256 amount;</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           3 :     uint256 interestRateMode;</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">           3 :     uint16 referralCode;</span></span>
 <span id="L100"><span class="lineNum">     100</span>                 :             : </span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :     assembly {</span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           6 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">           6 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           6 :       interestRateMode := and(shr(144, args), 0xFF)</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           6 :       referralCode := and(shr(152, args), 0xFFFF)</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           3 :       assetId := and(args, 0xFFFF)</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">           3 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           3 :       interestRateMode := and(shr(144, args), 0xFF)</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           3 :       referralCode := and(shr(152, args), 0xFFFF)</span></span>
 <span id="L106"><span class="lineNum">     106</span>                 :             :     }</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             : </span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           6 :     return (reservesList[assetId], amount, interestRateMode, referralCode);</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           3 :     return (reservesList[assetId], amount, interestRateMode, referralCode);</span></span>
 <span id="L109"><span class="lineNum">     109</span>                 :             :   }</span>
 <span id="L110"><span class="lineNum">     110</span>                 :             : </span>
 <span id="L111"><span class="lineNum">     111</span>                 :             :   /**</span>
@@ -185,27 +185,27 @@
 <span id="L114"><span class="lineNum">     114</span>                 :             :    * @param args The packed repay params</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :    * @return The address of the underlying reserve</span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :    * @return The amount to repay</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :    * @return The interestRateMode, 1 for stable or 2 for variable debt</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :    * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :    */</span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">        1002 :   function decodeRepayParams(</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :   function decodeRepayParams(</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :     bytes32 args</span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   ) internal view returns (address, uint256, uint256) {</span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        2004 :     uint16 assetId;</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        2004 :     uint256 amount;</span></span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">        2004 :     uint256 interestRateMode;</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        1002 :     uint16 assetId;</span></span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        1002 :     uint256 amount;</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">        1002 :     uint256 interestRateMode;</span></span>
 <span id="L126"><span class="lineNum">     126</span>                 :             : </span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :     assembly {</span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">        2004 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">        2004 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        2004 :       interestRateMode := and(shr(144, args), 0xFF)</span></span>
+<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">        1002 :       assetId := and(args, 0xFFFF)</span></span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">        1002 :       amount := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        1002 :       interestRateMode := and(shr(144, args), 0xFF)</span></span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :     }</span>
 <span id="L132"><span class="lineNum">     132</span>                 :             : </span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">        2004 :     if (amount == type(uint128).max) {</span></span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           4 :       amount = type(uint256).max;</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">        1002 :     if (amount == type(uint128).max) {</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           2 :       amount = type(uint256).max;</span></span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :     }</span>
 <span id="L136"><span class="lineNum">     136</span>                 :             : </span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        2004 :     return (reservesList[assetId], amount, interestRateMode);</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        1002 :     return (reservesList[assetId], amount, interestRateMode);</span></span>
 <span id="L138"><span class="lineNum">     138</span>                 :             :   }</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             : </span>
 <span id="L140"><span class="lineNum">     140</span>                 :             :   /**</span>
@@ -214,136 +214,94 @@
 <span id="L143"><span class="lineNum">     143</span>                 :             :    * @param args The packed repay with permit params</span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :    * @return The address of the underlying reserve</span>
 <span id="L145"><span class="lineNum">     145</span>                 :             :    * @return The amount to repay</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :    * @return The interestRateMode, 1 for stable or 2 for variable debt</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :    * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)</span>
 <span id="L147"><span class="lineNum">     147</span>                 :             :    * @return The deadline of the permit</span>
 <span id="L148"><span class="lineNum">     148</span>                 :             :    * @return The V value of the permit signature</span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :    */</span>
-<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">        1000 :   function decodeRepayWithPermitParams(</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :   function decodeRepayWithPermitParams(</span>
 <span id="L151"><span class="lineNum">     151</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L152"><span class="lineNum">     152</span>                 :             :     bytes32 args</span>
 <span id="L153"><span class="lineNum">     153</span>                 :             :   ) internal view returns (address, uint256, uint256, uint256, uint8) {</span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">        2000 :     uint256 deadline;</span></span>
-<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">        2000 :     uint8 permitV;</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">        1000 :     uint256 deadline;</span></span>
+<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">        1000 :     uint8 permitV;</span></span>
 <span id="L156"><span class="lineNum">     156</span>                 :             : </span>
-<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">        3000 :     (address asset, uint256 amount, uint256 interestRateMode) = decodeRepayParams(</span></span>
+<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">        1000 :     (address asset, uint256 amount, uint256 interestRateMode) = decodeRepayParams(</span></span>
 <span id="L158"><span class="lineNum">     158</span>                 :             :       reservesList,</span>
 <span id="L159"><span class="lineNum">     159</span>                 :             :       args</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             :     );</span>
 <span id="L161"><span class="lineNum">     161</span>                 :             : </span>
 <span id="L162"><span class="lineNum">     162</span>                 :             :     assembly {</span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">        2000 :       deadline := and(shr(152, args), 0xFFFFFFFF)</span></span>
-<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">        2000 :       permitV := and(shr(184, args), 0xFF)</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">        1000 :       deadline := and(shr(152, args), 0xFFFFFFFF)</span></span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">        1000 :       permitV := and(shr(184, args), 0xFF)</span></span>
 <span id="L165"><span class="lineNum">     165</span>                 :             :     }</span>
 <span id="L166"><span class="lineNum">     166</span>                 :             : </span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        2000 :     return (asset, amount, interestRateMode, deadline, permitV);</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        1000 :     return (asset, amount, interestRateMode, deadline, permitV);</span></span>
 <span id="L168"><span class="lineNum">     168</span>                 :             :   }</span>
 <span id="L169"><span class="lineNum">     169</span>                 :             : </span>
 <span id="L170"><span class="lineNum">     170</span>                 :             :   /**</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :    * @notice Decodes compressed swap borrow rate mode params to standard params</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :    * @notice Decodes compressed set user use reserve as collateral params to standard params</span>
 <span id="L172"><span class="lineNum">     172</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :    * @param args The packed swap borrow rate mode params</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :    * @param args The packed set user use reserve as collateral params</span>
 <span id="L174"><span class="lineNum">     174</span>                 :             :    * @return The address of the underlying reserve</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :    * @return The interest rate mode, 1 for stable 2 for variable debt</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :    * @return True if to set using as collateral, false otherwise</span>
 <span id="L176"><span class="lineNum">     176</span>                 :             :    */</span>
-<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">           1 :   function decodeSwapBorrowRateModeParams(</span></span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :   function decodeSetUserUseReserveAsCollateralParams(</span>
 <span id="L178"><span class="lineNum">     178</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L179"><span class="lineNum">     179</span>                 :             :     bytes32 args</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :   ) internal view returns (address, uint256) {</span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           2 :     uint16 assetId;</span></span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">           2 :     uint256 interestRateMode;</span></span>
-<span id="L183"><span class="lineNum">     183</span>                 :             : </span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :     assembly {</span>
-<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">           2 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">           2 :       interestRateMode := and(shr(16, args), 0xFF)</span></span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :     }</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             : </span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">           2 :     return (reservesList[assetId], interestRateMode);</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :   }</span>
-<span id="L191"><span class="lineNum">     191</span>                 :             : </span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :   /**</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :    * @notice Decodes compressed rebalance stable borrow rate params to standard params</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :    * @param args The packed rabalance stable borrow rate params</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             :    * @return The address of the underlying reserve</span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :    * @return The address of the user to rebalance</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :    */</span>
-<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">           1 :   function decodeRebalanceStableBorrowRateParams(</span></span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :     bytes32 args</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :   ) internal view returns (address, address) {</span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">           2 :     uint16 assetId;</span></span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">           2 :     address user;</span></span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :     assembly {</span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           2 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">           2 :       user := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :     }</span>
-<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">           2 :     return (reservesList[assetId], user);</span></span>
-<span id="L210"><span class="lineNum">     210</span>                 :             :   }</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :   ) internal view returns (address, bool) {</span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           1 :     uint16 assetId;</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">           1 :     bool useAsCollateral;</span></span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :     assembly {</span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">           1 :       assetId := and(args, 0xFFFF)</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">           1 :       useAsCollateral := and(shr(16, args), 0x1)</span></span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :     }</span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           1 :     return (reservesList[assetId], useAsCollateral);</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :   }</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             : </span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :   /**</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :    * @notice Decodes compressed liquidation call params to standard params</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :    * @param args1 The first half of packed liquidation call params</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :    * @param args2 The second half of the packed liquidation call params</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :    * @return The address of the underlying collateral asset</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :    * @return The address of the underlying debt asset</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :    * @return The address of the user to liquidate</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :    * @return The amount of debt to cover</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :    * @return True if receiving aTokens, false otherwise</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :    */</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :   function decodeLiquidationCallParams(</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :     bytes32 args1,</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :     bytes32 args2</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :   ) internal view returns (address, address, address, uint256, bool) {</span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           1 :     uint16 collateralAssetId;</span></span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">           1 :     uint16 debtAssetId;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">           1 :     address user;</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">           1 :     uint256 debtToCover;</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">           1 :     bool receiveAToken;</span></span>
 <span id="L211"><span class="lineNum">     211</span>                 :             : </span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :   /**</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :    * @notice Decodes compressed set user use reserve as collateral params to standard params</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :    * @param args The packed set user use reserve as collateral params</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :    * @return The address of the underlying reserve</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             :    * @return True if to set using as collateral, false otherwise</span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :    */</span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">           1 :   function decodeSetUserUseReserveAsCollateralParams(</span></span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :     bytes32 args</span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :   ) internal view returns (address, bool) {</span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">           2 :     uint16 assetId;</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">           2 :     bool useAsCollateral;</span></span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :     assembly {</span>
-<span id="L226"><span class="lineNum">     226</span>                 :<span class="tlaGNC">           2 :       assetId := and(args, 0xFFFF)</span></span>
-<span id="L227"><span class="lineNum">     227</span>                 :<span class="tlaGNC">           2 :       useAsCollateral := and(shr(16, args), 0x1)</span></span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :     }</span>
-<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">           2 :     return (reservesList[assetId], useAsCollateral);</span></span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :   }</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             : </span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :   /**</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :    * @notice Decodes compressed liquidation call params to standard params</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :    * @param args1 The first half of packed liquidation call params</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :    * @param args2 The second half of the packed liquidation call params</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :    * @return The address of the underlying collateral asset</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :    * @return The address of the underlying debt asset</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :    * @return The address of the user to liquidate</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :    * @return The amount of debt to cover</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :    * @return True if receiving aTokens, false otherwise</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :    */</span>
-<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">           1 :   function decodeLiquidationCallParams(</span></span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :     bytes32 args1,</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             :     bytes32 args2</span>
-<span id="L247"><span class="lineNum">     247</span>                 :             :   ) internal view returns (address, address, address, uint256, bool) {</span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">           2 :     uint16 collateralAssetId;</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">           2 :     uint16 debtAssetId;</span></span>
-<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">           2 :     address user;</span></span>
-<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">           2 :     uint256 debtToCover;</span></span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">           2 :     bool receiveAToken;</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :             : </span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :     assembly {</span>
-<span id="L255"><span class="lineNum">     255</span>                 :<span class="tlaGNC">           2 :       collateralAssetId := and(args1, 0xFFFF)</span></span>
-<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">           2 :       debtAssetId := and(shr(16, args1), 0xFFFF)</span></span>
-<span id="L257"><span class="lineNum">     257</span>                 :<span class="tlaGNC">           2 :       user := and(shr(32, args1), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L258"><span class="lineNum">     258</span>                 :             : </span>
-<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">           2 :       debtToCover := and(args2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
-<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">           2 :       receiveAToken := and(shr(128, args2), 0x1)</span></span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :     }</span>
-<span id="L262"><span class="lineNum">     262</span>                 :             : </span>
-<span id="L263"><span class="lineNum">     263</span>                 :<span class="tlaGNC">           2 :     if (debtToCover == type(uint128).max) {</span></span>
-<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">           2 :       debtToCover = type(uint256).max;</span></span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :     }</span>
-<span id="L266"><span class="lineNum">     266</span>                 :             : </span>
-<span id="L267"><span class="lineNum">     267</span>                 :<span class="tlaGNC">           2 :     return (</span></span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :       reservesList[collateralAssetId],</span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :       reservesList[debtAssetId],</span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :       user,</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :       debtToCover,</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :       receiveAToken</span>
-<span id="L273"><span class="lineNum">     273</span>                 :             :     );</span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :   }</span>
-<span id="L275"><span class="lineNum">     275</span>                 :             : }</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :     assembly {</span>
+<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">           1 :       collateralAssetId := and(args1, 0xFFFF)</span></span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">           1 :       debtAssetId := and(shr(16, args1), 0xFFFF)</span></span>
+<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">           1 :       user := and(shr(32, args1), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L216"><span class="lineNum">     216</span>                 :             : </span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">           1 :       debtToCover := and(args2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :<span class="tlaGNC">           1 :       receiveAToken := and(shr(128, args2), 0x1)</span></span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :     }</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             : </span>
+<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">           1 :     if (debtToCover == type(uint128).max) {</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">           1 :       debtToCover = type(uint256).max;</span></span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :     }</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             : </span>
+<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">           1 :     return (</span></span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :       reservesList[collateralAssetId],</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :       reservesList[debtAssetId],</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :       user,</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :       debtToCover,</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :       receiveAToken</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :     );</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :   }</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -351,8 +309,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html b/report/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html
similarity index 58%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html
rename to report/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html
index 18a1b637..f02cd1f0 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/ConfiguratorLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ConfiguratorLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (<a href="ConfiguratorLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (<a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">33</td>
-            <td class="headerCovTableEntry">33</td>
+            <td class="headerCovTableEntry">29</td>
+            <td class="headerCovTableEntry">29</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td></td>
@@ -53,63 +53,56 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ConfiguratorLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ConfiguratorLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L135">ConfiguratorLogic.executeUpdateAToken</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L121">ConfiguratorLogic.executeUpdateAToken</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L166">ConfiguratorLogic.executeUpdateStableDebtToken</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L152">ConfiguratorLogic.executeUpdateVariableDebtToken</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L204">ConfiguratorLogic.executeUpdateVariableDebtToken</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L210">ConfiguratorLogic._upgradeTokenImplementation</a></td>
               
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L262">ConfiguratorLogic._upgradeTokenImplementation</a></td>
-              
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L49">ConfiguratorLogic.executeInitReserve</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L46">ConfiguratorLogic.executeInitReserve</a></td>
               
-              <td class="coverFnHi">2882</td>
+              <td class="coverFnHi">167016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L242">ConfiguratorLogic._initTokenWithProxy</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L190">ConfiguratorLogic._initTokenWithProxy</a></td>
               
-              <td class="coverFnHi">8646</td>
+              <td class="coverFnHi">332032</td>
               
               
             </tr>
@@ -117,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func.html b/report/protocol/libraries/logic/ConfiguratorLogic.sol.func.html
similarity index 58%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func.html
rename to report/protocol/libraries/logic/ConfiguratorLogic.sol.func.html
index 7c2a5362..a049e220 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.func.html
+++ b/report/protocol/libraries/logic/ConfiguratorLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ConfiguratorLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (<a href="ConfiguratorLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (<a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">33</td>
-            <td class="headerCovTableEntry">33</td>
+            <td class="headerCovTableEntry">29</td>
+            <td class="headerCovTableEntry">29</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td></td>
@@ -53,61 +53,54 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ConfiguratorLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ConfiguratorLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L242">ConfiguratorLogic._initTokenWithProxy</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L190">ConfiguratorLogic._initTokenWithProxy</a></td>
               
-              <td class="coverFnHi">8646</td>
+              <td class="coverFnHi">332032</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L262">ConfiguratorLogic._upgradeTokenImplementation</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L210">ConfiguratorLogic._upgradeTokenImplementation</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L49">ConfiguratorLogic.executeInitReserve</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L46">ConfiguratorLogic.executeInitReserve</a></td>
               
-              <td class="coverFnHi">2882</td>
+              <td class="coverFnHi">167016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L135">ConfiguratorLogic.executeUpdateAToken</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L121">ConfiguratorLogic.executeUpdateAToken</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L166">ConfiguratorLogic.executeUpdateStableDebtToken</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L204">ConfiguratorLogic.executeUpdateVariableDebtToken</a></td>
+              <td class="coverFn"><a href="ConfiguratorLogic.sol.gcov.html#L152">ConfiguratorLogic.executeUpdateVariableDebtToken</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -117,8 +110,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html b/report/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html
similarity index 70%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html
rename to report/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html
index 4fdc41b6..631f7a40 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/ConfiguratorLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ConfiguratorLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (source / <a href="ConfiguratorLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ConfiguratorLogic.sol<span style="font-size: 80%;"> (source / <a href="ConfiguratorLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">33</td>
-            <td class="headerCovTableEntry">33</td>
+            <td class="headerCovTableEntry">29</td>
+            <td class="headerCovTableEntry">29</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -75,275 +75,223 @@
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {IPool} from '../../../interfaces/IPool.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {IInitializableAToken} from '../../../interfaces/IInitializableAToken.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {IInitializableDebtToken} from '../../../interfaces/IInitializableDebtToken.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {InitializableImmutableAdminUpgradeabilityProxy} from '../aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {InitializableImmutableAdminUpgradeabilityProxy} from '../../../misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {ConfiguratorInputTypes} from '../types/ConfiguratorInputTypes.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : </span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : /**</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             :  * @title ConfiguratorLogic library</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             :  * @author Aave</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :  * @notice Implements the functions to initialize reserves and update aTokens and debtTokens</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :  */</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             : library ConfiguratorLogic {</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : </span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :   // See `IPoolConfigurator` for descriptions</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :   event ReserveInitialized(</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :     address indexed asset,</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :     address indexed aToken,</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :     address stableDebtToken,</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :     address variableDebtToken,</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :     address interestRateStrategyAddress</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   );</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   event ATokenUpgraded(</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :     address indexed asset,</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     address indexed proxy,</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :     address indexed implementation</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   );</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :   event StableDebtTokenUpgraded(</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     address indexed asset,</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :     address indexed proxy,</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     address indexed implementation</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :   );</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :   event VariableDebtTokenUpgraded(</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :     address indexed asset,</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     address indexed proxy,</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :     address indexed implementation</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :   );</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             : </span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :   /**</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :    * @notice Initialize a reserve by creating and initializing aToken, stable debt token and variable debt token</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :    * @dev Emits the `ReserveInitialized` event</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :    * @param pool The Pool in which the reserve will be initialized</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :    * @param input The needed parameters for the initialization</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :    */</span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC tlaBgGNC">        2882 :   function executeInitReserve(</span></span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :     IPool pool,</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :     ConfiguratorInputTypes.InitReserveInput calldata input</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   ) public {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">        8646 :     address aTokenProxyAddress = _initTokenWithProxy(</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :       input.aTokenImpl,</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :       abi.encodeWithSelector(</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :         IInitializableAToken.initialize.selector,</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :         pool,</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :         input.treasury,</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :         input.underlyingAsset,</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :         input.incentivesController,</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :         input.underlyingAssetDecimals,</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :         input.aTokenName,</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :         input.aTokenSymbol,</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :         input.params</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :       )</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :     );</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             : </span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">        8646 :     address stableDebtTokenProxyAddress = _initTokenWithProxy(</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :       input.stableDebtTokenImpl,</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :       abi.encodeWithSelector(</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :         IInitializableDebtToken.initialize.selector,</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :         pool,</span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :         input.underlyingAsset,</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :         input.incentivesController,</span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :         input.underlyingAssetDecimals,</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :         input.stableDebtTokenName,</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :         input.stableDebtTokenSymbol,</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :         input.params</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :       )</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :     );</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        8646 :     address variableDebtTokenProxyAddress = _initTokenWithProxy(</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :       input.variableDebtTokenImpl,</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :       abi.encodeWithSelector(</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :         IInitializableDebtToken.initialize.selector,</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :         pool,</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :         input.underlyingAsset,</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :         input.incentivesController,</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :         input.underlyingAssetDecimals,</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :         input.variableDebtTokenName,</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :         input.variableDebtTokenSymbol,</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :         input.params</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :       )</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :     );</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             : </span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">        5764 :     pool.initReserve(</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :       input.underlyingAsset,</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :       aTokenProxyAddress,</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :       stableDebtTokenProxyAddress,</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :       variableDebtTokenProxyAddress,</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :       input.interestRateStrategyAddress</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :     );</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">        8643 :     DataTypes.ReserveConfigurationMap memory currentConfig = DataTypes.ReserveConfigurationMap(0);</span></span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {Errors} from '../helpers/Errors.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ConfiguratorInputTypes} from '../types/ConfiguratorInputTypes.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {IERC20Detailed} from '../../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : </span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @title ConfiguratorLogic library</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  * @author Aave</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  * @notice Implements the functions to initialize reserves and update aTokens and debtTokens</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             :  */</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             : library ConfiguratorLogic {</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             : </span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   // See `IPoolConfigurator` for descriptions</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   event ReserveInitialized(</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :     address indexed asset,</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             :     address indexed aToken,</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :     address stableDebtToken,</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :     address variableDebtToken,</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :     address interestRateStrategyAddress</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   );</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :   event ATokenUpgraded(</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :     address indexed asset,</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :     address indexed proxy,</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :     address indexed implementation</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   );</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :   event VariableDebtTokenUpgraded(</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :     address indexed asset,</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :     address indexed proxy,</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :     address indexed implementation</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :   );</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             : </span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   /**</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :    * @notice Initialize a reserve by creating and initializing aToken and variable debt token</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :    * @dev Emits the `ReserveInitialized` event</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :    * @param pool The Pool in which the reserve will be initialized</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :    * @param input The needed parameters for the initialization</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :    */</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   function executeInitReserve(</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :     IPool pool,</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :     ConfiguratorInputTypes.InitReserveInput calldata input</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :   ) external {</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :     // It is an assumption that the asset listed is non-malicious, and the external call doesn't create re-entrancies</span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC tlaBgGNC">      167016 :     uint8 underlyingAssetDecimals = IERC20Detailed(input.underlyingAsset).decimals();</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">      167016 :     require(underlyingAssetDecimals &gt; 5, Errors.INVALID_DECIMALS);</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">      166016 :     address aTokenProxyAddress = _initTokenWithProxy(</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :       input.aTokenImpl,</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :       abi.encodeWithSelector(</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :         IInitializableAToken.initialize.selector,</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :         pool,</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :         input.treasury,</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :         input.underlyingAsset,</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :         input.incentivesController,</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :         underlyingAssetDecimals,</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :         input.aTokenName,</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :         input.aTokenSymbol,</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :         input.params</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :       )</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :     );</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             : </span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">      166016 :     address variableDebtTokenProxyAddress = _initTokenWithProxy(</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :       input.variableDebtTokenImpl,</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :       abi.encodeWithSelector(</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :         IInitializableDebtToken.initialize.selector,</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :         pool,</span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :         input.underlyingAsset,</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :         input.incentivesController,</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :         underlyingAssetDecimals,</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :         input.variableDebtTokenName,</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :         input.variableDebtTokenSymbol,</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :         input.params</span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :       )</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :     );</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             : </span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">      166016 :     pool.initReserve(</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :       input.underlyingAsset,</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :       aTokenProxyAddress,</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :       variableDebtTokenProxyAddress,</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :       input.interestRateStrategyAddress</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :     );</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             : </span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">      165016 :     DataTypes.ReserveConfigurationMap memory currentConfig = DataTypes.ReserveConfigurationMap(0);</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :             : </span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">      165016 :     currentConfig.setDecimals(underlyingAssetDecimals);</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             : </span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">      165016 :     currentConfig.setActive(true);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">      165016 :     currentConfig.setPaused(false);</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">      165016 :     currentConfig.setFrozen(false);</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">      165016 :     currentConfig.setVirtualAccActive(input.useVirtualBalance);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             : </span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">      165016 :     pool.setConfiguration(input.underlyingAsset, currentConfig);</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             : </span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">      165016 :     IReserveInterestRateStrategy(input.interestRateStrategyAddress).setInterestRateParams(</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :       input.underlyingAsset,</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :       input.interestRateData</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :     );</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             : </span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">        5762 :     currentConfig.setDecimals(input.underlyingAssetDecimals);</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :             : </span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">        5762 :     currentConfig.setActive(true);</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">        5762 :     currentConfig.setPaused(false);</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">        5762 :     currentConfig.setFrozen(false);</span></span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">        5762 :     currentConfig.setVirtualAccActive(input.useVirtualBalance);</span></span>
-<span id="L114"><span class="lineNum">     114</span>                 :             : </span>
-<span id="L115"><span class="lineNum">     115</span>                 :<span class="tlaGNC">        5762 :     pool.setConfiguration(input.underlyingAsset, currentConfig);</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">      165016 :     emit ReserveInitialized(</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :       input.underlyingAsset,</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :       aTokenProxyAddress,</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :       address(0),</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :       variableDebtTokenProxyAddress,</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :       input.interestRateStrategyAddress</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :     );</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :   }</span>
 <span id="L116"><span class="lineNum">     116</span>                 :             : </span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">        5762 :     IReserveInterestRateStrategy(input.interestRateStrategyAddress).setInterestRateParams(</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :       input.underlyingAsset,</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :       input.interestRateData</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :     );</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             : </span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        5762 :     emit ReserveInitialized(</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :             :       input.underlyingAsset,</span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :       aTokenProxyAddress,</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             :       stableDebtTokenProxyAddress,</span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :       variableDebtTokenProxyAddress,</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :       input.interestRateStrategyAddress</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :     );</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :   }</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :   /**</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :    * @notice Updates the aToken implementation and initializes it</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :    * @dev Emits the `ATokenUpgraded` event</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :    * @param cachedPool The Pool containing the reserve with the aToken</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :    * @param input The parameters needed for the initialize call</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :    */</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   function executeUpdateAToken(</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :     IPool cachedPool,</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :     ConfiguratorInputTypes.UpdateATokenInput calldata input</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :   ) external {</span>
+<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">           1 :     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);</span></span>
+<span id="L128"><span class="lineNum">     128</span>                 :             : </span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">           1 :     (, , , uint256 decimals, ) = cachedPool.getConfiguration(input.asset).getParams();</span></span>
 <span id="L130"><span class="lineNum">     130</span>                 :             : </span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :   /**</span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :    * @notice Updates the aToken implementation and initializes it</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             :    * @dev Emits the `ATokenUpgraded` event</span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :    * @param cachedPool The Pool containing the reserve with the aToken</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :    * @param input The parameters needed for the initialize call</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :    */</span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">           1 :   function executeUpdateAToken(</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :     IPool cachedPool,</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :     ConfiguratorInputTypes.UpdateATokenInput calldata input</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   ) public {</span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           1 :     bytes memory encodedCall = abi.encodeWithSelector(</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :       IInitializableAToken.initialize.selector,</span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :       cachedPool,</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :       input.treasury,</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :       input.asset,</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :       input.incentivesController,</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :       decimals,</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :       input.name,</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :       input.symbol,</span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :       input.params</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :     );</span>
 <span id="L142"><span class="lineNum">     142</span>                 :             : </span>
-<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           3 :     (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           1 :     _upgradeTokenImplementation(reserveData.aTokenAddress, input.implementation, encodedCall);</span></span>
 <span id="L144"><span class="lineNum">     144</span>                 :             : </span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           3 :     bytes memory encodedCall = abi.encodeWithSelector(</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :       IInitializableAToken.initialize.selector,</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :       cachedPool,</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :       input.treasury,</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :       input.asset,</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :       input.incentivesController,</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :       decimals,</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :       input.name,</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :       input.symbol,</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :       input.params</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :     );</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             : </span>
-<span id="L157"><span class="lineNum">     157</span>                 :<span class="tlaGNC">           2 :     _upgradeTokenImplementation(reserveData.aTokenAddress, input.implementation, encodedCall);</span></span>
-<span id="L158"><span class="lineNum">     158</span>                 :             : </span>
-<span id="L159"><span class="lineNum">     159</span>                 :<span class="tlaGNC">           2 :     emit ATokenUpgraded(input.asset, reserveData.aTokenAddress, input.implementation);</span></span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :   }</span>
+<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           1 :     emit ATokenUpgraded(input.asset, reserveData.aTokenAddress, input.implementation);</span></span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :   }</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             : </span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :   /**</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :    * @notice Updates the variable debt token implementation and initializes it</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :    * @dev Emits the `VariableDebtTokenUpgraded` event</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :    * @param cachedPool The Pool containing the reserve with the variable debt token</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :    * @param input The parameters needed for the initialize call</span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :    */</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   function executeUpdateVariableDebtToken(</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :     IPool cachedPool,</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :   ) external {</span>
+<span id="L158"><span class="lineNum">     158</span>                 :<span class="tlaGNC">           1 :     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);</span></span>
+<span id="L159"><span class="lineNum">     159</span>                 :             : </span>
+<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">           1 :     (, , , uint256 decimals, ) = cachedPool.getConfiguration(input.asset).getParams();</span></span>
 <span id="L161"><span class="lineNum">     161</span>                 :             : </span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :   /**</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :    * @notice Updates the stable debt token implementation and initializes it</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :    * @dev Emits the `StableDebtTokenUpgraded` event</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :    * @param cachedPool The Pool containing the reserve with the stable debt token</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :    * @param input The parameters needed for the initialize call</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :    */</span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           1 :   function executeUpdateStableDebtToken(</span></span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :     IPool cachedPool,</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :   ) public {</span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);</span></span>
-<span id="L173"><span class="lineNum">     173</span>                 :             : </span>
-<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">           3 :     (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();</span></span>
-<span id="L175"><span class="lineNum">     175</span>                 :             : </span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">           3 :     bytes memory encodedCall = abi.encodeWithSelector(</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :       IInitializableDebtToken.initialize.selector,</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :       cachedPool,</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :       input.asset,</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :       input.incentivesController,</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :       decimals,</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :       input.name,</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :       input.symbol,</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :       input.params</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :     );</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             : </span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           2 :     _upgradeTokenImplementation(</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :             :       reserveData.stableDebtTokenAddress,</span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :       input.implementation,</span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :       encodedCall</span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :     );</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             : </span>
-<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">           2 :     emit StableDebtTokenUpgraded(</span></span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :       input.asset,</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :       reserveData.stableDebtTokenAddress,</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             :       input.implementation</span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :     );</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :   }</span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">           1 :     bytes memory encodedCall = abi.encodeWithSelector(</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :       IInitializableDebtToken.initialize.selector,</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :       cachedPool,</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :       input.asset,</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :       input.incentivesController,</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :       decimals,</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :       input.name,</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :       input.symbol,</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :       input.params</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :     );</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             : </span>
+<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">           1 :     _upgradeTokenImplementation(</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :       reserveData.variableDebtTokenAddress,</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :       input.implementation,</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :       encodedCall</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :     );</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             : </span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           1 :     emit VariableDebtTokenUpgraded(</span></span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :       input.asset,</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :       reserveData.variableDebtTokenAddress,</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :       input.implementation</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :     );</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :   }</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             : </span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :   /**</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :    * @notice Creates a new proxy and initializes the implementation</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :    * @param implementation The address of the implementation</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :    * @param initParams The parameters that is passed to the implementation to initialize</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :    * @return The address of initialized proxy</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :    */</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :   function _initTokenWithProxy(</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :     address implementation,</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :     bytes memory initParams</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :   ) internal returns (address) {</span>
+<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">      332032 :     InitializableImmutableAdminUpgradeabilityProxy proxy = new InitializableImmutableAdminUpgradeabilityProxy(</span></span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :         address(this)</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :       );</span>
 <span id="L199"><span class="lineNum">     199</span>                 :             : </span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :   /**</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :    * @notice Updates the variable debt token implementation and initializes it</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :    * @dev Emits the `VariableDebtTokenUpgraded` event</span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :    * @param cachedPool The Pool containing the reserve with the variable debt token</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :    * @param input The parameters needed for the initialize call</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :    */</span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           1 :   function executeUpdateVariableDebtToken(</span></span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :     IPool cachedPool,</span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
-<span id="L209"><span class="lineNum">     209</span>                 :             :   ) public {</span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">           3 :     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);</span></span>
-<span id="L211"><span class="lineNum">     211</span>                 :             : </span>
-<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC">           3 :     (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();</span></span>
-<span id="L213"><span class="lineNum">     213</span>                 :             : </span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">           3 :     bytes memory encodedCall = abi.encodeWithSelector(</span></span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :       IInitializableDebtToken.initialize.selector,</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :       cachedPool,</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             :       input.asset,</span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :       input.incentivesController,</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             :       decimals,</span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :       input.name,</span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :       input.symbol,</span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :       input.params</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :     );</span>
-<span id="L224"><span class="lineNum">     224</span>                 :             : </span>
-<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">           2 :     _upgradeTokenImplementation(</span></span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :       reserveData.variableDebtTokenAddress,</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             :       input.implementation,</span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :       encodedCall</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :     );</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             : </span>
-<span id="L231"><span class="lineNum">     231</span>                 :<span class="tlaGNC">           2 :     emit VariableDebtTokenUpgraded(</span></span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :       input.asset,</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :       reserveData.variableDebtTokenAddress,</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :       input.implementation</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :     );</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :   }</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             : </span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :   /**</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :    * @notice Creates a new proxy and initializes the implementation</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :    * @param implementation The address of the implementation</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :    * @param initParams The parameters that is passed to the implementation to initialize</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :    * @return The address of initialized proxy</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :    */</span>
-<span id="L244"><span class="lineNum">     244</span>                 :<span class="tlaGNC">        8646 :   function _initTokenWithProxy(</span></span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :     address implementation,</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             :     bytes memory initParams</span>
-<span id="L247"><span class="lineNum">     247</span>                 :             :   ) internal returns (address) {</span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">       25938 :     InitializableImmutableAdminUpgradeabilityProxy proxy = new InitializableImmutableAdminUpgradeabilityProxy(</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :             :         address(this)</span>
-<span id="L250"><span class="lineNum">     250</span>                 :             :       );</span>
-<span id="L251"><span class="lineNum">     251</span>                 :             : </span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">       17292 :     proxy.initialize(implementation, initParams);</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :             : </span>
-<span id="L254"><span class="lineNum">     254</span>                 :<span class="tlaGNC">       25938 :     return address(proxy);</span></span>
-<span id="L255"><span class="lineNum">     255</span>                 :             :   }</span>
-<span id="L256"><span class="lineNum">     256</span>                 :             : </span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :   /**</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :    * @notice Upgrades the implementation and makes call to the proxy</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :    * @dev The call is used to initialize the new implementation.</span>
-<span id="L260"><span class="lineNum">     260</span>                 :             :    * @param proxyAddress The address of the proxy</span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :    * @param implementation The address of the new implementation</span>
-<span id="L262"><span class="lineNum">     262</span>                 :             :    * @param  initParams The parameters to the call after the upgrade</span>
-<span id="L263"><span class="lineNum">     263</span>                 :             :    */</span>
-<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">           3 :   function _upgradeTokenImplementation(</span></span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :     address proxyAddress,</span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :     address implementation,</span>
-<span id="L267"><span class="lineNum">     267</span>                 :             :     bytes memory initParams</span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :   ) internal {</span>
-<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">           9 :     InitializableImmutableAdminUpgradeabilityProxy proxy = InitializableImmutableAdminUpgradeabilityProxy(</span></span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :         payable(proxyAddress)</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :       );</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             : </span>
-<span id="L273"><span class="lineNum">     273</span>                 :<span class="tlaGNC">           6 :     proxy.upgradeToAndCall(implementation, initParams);</span></span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :   }</span>
-<span id="L275"><span class="lineNum">     275</span>                 :             : }</span>
+<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">      332032 :     proxy.initialize(implementation, initParams);</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :             : </span>
+<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">      332032 :     return address(proxy);</span></span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :   }</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             : </span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :   /**</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :    * @notice Upgrades the implementation and makes call to the proxy</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :    * @dev The call is used to initialize the new implementation.</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :    * @param proxyAddress The address of the proxy</span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :    * @param implementation The address of the new implementation</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             :    * @param  initParams The parameters to the call after the upgrade</span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :    */</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :   function _upgradeTokenImplementation(</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :     address proxyAddress,</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :     address implementation,</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :     bytes memory initParams</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :   ) internal {</span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">           2 :     InitializableImmutableAdminUpgradeabilityProxy proxy = InitializableImmutableAdminUpgradeabilityProxy(</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :         payable(proxyAddress)</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :       );</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             : </span>
+<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">           2 :     proxy.upgradeToAndCall(implementation, initParams);</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :   }</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -351,8 +299,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func-c.html b/report/protocol/libraries/logic/EModeLogic.sol.func-c.html
similarity index 61%
rename from report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func-c.html
rename to report/protocol/libraries/logic/EModeLogic.sol.func-c.html
index a08c245a..b91e86f1 100644
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func-c.html
+++ b/report/protocol/libraries/logic/EModeLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/EModeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a> - Helpers.sol<span style="font-size: 80%;"> (<a href="Helpers.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (<a href="EModeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="Helpers.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EModeLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Helpers.sol.gcov.html#L17">Helpers.getUserCurrentDebt</a></td>
+              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L39">EModeLogic.executeSetUserEMode</a></td>
               
-              <td class="coverFnHi">16329</td>
+              <td class="coverFnHi">10023</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func.html b/report/protocol/libraries/logic/EModeLogic.sol.func.html
similarity index 61%
rename from report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func.html
rename to report/protocol/libraries/logic/EModeLogic.sol.func.html
index 19e5c2c8..da8b6f51 100644
--- a/report/core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol.func.html
+++ b/report/protocol/libraries/logic/EModeLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers/Helpers.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/EModeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/helpers/src/core/contracts/protocol/libraries/helpers</a> - Helpers.sol<span style="font-size: 80%;"> (<a href="Helpers.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (<a href="EModeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">1</td>
-            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="Helpers.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EModeLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Helpers.sol.gcov.html#L17">Helpers.getUserCurrentDebt</a></td>
+              <td class="coverFn"><a href="EModeLogic.sol.gcov.html#L39">EModeLogic.executeSetUserEMode</a></td>
               
-              <td class="coverFnHi">16329</td>
+              <td class="coverFnHi">10023</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.gcov.html b/report/protocol/libraries/logic/EModeLogic.sol.gcov.html
similarity index 58%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.gcov.html
rename to report/protocol/libraries/logic/EModeLogic.sol.gcov.html
index 384dd6a1..8a40b95b 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/EModeLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/EModeLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/EModeLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (source / <a href="EModeLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - EModeLogic.sol<span style="font-size: 80%;"> (source / <a href="EModeLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">1</td>
+            <td class="headerCovTableEntry">1</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -76,111 +76,71 @@
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../helpers/Errors.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {WadRayMath} from '../math/WadRayMath.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {PercentageMath} from '../math/PercentageMath.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : </span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : /**</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             :  * @title EModeLogic library</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             :  * @author Aave</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             :  * @notice Implements the base logic for all the actions related to the eMode</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :  */</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : library EModeLogic {</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :   using WadRayMath for uint256;</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :   using PercentageMath for uint256;</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             : </span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   // See `IPool` for descriptions</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   event UserEModeSet(address indexed user, uint8 categoryId);</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   /**</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :    * @notice Updates the user efficiency mode category</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :    * @dev Will revert if user is borrowing non-compatible asset or change will drop HF &lt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :    * @dev Emits the `UserEModeSet` event</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :    * @param usersEModeCategory The state of all users efficiency mode category</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :    * @param params The additional parameters needed to execute the setUserEMode function</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :    */</span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC tlaBgGNC">          17 :   function executeSetUserEMode(</span></span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :     mapping(address =&gt; uint8) storage usersEModeCategory,</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :     DataTypes.ExecuteSetUserEModeParams memory params</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :   ) external {</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">          34 :     ValidationLogic.validateSetUserEMode(</span></span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :       reservesData,</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :       reservesList,</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :       eModeCategories,</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :       userConfig,</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :       params.reservesCount,</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :       params.categoryId</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :     );</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             : </span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">          30 :     uint8 prevCategoryId = usersEModeCategory[msg.sender];</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">          30 :     usersEModeCategory[msg.sender] = params.categoryId;</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :             : </span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">          30 :     if (prevCategoryId != 0) {</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           8 :       ValidationLogic.validateHealthFactor(</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :         reservesData,</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :         reservesList,</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :         eModeCategories,</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :         userConfig,</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :         msg.sender,</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :         params.categoryId,</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :         params.reservesCount,</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :         params.oracle</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :       );</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     }</span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">          26 :     emit UserEModeSet(msg.sender, params.categoryId);</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :   }</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             : </span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   /**</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :    * @notice Gets the eMode configuration and calculates the eMode asset price if a custom oracle is configured</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :    * @dev The eMode asset price returned is 0 if no oracle is specified</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :    * @param category The user eMode category</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :    * @param oracle The price oracle</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :    * @return The eMode ltv</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :    * @return The eMode liquidation threshold</span>
-<span id="L84"><span class="lineNum">      84</span>                 :             :    * @return The eMode asset price</span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :    */</span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">          10 :   function getEModeConfiguration(</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :     DataTypes.EModeCategory storage category,</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :     IPriceOracleGetter oracle</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :   ) internal view returns (uint256, uint256, uint256) {</span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">          20 :     uint256 eModeAssetPrice = 0;</span></span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">          20 :     address eModePriceSource = category.priceSource;</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :             : </span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">          30 :     if (eModePriceSource != address(0)) {</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           6 :       eModeAssetPrice = oracle.getAssetPrice(eModePriceSource);</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :     }</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             : </span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">          20 :     return (category.ltv, category.liquidationThreshold, eModeAssetPrice);</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :   /**</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :    * @notice Checks if eMode is active for a user and if yes, if the asset belongs to the eMode category chosen</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :    * @param eModeUserCategory The user eMode category</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :    * @param eModeAssetCategory The asset eMode category</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :    * @return True if eMode is active and the asset belongs to the eMode category chosen by the user, false otherwise</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             :    */</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">       25421 :   function isInEModeCategory(</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :     uint256 eModeUserCategory,</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :     uint256 eModeAssetCategory</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   ) internal pure returns (bool) {</span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">       50842 :     return (eModeUserCategory != 0 &amp;&amp; eModeAssetCategory == eModeUserCategory);</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :   }</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             : }</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {WadRayMath} from '../math/WadRayMath.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {PercentageMath} from '../math/PercentageMath.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : </span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : /**</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             :  * @title EModeLogic library</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             :  * @author Aave</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :  * @notice Implements the base logic for all the actions related to the eMode</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             :  */</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             : library EModeLogic {</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
+<span id="L21"><span class="lineNum">      21</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :   using WadRayMath for uint256;</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   using PercentageMath for uint256;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : </span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   // See `IPool` for descriptions</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   event UserEModeSet(address indexed user, uint8 categoryId);</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             : </span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   /**</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :    * @notice Updates the user efficiency mode category</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :    * @dev Will revert if user is borrowing non-compatible asset or change will drop HF &lt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :    * @dev Emits the `UserEModeSet` event</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :    * @param usersEModeCategory The state of all users efficiency mode category</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :    * @param params The additional parameters needed to execute the setUserEMode function</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :    */</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :   function executeSetUserEMode(</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :     mapping(address =&gt; uint8) storage usersEModeCategory,</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :     DataTypes.ExecuteSetUserEModeParams memory params</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   ) external {</span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC tlaBgGNC">       10023 :     if (usersEModeCategory[msg.sender] == params.categoryId) return;</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :             : </span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">        9617 :     ValidationLogic.validateSetUserEMode(</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :       eModeCategories,</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :       userConfig,</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :       params.reservesCount,</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :       params.categoryId</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :     );</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             : </span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">        8614 :     usersEModeCategory[msg.sender] = params.categoryId;</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :             : </span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">        8614 :     ValidationLogic.validateHealthFactor(</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :       reservesData,</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :       reservesList,</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :       eModeCategories,</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :       userConfig,</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :       msg.sender,</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :       params.categoryId,</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :       params.reservesCount,</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :       params.oracle</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :     );</span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">        7612 :     emit UserEModeSet(msg.sender, params.categoryId);</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   }</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -188,8 +148,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html b/report/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html
rename to report/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html
index 0c15f6b5..7b2a86e7 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/FlashLoanLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/FlashLoanLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (<a href="FlashLoanLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (<a href="FlashLoanLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,42 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="FlashLoanLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="FlashLoanLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L238">FlashLoanLogic._handleFlashLoanRepayment</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L231">FlashLoanLogic._handleFlashLoanRepayment</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L69">FlashLoanLogic.executeFlashLoan</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L182">FlashLoanLogic.executeFlashLoanSimple</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L189">FlashLoanLogic.executeFlashLoanSimple</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L67">FlashLoanLogic.executeFlashLoan</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
@@ -96,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func.html b/report/protocol/libraries/logic/FlashLoanLogic.sol.func.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func.html
rename to report/protocol/libraries/logic/FlashLoanLogic.sol.func.html
index 109511c1..8a6facb9 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.func.html
+++ b/report/protocol/libraries/logic/FlashLoanLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/FlashLoanLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (<a href="FlashLoanLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (<a href="FlashLoanLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,42 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="FlashLoanLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="FlashLoanLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L238">FlashLoanLogic._handleFlashLoanRepayment</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L231">FlashLoanLogic._handleFlashLoanRepayment</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L69">FlashLoanLogic.executeFlashLoan</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L67">FlashLoanLogic.executeFlashLoan</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L189">FlashLoanLogic.executeFlashLoanSimple</a></td>
+              <td class="coverFn"><a href="FlashLoanLogic.sol.gcov.html#L182">FlashLoanLogic.executeFlashLoanSimple</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
@@ -96,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html b/report/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html
similarity index 86%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html
rename to report/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html
index e1f8cbf5..fe13e711 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/FlashLoanLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/FlashLoanLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (source / <a href="FlashLoanLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - FlashLoanLogic.sol<span style="font-size: 80%;"> (source / <a href="FlashLoanLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -77,282 +77,275 @@
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {IPool} from '../../../interfaces/IPool.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IFlashLoanReceiver} from '../../../flashloan/interfaces/IFlashLoanReceiver.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {IFlashLoanSimpleReceiver} from '../../../flashloan/interfaces/IFlashLoanSimpleReceiver.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IFlashLoanReceiver} from '../../../misc/flashloan/interfaces/IFlashLoanReceiver.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {IFlashLoanSimpleReceiver} from '../../../misc/flashloan/interfaces/IFlashLoanSimpleReceiver.sol';</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {Errors} from '../helpers/Errors.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : import {WadRayMath} from '../math/WadRayMath.sol';</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : import {PercentageMath} from '../math/PercentageMath.sol';</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             : import {BorrowLogic} from './BorrowLogic.sol';</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             : </span>
-<span id="L22"><span class="lineNum">      22</span>                 :             : /**</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :  * @title FlashLoanLogic library</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :  * @author Aave</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :  * @notice Implements the logic for the flash loans</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :  */</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             : library FlashLoanLogic {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :   using WadRayMath for uint256;</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   using PercentageMath for uint256;</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :   using SafeCast for uint256;</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :   // See `IPool` for descriptions</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :   event FlashLoan(</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :     address indexed target,</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :     address initiator,</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :     address indexed asset,</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     uint256 amount,</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :     uint256 premium,</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     uint16 indexed referralCode</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :   );</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             : </span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   // Helper struct for internal variables used in the `executeFlashLoan` function</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :   struct FlashLoanLocalVars {</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     IFlashLoanReceiver receiver;</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :     uint256 i;</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :     address currentAsset;</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :     uint256 currentAmount;</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :     uint256[] totalPremiums;</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :     uint256 flashloanPremiumTotal;</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :     uint256 flashloanPremiumToProtocol;</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :   }</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             : </span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :   /**</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :    * @notice Implements the flashloan feature that allow users to access liquidity of the pool for one transaction</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :    * as long as the amount taken plus fee is returned or debt is opened.</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :    * @dev For authorized flashborrowers the fee is waived</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :    * @dev At the end of the transaction the pool will pull amount borrowed + fee from the receiver,</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :    * if the receiver have not approved the pool the transaction will revert.</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :    * @dev Emits the `FlashLoan()` event</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :    * @param params The additional parameters needed to execute the flashloan function</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :    */</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC tlaBgGNC">          10 :   function executeFlashLoan(</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :     DataTypes.FlashloanParams memory params</span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   ) external {</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :     // The usual action flow (cache -&gt; updateState -&gt; validation -&gt; changeState -&gt; updateRates)</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :     // is altered to (validation -&gt; user payload -&gt; cache -&gt; updateState -&gt; changeState -&gt; updateRates) for flashloans.</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :     // This is done to protect against reentrance and rate manipulation within the user specified payload.</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {Errors} from '../helpers/Errors.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {WadRayMath} from '../math/WadRayMath.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : import {PercentageMath} from '../math/PercentageMath.sol';</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : import {DataTypes} from '../types/DataTypes.sol';</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             : import {BorrowLogic} from './BorrowLogic.sol';</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             : </span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : /**</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :  * @title FlashLoanLogic library</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :  * @author Aave</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :  * @notice Implements the logic for the flash loans</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :  */</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : library FlashLoanLogic {</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :   using WadRayMath for uint256;</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   using PercentageMath for uint256;</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :   using SafeCast for uint256;</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             : </span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   // See `IPool` for descriptions</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :   event FlashLoan(</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :     address indexed target,</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :     address initiator,</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :     address indexed asset,</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :     uint256 amount,</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :     uint256 premium,</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :     uint16 indexed referralCode</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   );</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             : </span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   // Helper struct for internal variables used in the `executeFlashLoan` function</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   struct FlashLoanLocalVars {</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :     IFlashLoanReceiver receiver;</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :     address currentAsset;</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :     uint256 currentAmount;</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :     uint256[] totalPremiums;</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :     uint256 flashloanPremiumTotal;</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :     uint256 flashloanPremiumToProtocol;</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   }</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   /**</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :    * @notice Implements the flashloan feature that allow users to access liquidity of the pool for one transaction</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :    * as long as the amount taken plus fee is returned or debt is opened.</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :    * @dev For authorized flashborrowers the fee is waived</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :    * @dev At the end of the transaction the pool will pull amount borrowed + fee from the receiver,</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :    * if the receiver have not approved the pool the transaction will revert.</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :    * @dev Emits the `FlashLoan()` event</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :    * @param params The additional parameters needed to execute the flashloan function</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :    */</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :   function executeFlashLoan(</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :     DataTypes.FlashloanParams memory params</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :   ) external {</span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :     // The usual action flow (cache -&gt; updateState -&gt; validation -&gt; changeState -&gt; updateRates)</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :     // is altered to (validation -&gt; user payload -&gt; cache -&gt; updateState -&gt; changeState -&gt; updateRates) for flashloans.</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :     // This is done to protect against reentrance and rate manipulation within the user specified payload.</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             : </span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC tlaBgGNC">        1011 :     ValidationLogic.validateFlashloan(reservesData, params.assets, params.amounts);</span></span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          20 :     ValidationLogic.validateFlashloan(reservesData, params.assets, params.amounts);</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">           7 :     FlashLoanLocalVars memory vars;</span></span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">          12 :     FlashLoanLocalVars memory vars;</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           7 :     vars.totalPremiums = new uint256[](params.assets.length);</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : </span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">          12 :     vars.totalPremiums = new uint256[](params.assets.length);</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :             : </span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          12 :     vars.receiver = IFlashLoanReceiver(params.receiverAddress);</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">          12 :     (vars.flashloanPremiumTotal, vars.flashloanPremiumToProtocol) = params.isAuthorizedFlashBorrower</span></span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :       ? (0, 0)</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :       : (params.flashLoanPremiumTotal, params.flashLoanPremiumToProtocol);</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             : </span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">          32 :     for (vars.i = 0; vars.i &lt; params.assets.length; vars.i++) {</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">          14 :       vars.currentAmount = params.amounts[vars.i];</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">          14 :       vars.totalPremiums[vars.i] = DataTypes.InterestRateMode(params.interestRateModes[vars.i]) ==</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :         DataTypes.InterestRateMode.NONE</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :         ? vars.currentAmount.percentMul(vars.flashloanPremiumTotal)</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :         : 0;</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">          14 :       if (reservesData[params.assets[vars.i]].configuration.getIsVirtualAccActive()) {</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">          14 :         reservesData[params.assets[vars.i]].virtualUnderlyingBalance -= vars</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :           .currentAmount</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :           .toUint128();</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :       }</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          14 :       IAToken(reservesData[params.assets[vars.i]].aTokenAddress).transferUnderlyingTo(</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :         params.receiverAddress,</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :         vars.currentAmount</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :       );</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             :     }</span>
-<span id="L111"><span class="lineNum">     111</span>                 :             : </span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">          12 :     require(</span></span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :       vars.receiver.executeOperation(</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :         params.assets,</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :         params.amounts,</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :         vars.totalPremiums,</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :         msg.sender,</span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :         params.params</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :       ),</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :       Errors.INVALID_FLASHLOAN_EXECUTOR_RETURN</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :     );</span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">           7 :     vars.receiver = IFlashLoanReceiver(params.receiverAddress);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">           7 :     (vars.flashloanPremiumTotal, vars.flashloanPremiumToProtocol) = params.isAuthorizedFlashBorrower</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :       ? (0, 0)</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :       : (params.flashLoanPremiumTotal, params.flashLoanPremiumToProtocol);</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             : </span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">           7 :     for (uint256 i = 0; i &lt; params.assets.length; i++) {</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">           8 :       vars.currentAmount = params.amounts[i];</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">           8 :       vars.totalPremiums[i] = DataTypes.InterestRateMode(params.interestRateModes[i]) ==</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :         DataTypes.InterestRateMode.NONE</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :         ? vars.currentAmount.percentMul(vars.flashloanPremiumTotal)</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :         : 0;</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             : </span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           8 :       if (reservesData[params.assets[i]].configuration.getIsVirtualAccActive()) {</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">           8 :         reservesData[params.assets[i]].virtualUnderlyingBalance -= vars.currentAmount.toUint128();</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :       }</span>
+<span id="L101"><span class="lineNum">     101</span>                 :             : </span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           8 :       IAToken(reservesData[params.assets[i]].aTokenAddress).transferUnderlyingTo(</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :         params.receiverAddress,</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :         vars.currentAmount</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :       );</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :     }</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             : </span>
+<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           7 :     require(</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :       vars.receiver.executeOperation(</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :         params.assets,</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :         params.amounts,</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :         vars.totalPremiums,</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :         msg.sender,</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :         params.params</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :       ),</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :       Errors.INVALID_FLASHLOAN_EXECUTOR_RETURN</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :     );</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             : </span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">           4 :     for (uint256 i = 0; i &lt; params.assets.length; i++) {</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">           5 :       vars.currentAsset = params.assets[i];</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           5 :       vars.currentAmount = params.amounts[i];</span></span>
 <span id="L122"><span class="lineNum">     122</span>                 :             : </span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">          17 :     for (vars.i = 0; vars.i &lt; params.assets.length; vars.i++) {</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">           8 :       vars.currentAsset = params.assets[vars.i];</span></span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           8 :       vars.currentAmount = params.amounts[vars.i];</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :             : </span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :       if (</span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">          12 :         DataTypes.InterestRateMode(params.interestRateModes[vars.i]) ==</span></span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :         DataTypes.InterestRateMode.NONE</span>
-<span id="L130"><span class="lineNum">     130</span>                 :             :       ) {</span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">           6 :         _handleFlashLoanRepayment(</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :           reservesData[vars.currentAsset],</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             :           DataTypes.FlashLoanRepaymentParams({</span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :             asset: vars.currentAsset,</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :             receiverAddress: params.receiverAddress,</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :             amount: vars.currentAmount,</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :             totalPremium: vars.totalPremiums[vars.i],</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :             flashLoanPremiumToProtocol: vars.flashloanPremiumToProtocol,</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :             referralCode: params.referralCode</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :           })</span>
-<span id="L141"><span class="lineNum">     141</span>                 :             :         );</span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :       } else {</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :         // If the user chose to not return the funds, the system checks if there is enough collateral and</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :         // eventually opens a debt position</span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           2 :         BorrowLogic.executeBorrow(</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :           reservesData,</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :           reservesList,</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :           eModeCategories,</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :           userConfig,</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :           DataTypes.ExecuteBorrowParams({</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :             asset: vars.currentAsset,</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :             user: msg.sender,</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :             onBehalfOf: params.onBehalfOf,</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :             amount: vars.currentAmount,</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :             interestRateMode: DataTypes.InterestRateMode(params.interestRateModes[vars.i]),</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :             referralCode: params.referralCode,</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :             releaseUnderlying: false,</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :             maxStableRateBorrowSizePercent: IPool(params.pool)</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :               .MAX_STABLE_RATE_BORROW_SIZE_PERCENT(),</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :             reservesCount: IPool(params.pool).getReservesCount(),</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :             oracle: IPoolAddressesProvider(params.addressesProvider).getPriceOracle(),</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :             userEModeCategory: IPool(params.pool).getUserEMode(params.onBehalfOf).toUint8(),</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :             priceOracleSentinel: IPoolAddressesProvider(params.addressesProvider)</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :               .getPriceOracleSentinel()</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :           })</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :         );</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :         // no premium is paid when taking on the flashloan as debt</span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           2 :         emit FlashLoan(</span></span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :           params.receiverAddress,</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :           msg.sender,</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :           vars.currentAsset,</span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :           vars.currentAmount,</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :           DataTypes.InterestRateMode(params.interestRateModes[vars.i]),</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :           0,</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :           params.referralCode</span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :         );</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :       }</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :     }</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :   }</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             : </span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :   /**</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :    * @notice Implements the simple flashloan feature that allow users to access liquidity of ONE reserve for one</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :    * transaction as long as the amount taken plus fee is returned.</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :    * @dev Does not waive fee for approved flashborrowers nor allow taking on debt instead of repaying to save gas</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :    * @dev At the end of the transaction the pool will pull amount borrowed + fee from the receiver,</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :    * if the receiver have not approved the pool the transaction will revert.</span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :    * @dev Emits the `FlashLoan()` event</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             :    * @param reserve The state of the flashloaned reserve</span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :    * @param params The additional parameters needed to execute the simple flashloan function</span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :    */</span>
-<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">          10 :   function executeFlashLoanSimple(</span></span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :     DataTypes.FlashloanSimpleParams memory params</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :   ) external {</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :     // The usual action flow (cache -&gt; updateState -&gt; validation -&gt; changeState -&gt; updateRates)</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             :     // is altered to (validation -&gt; user payload -&gt; cache -&gt; updateState -&gt; changeState -&gt; updateRates) for flashloans.</span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :     // This is done to protect against reentrance and rate manipulation within the user specified payload.</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             : </span>
-<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">          20 :     ValidationLogic.validateFlashloanSimple(reserve, params.amount);</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :       if (</span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">           5 :         DataTypes.InterestRateMode(params.interestRateModes[i]) == DataTypes.InterestRateMode.NONE</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :       ) {</span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">           3 :         _handleFlashLoanRepayment(</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :           reservesData[vars.currentAsset],</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :           DataTypes.FlashLoanRepaymentParams({</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :             asset: vars.currentAsset,</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :             receiverAddress: params.receiverAddress,</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :             amount: vars.currentAmount,</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :             totalPremium: vars.totalPremiums[i],</span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :             flashLoanPremiumToProtocol: vars.flashloanPremiumToProtocol,</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :             referralCode: params.referralCode</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :           })</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :         );</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :       } else {</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :         // If the user chose to not return the funds, the system checks if there is enough collateral and</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :         // eventually opens a debt position</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           2 :         BorrowLogic.executeBorrow(</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :           reservesData,</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :           reservesList,</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :           eModeCategories,</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :           userConfig,</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :           DataTypes.ExecuteBorrowParams({</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :             asset: vars.currentAsset,</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :             user: msg.sender,</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :             onBehalfOf: params.onBehalfOf,</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :             amount: vars.currentAmount,</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :             interestRateMode: DataTypes.InterestRateMode(params.interestRateModes[i]),</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :             referralCode: params.referralCode,</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :             releaseUnderlying: false,</span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :             reservesCount: IPool(params.pool).getReservesCount(),</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :             oracle: IPoolAddressesProvider(params.addressesProvider).getPriceOracle(),</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :             userEModeCategory: IPool(params.pool).getUserEMode(params.onBehalfOf).toUint8(),</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :             priceOracleSentinel: IPoolAddressesProvider(params.addressesProvider)</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :               .getPriceOracleSentinel()</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :           })</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :         );</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :         // no premium is paid when taking on the flashloan as debt</span>
+<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">           1 :         emit FlashLoan(</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :           params.receiverAddress,</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :           msg.sender,</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :           vars.currentAsset,</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :           vars.currentAmount,</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :           DataTypes.InterestRateMode(params.interestRateModes[i]),</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :           0,</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :           params.referralCode</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :         );</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :       }</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :     }</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :   }</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             : </span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :   /**</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :    * @notice Implements the simple flashloan feature that allow users to access liquidity of ONE reserve for one</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :    * transaction as long as the amount taken plus fee is returned.</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :    * @dev Does not waive fee for approved flashborrowers nor allow taking on debt instead of repaying to save gas</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :    * @dev At the end of the transaction the pool will pull amount borrowed + fee from the receiver,</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :    * if the receiver have not approved the pool the transaction will revert.</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :    * @dev Emits the `FlashLoan()` event</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :    * @param reserve The state of the flashloaned reserve</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :    * @param params The additional parameters needed to execute the simple flashloan function</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :    */</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :   function executeFlashLoanSimple(</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :     DataTypes.FlashloanSimpleParams memory params</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :   ) external {</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :     // The usual action flow (cache -&gt; updateState -&gt; validation -&gt; changeState -&gt; updateRates)</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :     // is altered to (validation -&gt; user payload -&gt; cache -&gt; updateState -&gt; changeState -&gt; updateRates) for flashloans.</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :     // This is done to protect against reentrance and rate manipulation within the user specified payload.</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             : </span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">          11 :     ValidationLogic.validateFlashloanSimple(reserve, params.amount);</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :             : </span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">          10 :     IFlashLoanSimpleReceiver receiver = IFlashLoanSimpleReceiver(params.receiverAddress);</span></span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">          10 :     uint256 totalPremium = params.amount.percentMul(params.flashLoanPremiumTotal);</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             : </span>
+<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">          10 :     if (reserve.configuration.getIsVirtualAccActive()) {</span></span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">          10 :       reserve.virtualUnderlyingBalance -= params.amount.toUint128();</span></span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :     }</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             : </span>
-<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">          27 :     IFlashLoanSimpleReceiver receiver = IFlashLoanSimpleReceiver(params.receiverAddress);</span></span>
-<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">          27 :     uint256 totalPremium = params.amount.percentMul(params.flashLoanPremiumTotal);</span></span>
-<span id="L203"><span class="lineNum">     203</span>                 :             : </span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">          18 :     if (reserve.configuration.getIsVirtualAccActive()) {</span></span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">          18 :       reserve.virtualUnderlyingBalance -= params.amount.toUint128();</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :     }</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             : </span>
-<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">          18 :     IAToken(reserve.aTokenAddress).transferUnderlyingTo(params.receiverAddress, params.amount);</span></span>
-<span id="L209"><span class="lineNum">     209</span>                 :             : </span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">          18 :     require(</span></span>
-<span id="L211"><span class="lineNum">     211</span>                 :             :       receiver.executeOperation(</span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :         params.asset,</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :         params.amount,</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :         totalPremium,</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :         msg.sender,</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :         params.params</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             :       ),</span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :       Errors.INVALID_FLASHLOAN_EXECUTOR_RETURN</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             :     );</span>
-<span id="L220"><span class="lineNum">     220</span>                 :             : </span>
-<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">          12 :     _handleFlashLoanRepayment(</span></span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :       reserve,</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :       DataTypes.FlashLoanRepaymentParams({</span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :         asset: params.asset,</span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :         receiverAddress: params.receiverAddress,</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :         amount: params.amount,</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             :         totalPremium: totalPremium,</span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :         flashLoanPremiumToProtocol: params.flashLoanPremiumToProtocol,</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :         referralCode: params.referralCode</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :       })</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :     );</span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :   }</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             : </span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :   /**</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :    * @notice Handles repayment of flashloaned assets + premium</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :    * @dev Will pull the amount + premium from the receiver, so must have approved pool</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :    * @param reserve The state of the flashloaned reserve</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :    * @param params The additional parameters needed to execute the repayment function</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :    */</span>
-<span id="L240"><span class="lineNum">     240</span>                 :<span class="tlaGNC">           9 :   function _handleFlashLoanRepayment(</span></span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :     DataTypes.FlashLoanRepaymentParams memory params</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :   ) internal {</span>
-<span id="L244"><span class="lineNum">     244</span>                 :<span class="tlaGNC">          27 :     uint256 premiumToProtocol = params.totalPremium.percentMul(params.flashLoanPremiumToProtocol);</span></span>
-<span id="L245"><span class="lineNum">     245</span>                 :<span class="tlaGNC">          27 :     uint256 premiumToLP = params.totalPremium - premiumToProtocol;</span></span>
-<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">          27 :     uint256 amountPlusPremium = params.amount + params.totalPremium;</span></span>
-<span id="L247"><span class="lineNum">     247</span>                 :             : </span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">          27 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">          18 :     reserve.updateState(reserveCache);</span></span>
-<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">          18 :     reserveCache.nextLiquidityIndex = reserve.cumulateToLiquidityIndex(</span></span>
-<span id="L251"><span class="lineNum">     251</span>                 :             :       IERC20(reserveCache.aTokenAddress).totalSupply() +</span>
-<span id="L252"><span class="lineNum">     252</span>                 :             :         uint256(reserve.accruedToTreasury).rayMul(reserveCache.nextLiquidityIndex),</span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :       premiumToLP</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :     );</span>
-<span id="L255"><span class="lineNum">     255</span>                 :             : </span>
-<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">          18 :     reserve.accruedToTreasury += premiumToProtocol</span></span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :       .rayDiv(reserveCache.nextLiquidityIndex)</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :       .toUint128();</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             : </span>
-<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">          18 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, amountPlusPremium, 0);</span></span>
-<span id="L261"><span class="lineNum">     261</span>                 :             : </span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">          18 :     IERC20(params.asset).safeTransferFrom(</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">          10 :     IAToken(reserve.aTokenAddress).transferUnderlyingTo(params.receiverAddress, params.amount);</span></span>
+<span id="L202"><span class="lineNum">     202</span>                 :             : </span>
+<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">          10 :     require(</span></span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :       receiver.executeOperation(</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :         params.asset,</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :         params.amount,</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :         totalPremium,</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :         msg.sender,</span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :         params.params</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             :       ),</span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :       Errors.INVALID_FLASHLOAN_EXECUTOR_RETURN</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :     );</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             : </span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">           6 :     _handleFlashLoanRepayment(</span></span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :       reserve,</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :       DataTypes.FlashLoanRepaymentParams({</span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :         asset: params.asset,</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :         receiverAddress: params.receiverAddress,</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :         amount: params.amount,</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :         totalPremium: totalPremium,</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :         flashLoanPremiumToProtocol: params.flashLoanPremiumToProtocol,</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :         referralCode: params.referralCode</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :       })</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :     );</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :   }</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             : </span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :   /**</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :    * @notice Handles repayment of flashloaned assets + premium</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :    * @dev Will pull the amount + premium from the receiver, so must have approved pool</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :    * @param reserve The state of the flashloaned reserve</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :    * @param params The additional parameters needed to execute the repayment function</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :    */</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :   function _handleFlashLoanRepayment(</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :     DataTypes.FlashLoanRepaymentParams memory params</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :   ) internal {</span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           9 :     uint256 premiumToProtocol = params.totalPremium.percentMul(params.flashLoanPremiumToProtocol);</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">           9 :     uint256 premiumToLP = params.totalPremium - premiumToProtocol;</span></span>
+<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">           9 :     uint256 amountPlusPremium = params.amount + params.totalPremium;</span></span>
+<span id="L240"><span class="lineNum">     240</span>                 :             : </span>
+<span id="L241"><span class="lineNum">     241</span>                 :<span class="tlaGNC">           9 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">           9 :     reserve.updateState(reserveCache);</span></span>
+<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">           9 :     reserveCache.nextLiquidityIndex = reserve.cumulateToLiquidityIndex(</span></span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :       IERC20(reserveCache.aTokenAddress).totalSupply() +</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :         uint256(reserve.accruedToTreasury).rayMul(reserveCache.nextLiquidityIndex),</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             :       premiumToLP</span>
+<span id="L247"><span class="lineNum">     247</span>                 :             :     );</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             : </span>
+<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">           9 :     reserve.accruedToTreasury += premiumToProtocol</span></span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :       .rayDiv(reserveCache.nextLiquidityIndex)</span>
+<span id="L251"><span class="lineNum">     251</span>                 :             :       .toUint128();</span>
+<span id="L252"><span class="lineNum">     252</span>                 :             : </span>
+<span id="L253"><span class="lineNum">     253</span>                 :<span class="tlaGNC">           9 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, amountPlusPremium, 0);</span></span>
+<span id="L254"><span class="lineNum">     254</span>                 :             : </span>
+<span id="L255"><span class="lineNum">     255</span>                 :<span class="tlaGNC">           9 :     IERC20(params.asset).safeTransferFrom(</span></span>
+<span id="L256"><span class="lineNum">     256</span>                 :             :       params.receiverAddress,</span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :       reserveCache.aTokenAddress,</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             :       amountPlusPremium</span>
+<span id="L259"><span class="lineNum">     259</span>                 :             :     );</span>
+<span id="L260"><span class="lineNum">     260</span>                 :             : </span>
+<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">           9 :     IAToken(reserveCache.aTokenAddress).handleRepayment(</span></span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :       params.receiverAddress,</span>
 <span id="L263"><span class="lineNum">     263</span>                 :             :       params.receiverAddress,</span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :       reserveCache.aTokenAddress,</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :       amountPlusPremium</span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :     );</span>
-<span id="L267"><span class="lineNum">     267</span>                 :             : </span>
-<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">          18 :     IAToken(reserveCache.aTokenAddress).handleRepayment(</span></span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :       params.receiverAddress,</span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :       params.receiverAddress,</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :       amountPlusPremium</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :     );</span>
-<span id="L273"><span class="lineNum">     273</span>                 :             : </span>
-<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">          18 :     emit FlashLoan(</span></span>
-<span id="L275"><span class="lineNum">     275</span>                 :             :       params.receiverAddress,</span>
-<span id="L276"><span class="lineNum">     276</span>                 :             :       msg.sender,</span>
-<span id="L277"><span class="lineNum">     277</span>                 :             :       params.asset,</span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :       params.amount,</span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :       DataTypes.InterestRateMode(0),</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :       params.totalPremium,</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             :       params.referralCode</span>
-<span id="L282"><span class="lineNum">     282</span>                 :             :     );</span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :   }</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             : }</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :       amountPlusPremium</span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :     );</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             : </span>
+<span id="L267"><span class="lineNum">     267</span>                 :<span class="tlaGNC">           9 :     emit FlashLoan(</span></span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :       params.receiverAddress,</span>
+<span id="L269"><span class="lineNum">     269</span>                 :             :       msg.sender,</span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :       params.asset,</span>
+<span id="L271"><span class="lineNum">     271</span>                 :             :       params.amount,</span>
+<span id="L272"><span class="lineNum">     272</span>                 :             :       DataTypes.InterestRateMode.NONE,</span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :       params.totalPremium,</span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :       params.referralCode</span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :     );</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :   }</span>
+<span id="L277"><span class="lineNum">     277</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -360,8 +353,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html b/report/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html
similarity index 65%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html
rename to report/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html
index c37d4afa..529e0686 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/IsolationModeLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/IsolationModeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (<a href="IsolationModeLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (<a href="IsolationModeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="IsolationModeLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="IsolationModeLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="IsolationModeLogic.sol.gcov.html#L28">IsolationModeLogic.updateIsolatedDebtIfIsolated</a></td>
               
-              <td class="coverFnHi">11036</td>
+              <td class="coverFnHi">13035</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func.html b/report/protocol/libraries/logic/IsolationModeLogic.sol.func.html
similarity index 65%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func.html
rename to report/protocol/libraries/logic/IsolationModeLogic.sol.func.html
index b92f61c3..0568d3b2 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.func.html
+++ b/report/protocol/libraries/logic/IsolationModeLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/IsolationModeLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (<a href="IsolationModeLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (<a href="IsolationModeLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,28 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="IsolationModeLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="IsolationModeLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="IsolationModeLogic.sol.gcov.html#L28">IsolationModeLogic.updateIsolatedDebtIfIsolated</a></td>
               
-              <td class="coverFnHi">11036</td>
+              <td class="coverFnHi">13035</td>
               
               
             </tr>
@@ -82,8 +82,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html b/report/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html
similarity index 85%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html
rename to report/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html
index ecc7f0d8..f750b6e9 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/IsolationModeLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/IsolationModeLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (source / <a href="IsolationModeLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - IsolationModeLogic.sol<span style="font-size: 80%;"> (source / <a href="IsolationModeLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -98,34 +98,34 @@
 <span id="L27"><span class="lineNum">      27</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :    * @param repayAmount The amount being repaid</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :    */</span>
-<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC tlaBgGNC">       11036 :   function updateIsolatedDebtIfIsolated(</span></span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   function updateIsolatedDebtIfIsolated(</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :     uint256 repayAmount</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   ) internal {</span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">       33108 :     (bool isolationModeActive, address isolationModeCollateralAddress, ) = userConfig</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC tlaBgGNC">       13035 :     (bool isolationModeActive, address isolationModeCollateralAddress, ) = userConfig</span></span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :       .getIsolationModeState(reservesData, reservesList);</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             : </span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">       11036 :     if (isolationModeActive) {</span></span>
-<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">           4 :       uint128 isolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">       13035 :     if (isolationModeActive) {</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">           2 :       uint128 isolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :         .isolationModeTotalDebt;</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">           6 :       uint128 isolatedDebtRepaid = (repayAmount /</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">           2 :       uint128 isolatedDebtRepaid = (repayAmount /</span></span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :         10 **</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :           (reserveCache.reserveConfiguration.getDecimals() -</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :             ReserveConfiguration.DEBT_CEILING_DECIMALS)).toUint128();</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             : </span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :       // since the debt ceiling does not take into account the interest accrued, it might happen that amount</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :       // repaid &gt; debt in isolation mode</span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           4 :       if (isolationModeTotalDebt &lt;= isolatedDebtRepaid) {</span></span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">           2 :         reservesData[isolationModeCollateralAddress].isolationModeTotalDebt = 0;</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">           2 :         emit IsolationModeTotalDebtUpdated(isolationModeCollateralAddress, 0);</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           2 :       if (isolationModeTotalDebt &lt;= isolatedDebtRepaid) {</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">           1 :         reservesData[isolationModeCollateralAddress].isolationModeTotalDebt = 0;</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">           1 :         emit IsolationModeTotalDebtUpdated(isolationModeCollateralAddress, 0);</span></span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :       } else {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           3 :         uint256 nextIsolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           1 :         uint256 nextIsolationModeTotalDebt = reservesData[isolationModeCollateralAddress]</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :           .isolationModeTotalDebt = isolationModeTotalDebt - isolatedDebtRepaid;</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           2 :         emit IsolationModeTotalDebtUpdated(</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           1 :         emit IsolationModeTotalDebtUpdated(</span></span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :           isolationModeCollateralAddress,</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :           nextIsolationModeTotalDebt</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :         );</span>
@@ -140,8 +140,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func-c.html b/report/protocol/libraries/logic/LiquidationLogic.sol.func-c.html
similarity index 56%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func-c.html
rename to report/protocol/libraries/logic/LiquidationLogic.sol.func-c.html
index 0e8460fb..82970336 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/LiquidationLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/LiquidationLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (<a href="LiquidationLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (<a href="LiquidationLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">95.5&nbsp;%</td>
-            <td class="headerCovTableEntry">88</td>
-            <td class="headerCovTableEntry">84</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">74</td>
+            <td class="headerCovTableEntry">73</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,70 +53,63 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="LiquidationLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="LiquidationLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L284">LiquidationLogic._liquidateATokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L286">LiquidationLogic._liquidateATokens</a></td>
               
               <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L250">LiquidationLogic._burnCollateralATokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L252">LiquidationLogic._burnCollateralATokens</a></td>
               
-              <td class="coverFnHi">6009</td>
+              <td class="coverFnHi">8008</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L322">LiquidationLogic._burnDebtTokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L324">LiquidationLogic._burnDebtTokens</a></td>
               
-              <td class="coverFnHi">6012</td>
+              <td class="coverFnHi">8011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L397">LiquidationLogic._getConfigurationData</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L397">LiquidationLogic._calculateAvailableCollateralToLiquidate</a></td>
               
-              <td class="coverFnHi">6012</td>
+              <td class="coverFnHi">12021</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L465">LiquidationLogic._calculateAvailableCollateralToLiquidate</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L343">LiquidationLogic._calculateDebt</a></td>
               
-              <td class="coverFnHi">9023</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L362">LiquidationLogic._calculateDebt</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L90">LiquidationLogic.executeLiquidationCall</a></td>
               
-              <td class="coverFnHi">11292</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L94">LiquidationLogic.executeLiquidationCall</a></td>
-              
-              <td class="coverFnHi">11292</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
@@ -124,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func.html b/report/protocol/libraries/logic/LiquidationLogic.sol.func.html
similarity index 56%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func.html
rename to report/protocol/libraries/logic/LiquidationLogic.sol.func.html
index a3d162f6..99073430 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.func.html
+++ b/report/protocol/libraries/logic/LiquidationLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/LiquidationLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (<a href="LiquidationLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (<a href="LiquidationLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">95.5&nbsp;%</td>
-            <td class="headerCovTableEntry">88</td>
-            <td class="headerCovTableEntry">84</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">74</td>
+            <td class="headerCovTableEntry">73</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,70 +53,63 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="LiquidationLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="LiquidationLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L250">LiquidationLogic._burnCollateralATokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L252">LiquidationLogic._burnCollateralATokens</a></td>
               
-              <td class="coverFnHi">6009</td>
+              <td class="coverFnHi">8008</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L322">LiquidationLogic._burnDebtTokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L324">LiquidationLogic._burnDebtTokens</a></td>
               
-              <td class="coverFnHi">6012</td>
+              <td class="coverFnHi">8011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L465">LiquidationLogic._calculateAvailableCollateralToLiquidate</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L397">LiquidationLogic._calculateAvailableCollateralToLiquidate</a></td>
               
-              <td class="coverFnHi">9023</td>
+              <td class="coverFnHi">12021</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L362">LiquidationLogic._calculateDebt</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L343">LiquidationLogic._calculateDebt</a></td>
               
-              <td class="coverFnHi">11292</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L397">LiquidationLogic._getConfigurationData</a></td>
-              
-              <td class="coverFnHi">6012</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L284">LiquidationLogic._liquidateATokens</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L286">LiquidationLogic._liquidateATokens</a></td>
               
               <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L94">LiquidationLogic.executeLiquidationCall</a></td>
+              <td class="coverFn"><a href="LiquidationLogic.sol.gcov.html#L90">LiquidationLogic.executeLiquidationCall</a></td>
               
-              <td class="coverFnHi">11292</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
@@ -124,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.gcov.html b/report/protocol/libraries/logic/LiquidationLogic.sol.gcov.html
similarity index 76%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.gcov.html
rename to report/protocol/libraries/logic/LiquidationLogic.sol.gcov.html
index 67f052b3..59de0f5b 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/LiquidationLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/LiquidationLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (source / <a href="LiquidationLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - LiquidationLogic.sol<span style="font-size: 80%;"> (source / <a href="LiquidationLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">95.5&nbsp;%</td>
-            <td class="headerCovTableEntry">88</td>
-            <td class="headerCovTableEntry">84</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">74</td>
+            <td class="headerCovTableEntry">73</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -76,527 +76,459 @@
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {PercentageMath} from '../../libraries/math/PercentageMath.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {WadRayMath} from '../../libraries/math/WadRayMath.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {Helpers} from '../../libraries/helpers/Helpers.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {DataTypes} from '../../libraries/types/DataTypes.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {GenericLogic} from './GenericLogic.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {IsolationModeLogic} from './IsolationModeLogic.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {EModeLogic} from './EModeLogic.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : import {UserConfiguration} from '../../libraries/configuration/UserConfiguration.sol';</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : import {ReserveConfiguration} from '../../libraries/configuration/ReserveConfiguration.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {DataTypes} from '../../libraries/types/DataTypes.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {ReserveLogic} from './ReserveLogic.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {ValidationLogic} from './ValidationLogic.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {GenericLogic} from './GenericLogic.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {IsolationModeLogic} from './IsolationModeLogic.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {EModeLogic} from './EModeLogic.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {UserConfiguration} from '../../libraries/configuration/UserConfiguration.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : import {ReserveConfiguration} from '../../libraries/configuration/ReserveConfiguration.sol';</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : import {EModeConfiguration} from '../../libraries/configuration/EModeConfiguration.sol';</span>
 <span id="L17"><span class="lineNum">      17</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             : import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             : import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             : </span>
-<span id="L22"><span class="lineNum">      22</span>                 :             : /**</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :  * @title LiquidationLogic library</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :  * @author Aave</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             :  * @notice Implements actions involving management of collateral in the protocol, the main one being the liquidations</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :  */</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             : library LiquidationLogic {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :   using WadRayMath for uint256;</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   using PercentageMath for uint256;</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :   // See `IPool` for descriptions</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :   event ReserveUsedAsCollateralEnabled(address indexed reserve, address indexed user);</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             :   event LiquidationCall(</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :     address indexed collateralAsset,</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     address indexed debtAsset,</span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :     address indexed user,</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             :     uint256 debtToCover,</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :     uint256 liquidatedCollateralAmount,</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :     address liquidator,</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :     bool receiveAToken</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   );</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             : </span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :   /**</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :    * @dev Default percentage of borrower's debt to be repaid in a liquidation.</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :    * @dev Percentage applied when the users health factor is above `CLOSE_FACTOR_HF_THRESHOLD`</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :    * Expressed in bps, a value of 0.5e4 results in 50.00%</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :    */</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   uint256 internal constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 0.5e4;</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :   /**</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :    * @dev Maximum percentage of borrower's debt to be repaid in a liquidation</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :    * @dev Percentage applied when the users health factor is below `CLOSE_FACTOR_HF_THRESHOLD`</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :    * Expressed in bps, a value of 1e4 results in 100.00%</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :    */</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :   uint256 public constant MAX_LIQUIDATION_CLOSE_FACTOR = 1e4;</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             : </span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :   /**</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :    * @dev This constant represents below which health factor value it is possible to liquidate</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :    * an amount of debt corresponding to `MAX_LIQUIDATION_CLOSE_FACTOR`.</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :    * A value of 0.95e18 results in 0.95</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :    */</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :   uint256 public constant CLOSE_FACTOR_HF_THRESHOLD = 0.95e18;</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             : </span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :   struct LiquidationCallLocalVars {</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :     uint256 userCollateralBalance;</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :     uint256 userVariableDebt;</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     uint256 userTotalDebt;</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :     uint256 actualDebtToLiquidate;</span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :     uint256 actualCollateralToLiquidate;</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :     uint256 liquidationBonus;</span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :     uint256 healthFactor;</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :     uint256 liquidationProtocolFeeAmount;</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :     address collateralPriceSource;</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :     address debtPriceSource;</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :     IAToken collateralAToken;</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :     DataTypes.ReserveCache debtReserveCache;</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :   }</span>
-<span id="L84"><span class="lineNum">      84</span>                 :             : </span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :   /**</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :    * @notice Function to liquidate a position if its Health Factor drops below 1. The caller (liquidator)</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :    * covers `debtToCover` amount of debt of the user getting liquidated, and receives</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :    * a proportional amount of the `collateralAsset` plus a bonus to cover market risk</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :    * @dev Emits the `LiquidationCall()` event</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :    * @param usersConfig The users configuration mapping that track the supplied/borrowed assets</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :    */</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC tlaBgGNC">       11292 :   function executeLiquidationCall(</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :     mapping(address =&gt; DataTypes.UserConfigurationMap) storage usersConfig,</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :   ) external {</span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">       22584 :     LiquidationCallLocalVars memory vars;</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">       22584 :     DataTypes.ReserveData storage collateralReserve = reservesData[params.collateralAsset];</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">       22584 :     DataTypes.ReserveData storage debtReserve = reservesData[params.debtAsset];</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       22584 :     DataTypes.UserConfigurationMap storage userConfig = usersConfig[params.user];</span></span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">       22584 :     vars.debtReserveCache = debtReserve.cache();</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       22584 :     debtReserve.updateState(vars.debtReserveCache);</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :             : </span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       22584 :     (, , , , vars.healthFactor, ) = GenericLogic.calculateUserAccountData(</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :       reservesData,</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :       reservesList,</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :       eModeCategories,</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :       DataTypes.CalculateUserAccountDataParams({</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :         userConfig: userConfig,</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :         reservesCount: params.reservesCount,</span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :         user: params.user,</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :         oracle: params.priceOracle,</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :         userEModeCategory: params.userEModeCategory</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :       })</span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :     );</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             : </span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">       22584 :     (vars.userVariableDebt, vars.userTotalDebt, vars.actualDebtToLiquidate) = _calculateDebt(</span></span>
-<span id="L125"><span class="lineNum">     125</span>                 :             :       vars.debtReserveCache,</span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :       params,</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :       vars.healthFactor</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :     );</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">       22584 :     ValidationLogic.validateLiquidationCall(</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :       userConfig,</span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :       collateralReserve,</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             :       debtReserve,</span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :       DataTypes.ValidateLiquidationCallParams({</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :         debtReserveCache: vars.debtReserveCache,</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :         totalDebt: vars.userTotalDebt,</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :         healthFactor: vars.healthFactor,</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :         priceOracleSentinel: params.priceOracleSentinel</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :       })</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :     );</span>
-<span id="L141"><span class="lineNum">     141</span>                 :             : </span>
-<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">       12024 :     (</span></span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :       vars.collateralAToken,</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :       vars.collateralPriceSource,</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :       vars.debtPriceSource,</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :       vars.liquidationBonus</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :     ) = _getConfigurationData(eModeCategories, collateralReserve, params);</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             : </span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       12024 :     vars.userCollateralBalance = vars.collateralAToken.balanceOf(params.user);</span></span>
+<span id="L18"><span class="lineNum">      18</span>                 :             : import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             : import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             : </span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : /**</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :  * @title LiquidationLogic library</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :  * @author Aave</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :  * @notice Implements actions involving management of collateral in the protocol, the main one being the liquidations</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :  */</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : library LiquidationLogic {</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   using WadRayMath for uint256;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   using PercentageMath for uint256;</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   using ReserveLogic for DataTypes.ReserveCache;</span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :   using UserConfiguration for DataTypes.UserConfigurationMap;</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :   using GPv2SafeERC20 for IERC20;</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             : </span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   // See `IPool` for descriptions</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :   event ReserveUsedAsCollateralEnabled(address indexed reserve, address indexed user);</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   event LiquidationCall(</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :     address indexed collateralAsset,</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :     address indexed debtAsset,</span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :     address indexed user,</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :     uint256 debtToCover,</span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :     uint256 liquidatedCollateralAmount,</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :     address liquidator,</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :     bool receiveAToken</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   );</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             : </span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   /**</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :    * @dev Default percentage of borrower's debt to be repaid in a liquidation.</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :    * @dev Percentage applied when the users health factor is above `CLOSE_FACTOR_HF_THRESHOLD`</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :    * Expressed in bps, a value of 0.5e4 results in 50.00%</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :    */</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :   uint256 internal constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 0.5e4;</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             : </span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   /**</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :    * @dev Maximum percentage of borrower's debt to be repaid in a liquidation</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :    * @dev Percentage applied when the users health factor is below `CLOSE_FACTOR_HF_THRESHOLD`</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :    * Expressed in bps, a value of 1e4 results in 100.00%</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :    */</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   uint256 public constant MAX_LIQUIDATION_CLOSE_FACTOR = 1e4;</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             : </span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :   /**</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :    * @dev This constant represents below which health factor value it is possible to liquidate</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :    * an amount of debt corresponding to `MAX_LIQUIDATION_CLOSE_FACTOR`.</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :    * A value of 0.95e18 results in 0.95</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :    */</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   uint256 public constant CLOSE_FACTOR_HF_THRESHOLD = 0.95e18;</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             : </span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :   struct LiquidationCallLocalVars {</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :     uint256 userCollateralBalance;</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :     uint256 userTotalDebt;</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :     uint256 actualDebtToLiquidate;</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :     uint256 actualCollateralToLiquidate;</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :     uint256 liquidationBonus;</span>
+<span id="L75"><span class="lineNum">      75</span>                 :             :     uint256 healthFactor;</span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :     uint256 liquidationProtocolFeeAmount;</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :     IAToken collateralAToken;</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :     DataTypes.ReserveCache debtReserveCache;</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :   }</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             : </span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :   /**</span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :    * @notice Function to liquidate a position if its Health Factor drops below 1. The caller (liquidator)</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :    * covers `debtToCover` amount of debt of the user getting liquidated, and receives</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :    * a proportional amount of the `collateralAsset` plus a bonus to cover market risk</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :    * @dev Emits the `LiquidationCall()` event</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :    * @param usersConfig The users configuration mapping that track the supplied/borrowed assets</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :    */</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function executeLiquidationCall(</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :     mapping(address =&gt; DataTypes.UserConfigurationMap) storage usersConfig,</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :   ) external {</span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC tlaBgGNC">       14501 :     LiquidationCallLocalVars memory vars;</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             : </span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">       14501 :     DataTypes.ReserveData storage collateralReserve = reservesData[params.collateralAsset];</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">       14501 :     DataTypes.ReserveData storage debtReserve = reservesData[params.debtAsset];</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">       14501 :     DataTypes.UserConfigurationMap storage userConfig = usersConfig[params.user];</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">       14501 :     vars.debtReserveCache = debtReserve.cache();</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">       14501 :     debtReserve.updateState(vars.debtReserveCache);</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             : </span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       14501 :     (, , , , vars.healthFactor, ) = GenericLogic.calculateUserAccountData(</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :       reservesData,</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :       reservesList,</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :       eModeCategories,</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :       DataTypes.CalculateUserAccountDataParams({</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :         userConfig: userConfig,</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :         reservesCount: params.reservesCount,</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :         user: params.user,</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :         oracle: params.priceOracle,</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :         userEModeCategory: params.userEModeCategory</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :       })</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :     );</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             : </span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">       14501 :     (vars.userTotalDebt, vars.actualDebtToLiquidate) = _calculateDebt(</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :       vars.debtReserveCache,</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :       params,</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :       vars.healthFactor</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :     );</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             : </span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">       14501 :     ValidationLogic.validateLiquidationCall(</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :       userConfig,</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :       collateralReserve,</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :       debtReserve,</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :       DataTypes.ValidateLiquidationCallParams({</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :         debtReserveCache: vars.debtReserveCache,</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :         totalDebt: vars.userTotalDebt,</span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :         healthFactor: vars.healthFactor,</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :         priceOracleSentinel: params.priceOracleSentinel</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :       })</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :     );</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             : </span>
+<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">        8011 :     vars.collateralAToken = IAToken(collateralReserve.aTokenAddress);</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :     if (</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">        8011 :       params.userEModeCategory != 0 &amp;&amp;</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">        1001 :       EModeConfiguration.isReserveEnabledOnBitmap(</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :         eModeCategories[params.userEModeCategory].collateralBitmap,</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :         collateralReserve.id</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :       )</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :     ) {</span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">        1001 :       vars.liquidationBonus = eModeCategories[params.userEModeCategory].liquidationBonus;</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :     } else {</span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">        7010 :       vars.liquidationBonus = collateralReserve.configuration.getLiquidationBonus();</span></span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :     }</span>
 <span id="L150"><span class="lineNum">     150</span>                 :             : </span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">       12024 :     (</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :       vars.actualCollateralToLiquidate,</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :       vars.actualDebtToLiquidate,</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :       vars.liquidationProtocolFeeAmount</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :     ) = _calculateAvailableCollateralToLiquidate(</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :       collateralReserve,</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :       vars.debtReserveCache,</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :       vars.collateralPriceSource,</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :       vars.debtPriceSource,</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :       vars.actualDebtToLiquidate,</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :       vars.userCollateralBalance,</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :       vars.liquidationBonus,</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :       IPriceOracleGetter(params.priceOracle)</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :     );</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             : </span>
-<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">       12024 :     if (vars.userTotalDebt == vars.actualDebtToLiquidate) {</span></span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           4 :       userConfig.setBorrowing(debtReserve.id, false);</span></span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :     }</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             : </span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :     // If the collateral being liquidated is equal to the user balance,</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :     // we set the currency as not being used as collateral anymore</span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :     if (</span>
-<span id="L173"><span class="lineNum">     173</span>                 :<span class="tlaGNC">       18036 :       vars.actualCollateralToLiquidate + vars.liquidationProtocolFeeAmount ==</span></span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :       vars.userCollateralBalance</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :     ) {</span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">          12 :       userConfig.setUsingAsCollateral(collateralReserve.id, false);</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">          12 :       emit ReserveUsedAsCollateralDisabled(params.collateralAsset, params.user);</span></span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :     }</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             : </span>
-<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">       12024 :     _burnDebtTokens(params, vars);</span></span>
+<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">        8011 :     vars.userCollateralBalance = vars.collateralAToken.balanceOf(params.user);</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :             : </span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        8011 :     (</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :       vars.actualCollateralToLiquidate,</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :       vars.actualDebtToLiquidate,</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :       vars.liquidationProtocolFeeAmount</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :     ) = _calculateAvailableCollateralToLiquidate(</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :       collateralReserve,</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :       vars.debtReserveCache,</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :       params.collateralAsset,</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :       params.debtAsset,</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :       vars.actualDebtToLiquidate,</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :       vars.userCollateralBalance,</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :       vars.liquidationBonus,</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :       IPriceOracleGetter(params.priceOracle)</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :     );</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             : </span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        8011 :     if (vars.userTotalDebt == vars.actualDebtToLiquidate) {</span></span>
+<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">           2 :       userConfig.setBorrowing(debtReserve.id, false);</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :     }</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             : </span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :     // If the collateral being liquidated is equal to the user balance,</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :     // we set the currency as not being used as collateral anymore</span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :     if (</span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">        8011 :       vars.actualCollateralToLiquidate + vars.liquidationProtocolFeeAmount ==</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :       vars.userCollateralBalance</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :     ) {</span>
+<span id="L178"><span class="lineNum">     178</span>                 :<span class="tlaGNC">        1006 :       userConfig.setUsingAsCollateral(collateralReserve.id, false);</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">        1006 :       emit ReserveUsedAsCollateralDisabled(params.collateralAsset, params.user);</span></span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :     }</span>
 <span id="L181"><span class="lineNum">     181</span>                 :             : </span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">       12024 :     debtReserve.updateInterestRatesAndVirtualBalance(</span></span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :       vars.debtReserveCache,</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :       params.debtAsset,</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :       vars.actualDebtToLiquidate,</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :       0</span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :     );</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             : </span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">       12024 :     IsolationModeLogic.updateIsolatedDebtIfIsolated(</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :       reservesData,</span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :       reservesList,</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :       userConfig,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :       vars.debtReserveCache,</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :       vars.actualDebtToLiquidate</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :     );</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             : </span>
-<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">        6012 :     if (params.receiveAToken) {</span></span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           6 :       _liquidateATokens(reservesData, reservesList, usersConfig, collateralReserve, params, vars);</span></span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :     } else {</span>
-<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">       12018 :       _burnCollateralATokens(collateralReserve, params, vars);</span></span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :     }</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             : </span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :     // Transfer fee to treasury if it is non-zero</span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">       12024 :     if (vars.liquidationProtocolFeeAmount != 0) {</span></span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">       18033 :       uint256 liquidityIndex = collateralReserve.getNormalizedIncome();</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">       18033 :       uint256 scaledDownLiquidationProtocolFee = vars.liquidationProtocolFeeAmount.rayDiv(</span></span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :         liquidityIndex</span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :       );</span>
-<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">       18033 :       uint256 scaledDownUserBalance = vars.collateralAToken.scaledBalanceOf(params.user);</span></span>
-<span id="L210"><span class="lineNum">     210</span>                 :             :       // To avoid trying to send more aTokens than available on balance, due to 1 wei imprecision</span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">       12022 :       if (scaledDownLiquidationProtocolFee &gt; scaledDownUserBalance) {</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         vars.liquidationProtocolFeeAmount = scaledDownUserBalance.rayMul(liquidityIndex);</span></span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :       }</span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC tlaBgGNC">       12022 :       vars.collateralAToken.transferOnLiquidation(</span></span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :         params.user,</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :         vars.collateralAToken.RESERVE_TREASURY_ADDRESS(),</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             :         vars.liquidationProtocolFeeAmount</span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :       );</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             :     }</span>
-<span id="L220"><span class="lineNum">     220</span>                 :             : </span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :     // Transfers the debt asset being repaid to the aToken, where the liquidity is kept</span>
-<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">       12024 :     IERC20(params.debtAsset).safeTransferFrom(</span></span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :       msg.sender,</span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :       vars.debtReserveCache.aTokenAddress,</span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :       vars.actualDebtToLiquidate</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :     );</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             : </span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">       12024 :     IAToken(vars.debtReserveCache.aTokenAddress).handleRepayment(</span></span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :       msg.sender,</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :       params.user,</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :       vars.actualDebtToLiquidate</span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :     );</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             : </span>
-<span id="L234"><span class="lineNum">     234</span>                 :<span class="tlaGNC">       12024 :     emit LiquidationCall(</span></span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :       params.collateralAsset,</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :       params.debtAsset,</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :       params.user,</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :       vars.actualDebtToLiquidate,</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :       vars.actualCollateralToLiquidate,</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :       msg.sender,</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :       params.receiveAToken</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :     );</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :   }</span>
-<span id="L244"><span class="lineNum">     244</span>                 :             : </span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :   /**</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             :    * @notice Burns the collateral aTokens and transfers the underlying to the liquidator.</span>
-<span id="L247"><span class="lineNum">     247</span>                 :             :    * @dev   The function also updates the state and the interest rate of the collateral reserve.</span>
-<span id="L248"><span class="lineNum">     248</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
-<span id="L249"><span class="lineNum">     249</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L250"><span class="lineNum">     250</span>                 :             :    * @param vars The executeLiquidationCall() function local vars</span>
-<span id="L251"><span class="lineNum">     251</span>                 :             :    */</span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">        6009 :   function _burnCollateralATokens(</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
-<span id="L255"><span class="lineNum">     255</span>                 :             :     LiquidationCallLocalVars memory vars</span>
-<span id="L256"><span class="lineNum">     256</span>                 :             :   ) internal {</span>
-<span id="L257"><span class="lineNum">     257</span>                 :<span class="tlaGNC">       18027 :     DataTypes.ReserveCache memory collateralReserveCache = collateralReserve.cache();</span></span>
-<span id="L258"><span class="lineNum">     258</span>                 :<span class="tlaGNC">       12018 :     collateralReserve.updateState(collateralReserveCache);</span></span>
-<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">       12018 :     collateralReserve.updateInterestRatesAndVirtualBalance(</span></span>
-<span id="L260"><span class="lineNum">     260</span>                 :             :       collateralReserveCache,</span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :       params.collateralAsset,</span>
-<span id="L262"><span class="lineNum">     262</span>                 :             :       0,</span>
-<span id="L263"><span class="lineNum">     263</span>                 :             :       vars.actualCollateralToLiquidate</span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :     );</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             : </span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :     // Burn the equivalent amount of aToken, sending the underlying to the liquidator</span>
-<span id="L267"><span class="lineNum">     267</span>                 :<span class="tlaGNC">       12018 :     vars.collateralAToken.burn(</span></span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :       params.user,</span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :       msg.sender,</span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :       vars.actualCollateralToLiquidate,</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :       collateralReserveCache.nextLiquidityIndex</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :     );</span>
-<span id="L273"><span class="lineNum">     273</span>                 :             :   }</span>
-<span id="L274"><span class="lineNum">     274</span>                 :             : </span>
-<span id="L275"><span class="lineNum">     275</span>                 :             :   /**</span>
-<span id="L276"><span class="lineNum">     276</span>                 :             :    * @notice Liquidates the user aTokens by transferring them to the liquidator.</span>
-<span id="L277"><span class="lineNum">     277</span>                 :             :    * @dev   The function also checks the state of the liquidator and activates the aToken as collateral</span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :    *        as in standard transfers if the isolation mode constraints are respected.</span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             :    * @param usersConfig The users configuration mapping that track the supplied/borrowed assets</span>
-<span id="L282"><span class="lineNum">     282</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             :    * @param vars The executeLiquidationCall() function local vars</span>
-<span id="L285"><span class="lineNum">     285</span>                 :             :    */</span>
-<span id="L286"><span class="lineNum">     286</span>                 :<span class="tlaGNC">           3 :   function _liquidateATokens(</span></span>
-<span id="L287"><span class="lineNum">     287</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L288"><span class="lineNum">     288</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L289"><span class="lineNum">     289</span>                 :             :     mapping(address =&gt; DataTypes.UserConfigurationMap) storage usersConfig,</span>
-<span id="L290"><span class="lineNum">     290</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
-<span id="L291"><span class="lineNum">     291</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
-<span id="L292"><span class="lineNum">     292</span>                 :             :     LiquidationCallLocalVars memory vars</span>
-<span id="L293"><span class="lineNum">     293</span>                 :             :   ) internal {</span>
-<span id="L294"><span class="lineNum">     294</span>                 :<span class="tlaGNC">           9 :     uint256 liquidatorPreviousATokenBalance = IERC20(vars.collateralAToken).balanceOf(msg.sender);</span></span>
-<span id="L295"><span class="lineNum">     295</span>                 :<span class="tlaGNC">           6 :     vars.collateralAToken.transferOnLiquidation(</span></span>
-<span id="L296"><span class="lineNum">     296</span>                 :             :       params.user,</span>
-<span id="L297"><span class="lineNum">     297</span>                 :             :       msg.sender,</span>
-<span id="L298"><span class="lineNum">     298</span>                 :             :       vars.actualCollateralToLiquidate</span>
-<span id="L299"><span class="lineNum">     299</span>                 :             :     );</span>
-<span id="L300"><span class="lineNum">     300</span>                 :             : </span>
-<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">           6 :     if (liquidatorPreviousATokenBalance == 0) {</span></span>
-<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">           6 :       DataTypes.UserConfigurationMap storage liquidatorConfig = usersConfig[msg.sender];</span></span>
-<span id="L303"><span class="lineNum">     303</span>                 :             :       if (</span>
-<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">           6 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
-<span id="L305"><span class="lineNum">     305</span>                 :             :           reservesData,</span>
-<span id="L306"><span class="lineNum">     306</span>                 :             :           reservesList,</span>
-<span id="L307"><span class="lineNum">     307</span>                 :             :           liquidatorConfig,</span>
-<span id="L308"><span class="lineNum">     308</span>                 :             :           collateralReserve.configuration,</span>
-<span id="L309"><span class="lineNum">     309</span>                 :             :           collateralReserve.aTokenAddress</span>
-<span id="L310"><span class="lineNum">     310</span>                 :             :         )</span>
-<span id="L311"><span class="lineNum">     311</span>                 :             :       ) {</span>
-<span id="L312"><span class="lineNum">     312</span>                 :<span class="tlaGNC">           6 :         liquidatorConfig.setUsingAsCollateral(collateralReserve.id, true);</span></span>
-<span id="L313"><span class="lineNum">     313</span>                 :<span class="tlaGNC">           6 :         emit ReserveUsedAsCollateralEnabled(params.collateralAsset, msg.sender);</span></span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :       }</span>
-<span id="L315"><span class="lineNum">     315</span>                 :             :     }</span>
-<span id="L316"><span class="lineNum">     316</span>                 :             :   }</span>
-<span id="L317"><span class="lineNum">     317</span>                 :             : </span>
-<span id="L318"><span class="lineNum">     318</span>                 :             :   /**</span>
-<span id="L319"><span class="lineNum">     319</span>                 :             :    * @notice Burns the debt tokens of the user up to the amount being repaid by the liquidator.</span>
-<span id="L320"><span class="lineNum">     320</span>                 :             :    * @dev The function alters the `debtReserveCache` state in `vars` to update the debt related data.</span>
-<span id="L321"><span class="lineNum">     321</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L322"><span class="lineNum">     322</span>                 :             :    * @param vars the executeLiquidationCall() function local vars</span>
-<span id="L323"><span class="lineNum">     323</span>                 :             :    */</span>
-<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">        6012 :   function _burnDebtTokens(</span></span>
-<span id="L325"><span class="lineNum">     325</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
-<span id="L326"><span class="lineNum">     326</span>                 :             :     LiquidationCallLocalVars memory vars</span>
-<span id="L327"><span class="lineNum">     327</span>                 :             :   ) internal {</span>
-<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">       12024 :     if (vars.userVariableDebt &gt;= vars.actualDebtToLiquidate) {</span></span>
-<span id="L329"><span class="lineNum">     329</span>                 :<span class="tlaGNC">       12024 :       vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(</span></span>
-<span id="L330"><span class="lineNum">     330</span>                 :             :         vars.debtReserveCache.variableDebtTokenAddress</span>
-<span id="L331"><span class="lineNum">     331</span>                 :             :       ).burn(</span>
-<span id="L332"><span class="lineNum">     332</span>                 :             :           params.user,</span>
-<span id="L333"><span class="lineNum">     333</span>                 :             :           vars.actualDebtToLiquidate,</span>
-<span id="L334"><span class="lineNum">     334</span>                 :             :           vars.debtReserveCache.nextVariableBorrowIndex</span>
-<span id="L335"><span class="lineNum">     335</span>                 :             :         );</span>
-<span id="L336"><span class="lineNum">     336</span>                 :             :     } else {</span>
-<span id="L337"><span class="lineNum">     337</span>                 :             :       // If the user doesn't have variable debt, no need to try to burn variable debt tokens</span>
-<span id="L338"><span class="lineNum">     338</span>                 :<span class="tlaUNC tlaBgUNC">           0 :       if (vars.userVariableDebt != 0) {</span></span>
-<span id="L339"><span class="lineNum">     339</span>                 :<span class="tlaUNC">           0 :         vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(</span></span>
-<span id="L340"><span class="lineNum">     340</span>                 :             :           vars.debtReserveCache.variableDebtTokenAddress</span>
-<span id="L341"><span class="lineNum">     341</span>                 :             :         ).burn(params.user, vars.userVariableDebt, vars.debtReserveCache.nextVariableBorrowIndex);</span>
-<span id="L342"><span class="lineNum">     342</span>                 :             :       }</span>
-<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaUNC">           0 :       (</span></span>
-<span id="L344"><span class="lineNum">     344</span>                 :             :         vars.debtReserveCache.nextTotalStableDebt,</span>
-<span id="L345"><span class="lineNum">     345</span>                 :             :         vars.debtReserveCache.nextAvgStableBorrowRate</span>
-<span id="L346"><span class="lineNum">     346</span>                 :             :       ) = IStableDebtToken(vars.debtReserveCache.stableDebtTokenAddress).burn(</span>
-<span id="L347"><span class="lineNum">     347</span>                 :             :         params.user,</span>
-<span id="L348"><span class="lineNum">     348</span>                 :             :         vars.actualDebtToLiquidate - vars.userVariableDebt</span>
-<span id="L349"><span class="lineNum">     349</span>                 :             :       );</span>
-<span id="L350"><span class="lineNum">     350</span>                 :             :     }</span>
-<span id="L351"><span class="lineNum">     351</span>                 :             :   }</span>
-<span id="L352"><span class="lineNum">     352</span>                 :             : </span>
-<span id="L353"><span class="lineNum">     353</span>                 :             :   /**</span>
-<span id="L354"><span class="lineNum">     354</span>                 :             :    * @notice Calculates the total debt of the user and the actual amount to liquidate depending on the health factor</span>
-<span id="L355"><span class="lineNum">     355</span>                 :             :    * and corresponding close factor.</span>
-<span id="L356"><span class="lineNum">     356</span>                 :             :    * @dev If the Health Factor is below CLOSE_FACTOR_HF_THRESHOLD, the close factor is increased to MAX_LIQUIDATION_CLOSE_FACTOR</span>
-<span id="L357"><span class="lineNum">     357</span>                 :             :    * @param debtReserveCache The reserve cache data object of the debt reserve</span>
-<span id="L358"><span class="lineNum">     358</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L359"><span class="lineNum">     359</span>                 :             :    * @param healthFactor The health factor of the position</span>
-<span id="L360"><span class="lineNum">     360</span>                 :             :    * @return The variable debt of the user</span>
-<span id="L361"><span class="lineNum">     361</span>                 :             :    * @return The total debt of the user</span>
-<span id="L362"><span class="lineNum">     362</span>                 :             :    * @return The actual debt to liquidate as a function of the closeFactor</span>
-<span id="L363"><span class="lineNum">     363</span>                 :             :    */</span>
-<span id="L364"><span class="lineNum">     364</span>                 :<span class="tlaGNC tlaBgGNC">       11292 :   function _calculateDebt(</span></span>
-<span id="L365"><span class="lineNum">     365</span>                 :             :     DataTypes.ReserveCache memory debtReserveCache,</span>
-<span id="L366"><span class="lineNum">     366</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
-<span id="L367"><span class="lineNum">     367</span>                 :             :     uint256 healthFactor</span>
-<span id="L368"><span class="lineNum">     368</span>                 :             :   ) internal view returns (uint256, uint256, uint256) {</span>
-<span id="L369"><span class="lineNum">     369</span>                 :<span class="tlaGNC">       33876 :     (uint256 userStableDebt, uint256 userVariableDebt) = Helpers.getUserCurrentDebt(</span></span>
-<span id="L370"><span class="lineNum">     370</span>                 :             :       params.user,</span>
-<span id="L371"><span class="lineNum">     371</span>                 :             :       debtReserveCache</span>
-<span id="L372"><span class="lineNum">     372</span>                 :             :     );</span>
-<span id="L373"><span class="lineNum">     373</span>                 :             : </span>
-<span id="L374"><span class="lineNum">     374</span>                 :<span class="tlaGNC">       33876 :     uint256 userTotalDebt = userStableDebt + userVariableDebt;</span></span>
-<span id="L375"><span class="lineNum">     375</span>                 :             : </span>
-<span id="L376"><span class="lineNum">     376</span>                 :<span class="tlaGNC">       33876 :     uint256 closeFactor = healthFactor &gt; CLOSE_FACTOR_HF_THRESHOLD</span></span>
-<span id="L377"><span class="lineNum">     377</span>                 :             :       ? DEFAULT_LIQUIDATION_CLOSE_FACTOR</span>
-<span id="L378"><span class="lineNum">     378</span>                 :             :       : MAX_LIQUIDATION_CLOSE_FACTOR;</span>
-<span id="L379"><span class="lineNum">     379</span>                 :             : </span>
-<span id="L380"><span class="lineNum">     380</span>                 :<span class="tlaGNC">       33876 :     uint256 maxLiquidatableDebt = userTotalDebt.percentMul(closeFactor);</span></span>
-<span id="L381"><span class="lineNum">     381</span>                 :             : </span>
-<span id="L382"><span class="lineNum">     382</span>                 :<span class="tlaGNC">       33876 :     uint256 actualDebtToLiquidate = params.debtToCover &gt; maxLiquidatableDebt</span></span>
-<span id="L383"><span class="lineNum">     383</span>                 :             :       ? maxLiquidatableDebt</span>
-<span id="L384"><span class="lineNum">     384</span>                 :             :       : params.debtToCover;</span>
-<span id="L385"><span class="lineNum">     385</span>                 :             : </span>
-<span id="L386"><span class="lineNum">     386</span>                 :<span class="tlaGNC">       22584 :     return (userVariableDebt, userTotalDebt, actualDebtToLiquidate);</span></span>
-<span id="L387"><span class="lineNum">     387</span>                 :             :   }</span>
-<span id="L388"><span class="lineNum">     388</span>                 :             : </span>
-<span id="L389"><span class="lineNum">     389</span>                 :             :   /**</span>
-<span id="L390"><span class="lineNum">     390</span>                 :             :    * @notice Returns the configuration data for the debt and the collateral reserves.</span>
-<span id="L391"><span class="lineNum">     391</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L392"><span class="lineNum">     392</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
-<span id="L393"><span class="lineNum">     393</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
-<span id="L394"><span class="lineNum">     394</span>                 :             :    * @return The collateral aToken</span>
-<span id="L395"><span class="lineNum">     395</span>                 :             :    * @return The address to use as price source for the collateral</span>
-<span id="L396"><span class="lineNum">     396</span>                 :             :    * @return The address to use as price source for the debt</span>
-<span id="L397"><span class="lineNum">     397</span>                 :             :    * @return The liquidation bonus to apply to the collateral</span>
+<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">        8011 :     _burnDebtTokens(params, vars);</span></span>
+<span id="L183"><span class="lineNum">     183</span>                 :             : </span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">        8011 :     debtReserve.updateInterestRatesAndVirtualBalance(</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :       vars.debtReserveCache,</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :       params.debtAsset,</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :       vars.actualDebtToLiquidate,</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :       0</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :     );</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             : </span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">        8011 :     IsolationModeLogic.updateIsolatedDebtIfIsolated(</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :       reservesData,</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :       reservesList,</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :       userConfig,</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             :       vars.debtReserveCache,</span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :       vars.actualDebtToLiquidate</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :     );</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             : </span>
+<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">        8011 :     if (params.receiveAToken) {</span></span>
+<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">           3 :       _liquidateATokens(reservesData, reservesList, usersConfig, collateralReserve, params, vars);</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :     } else {</span>
+<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">        8008 :       _burnCollateralATokens(collateralReserve, params, vars);</span></span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :     }</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             : </span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :     // Transfer fee to treasury if it is non-zero</span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">        8011 :     if (vars.liquidationProtocolFeeAmount != 0) {</span></span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">        8010 :       uint256 liquidityIndex = collateralReserve.getNormalizedIncome();</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">        8010 :       uint256 scaledDownLiquidationProtocolFee = vars.liquidationProtocolFeeAmount.rayDiv(</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :         liquidityIndex</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             :       );</span>
+<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">        8010 :       uint256 scaledDownUserBalance = vars.collateralAToken.scaledBalanceOf(params.user);</span></span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :       // To avoid trying to send more aTokens than available on balance, due to 1 wei imprecision</span>
+<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">        8010 :       if (scaledDownLiquidationProtocolFee &gt; scaledDownUserBalance) {</span></span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         vars.liquidationProtocolFeeAmount = scaledDownUserBalance.rayMul(liquidityIndex);</span></span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :       }</span>
+<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC tlaBgGNC">        8010 :       vars.collateralAToken.transferOnLiquidation(</span></span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :         params.user,</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :         vars.collateralAToken.RESERVE_TREASURY_ADDRESS(),</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :         vars.liquidationProtocolFeeAmount</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :       );</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :     }</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             : </span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :     // Transfers the debt asset being repaid to the aToken, where the liquidity is kept</span>
+<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">        8011 :     IERC20(params.debtAsset).safeTransferFrom(</span></span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :       msg.sender,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :       vars.debtReserveCache.aTokenAddress,</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :       vars.actualDebtToLiquidate</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :     );</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             : </span>
+<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">        8011 :     IAToken(vars.debtReserveCache.aTokenAddress).handleRepayment(</span></span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :       msg.sender,</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :       params.user,</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :       vars.actualDebtToLiquidate</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :     );</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             : </span>
+<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">        8011 :     emit LiquidationCall(</span></span>
+<span id="L237"><span class="lineNum">     237</span>                 :             :       params.collateralAsset,</span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :       params.debtAsset,</span>
+<span id="L239"><span class="lineNum">     239</span>                 :             :       params.user,</span>
+<span id="L240"><span class="lineNum">     240</span>                 :             :       vars.actualDebtToLiquidate,</span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :       vars.actualCollateralToLiquidate,</span>
+<span id="L242"><span class="lineNum">     242</span>                 :             :       msg.sender,</span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :       params.receiveAToken</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :     );</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :   }</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             : </span>
+<span id="L247"><span class="lineNum">     247</span>                 :             :   /**</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             :    * @notice Burns the collateral aTokens and transfers the underlying to the liquidator.</span>
+<span id="L249"><span class="lineNum">     249</span>                 :             :    * @dev   The function also updates the state and the interest rate of the collateral reserve.</span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
+<span id="L251"><span class="lineNum">     251</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
+<span id="L252"><span class="lineNum">     252</span>                 :             :    * @param vars The executeLiquidationCall() function local vars</span>
+<span id="L253"><span class="lineNum">     253</span>                 :             :    */</span>
+<span id="L254"><span class="lineNum">     254</span>                 :             :   function _burnCollateralATokens(</span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
+<span id="L256"><span class="lineNum">     256</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :     LiquidationCallLocalVars memory vars</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             :   ) internal {</span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">        8008 :     DataTypes.ReserveCache memory collateralReserveCache = collateralReserve.cache();</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">        8008 :     collateralReserve.updateState(collateralReserveCache);</span></span>
+<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">        8008 :     collateralReserve.updateInterestRatesAndVirtualBalance(</span></span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :       collateralReserveCache,</span>
+<span id="L263"><span class="lineNum">     263</span>                 :             :       params.collateralAsset,</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :       0,</span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :       vars.actualCollateralToLiquidate</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :     );</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             : </span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :     // Burn the equivalent amount of aToken, sending the underlying to the liquidator</span>
+<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">        8008 :     vars.collateralAToken.burn(</span></span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :       params.user,</span>
+<span id="L271"><span class="lineNum">     271</span>                 :             :       msg.sender,</span>
+<span id="L272"><span class="lineNum">     272</span>                 :             :       vars.actualCollateralToLiquidate,</span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :       collateralReserveCache.nextLiquidityIndex</span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :     );</span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :   }</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             : </span>
+<span id="L277"><span class="lineNum">     277</span>                 :             :   /**</span>
+<span id="L278"><span class="lineNum">     278</span>                 :             :    * @notice Liquidates the user aTokens by transferring them to the liquidator.</span>
+<span id="L279"><span class="lineNum">     279</span>                 :             :    * @dev   The function also checks the state of the liquidator and activates the aToken as collateral</span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :    *        as in standard transfers if the isolation mode constraints are respected.</span>
+<span id="L281"><span class="lineNum">     281</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L282"><span class="lineNum">     282</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L283"><span class="lineNum">     283</span>                 :             :    * @param usersConfig The users configuration mapping that track the supplied/borrowed assets</span>
+<span id="L284"><span class="lineNum">     284</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
+<span id="L285"><span class="lineNum">     285</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
+<span id="L286"><span class="lineNum">     286</span>                 :             :    * @param vars The executeLiquidationCall() function local vars</span>
+<span id="L287"><span class="lineNum">     287</span>                 :             :    */</span>
+<span id="L288"><span class="lineNum">     288</span>                 :             :   function _liquidateATokens(</span>
+<span id="L289"><span class="lineNum">     289</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L291"><span class="lineNum">     291</span>                 :             :     mapping(address =&gt; DataTypes.UserConfigurationMap) storage usersConfig,</span>
+<span id="L292"><span class="lineNum">     292</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
+<span id="L293"><span class="lineNum">     293</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
+<span id="L294"><span class="lineNum">     294</span>                 :             :     LiquidationCallLocalVars memory vars</span>
+<span id="L295"><span class="lineNum">     295</span>                 :             :   ) internal {</span>
+<span id="L296"><span class="lineNum">     296</span>                 :<span class="tlaGNC">           3 :     uint256 liquidatorPreviousATokenBalance = IERC20(vars.collateralAToken).balanceOf(msg.sender);</span></span>
+<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">           3 :     vars.collateralAToken.transferOnLiquidation(</span></span>
+<span id="L298"><span class="lineNum">     298</span>                 :             :       params.user,</span>
+<span id="L299"><span class="lineNum">     299</span>                 :             :       msg.sender,</span>
+<span id="L300"><span class="lineNum">     300</span>                 :             :       vars.actualCollateralToLiquidate</span>
+<span id="L301"><span class="lineNum">     301</span>                 :             :     );</span>
+<span id="L302"><span class="lineNum">     302</span>                 :             : </span>
+<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">           3 :     if (liquidatorPreviousATokenBalance == 0) {</span></span>
+<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">           3 :       DataTypes.UserConfigurationMap storage liquidatorConfig = usersConfig[msg.sender];</span></span>
+<span id="L305"><span class="lineNum">     305</span>                 :             :       if (</span>
+<span id="L306"><span class="lineNum">     306</span>                 :<span class="tlaGNC">           3 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
+<span id="L307"><span class="lineNum">     307</span>                 :             :           reservesData,</span>
+<span id="L308"><span class="lineNum">     308</span>                 :             :           reservesList,</span>
+<span id="L309"><span class="lineNum">     309</span>                 :             :           liquidatorConfig,</span>
+<span id="L310"><span class="lineNum">     310</span>                 :             :           collateralReserve.configuration,</span>
+<span id="L311"><span class="lineNum">     311</span>                 :             :           collateralReserve.aTokenAddress</span>
+<span id="L312"><span class="lineNum">     312</span>                 :             :         )</span>
+<span id="L313"><span class="lineNum">     313</span>                 :             :       ) {</span>
+<span id="L314"><span class="lineNum">     314</span>                 :<span class="tlaGNC">           3 :         liquidatorConfig.setUsingAsCollateral(collateralReserve.id, true);</span></span>
+<span id="L315"><span class="lineNum">     315</span>                 :<span class="tlaGNC">           3 :         emit ReserveUsedAsCollateralEnabled(params.collateralAsset, msg.sender);</span></span>
+<span id="L316"><span class="lineNum">     316</span>                 :             :       }</span>
+<span id="L317"><span class="lineNum">     317</span>                 :             :     }</span>
+<span id="L318"><span class="lineNum">     318</span>                 :             :   }</span>
+<span id="L319"><span class="lineNum">     319</span>                 :             : </span>
+<span id="L320"><span class="lineNum">     320</span>                 :             :   /**</span>
+<span id="L321"><span class="lineNum">     321</span>                 :             :    * @notice Burns the debt tokens of the user up to the amount being repaid by the liquidator.</span>
+<span id="L322"><span class="lineNum">     322</span>                 :             :    * @dev The function alters the `debtReserveCache` state in `vars` to update the debt related data.</span>
+<span id="L323"><span class="lineNum">     323</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
+<span id="L324"><span class="lineNum">     324</span>                 :             :    * @param vars the executeLiquidationCall() function local vars</span>
+<span id="L325"><span class="lineNum">     325</span>                 :             :    */</span>
+<span id="L326"><span class="lineNum">     326</span>                 :             :   function _burnDebtTokens(</span>
+<span id="L327"><span class="lineNum">     327</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
+<span id="L328"><span class="lineNum">     328</span>                 :             :     LiquidationCallLocalVars memory vars</span>
+<span id="L329"><span class="lineNum">     329</span>                 :             :   ) internal {</span>
+<span id="L330"><span class="lineNum">     330</span>                 :<span class="tlaGNC">        8011 :     vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(</span></span>
+<span id="L331"><span class="lineNum">     331</span>                 :             :       vars.debtReserveCache.variableDebtTokenAddress</span>
+<span id="L332"><span class="lineNum">     332</span>                 :             :     ).burn(params.user, vars.actualDebtToLiquidate, vars.debtReserveCache.nextVariableBorrowIndex);</span>
+<span id="L333"><span class="lineNum">     333</span>                 :             :   }</span>
+<span id="L334"><span class="lineNum">     334</span>                 :             : </span>
+<span id="L335"><span class="lineNum">     335</span>                 :             :   /**</span>
+<span id="L336"><span class="lineNum">     336</span>                 :             :    * @notice Calculates the total debt of the user and the actual amount to liquidate depending on the health factor</span>
+<span id="L337"><span class="lineNum">     337</span>                 :             :    * and corresponding close factor.</span>
+<span id="L338"><span class="lineNum">     338</span>                 :             :    * @dev If the Health Factor is below CLOSE_FACTOR_HF_THRESHOLD, the close factor is increased to MAX_LIQUIDATION_CLOSE_FACTOR</span>
+<span id="L339"><span class="lineNum">     339</span>                 :             :    * @param debtReserveCache The reserve cache data object of the debt reserve</span>
+<span id="L340"><span class="lineNum">     340</span>                 :             :    * @param params The additional parameters needed to execute the liquidation function</span>
+<span id="L341"><span class="lineNum">     341</span>                 :             :    * @param healthFactor The health factor of the position</span>
+<span id="L342"><span class="lineNum">     342</span>                 :             :    * @return The total debt of the user</span>
+<span id="L343"><span class="lineNum">     343</span>                 :             :    * @return The actual debt to liquidate as a function of the closeFactor</span>
+<span id="L344"><span class="lineNum">     344</span>                 :             :    */</span>
+<span id="L345"><span class="lineNum">     345</span>                 :             :   function _calculateDebt(</span>
+<span id="L346"><span class="lineNum">     346</span>                 :             :     DataTypes.ReserveCache memory debtReserveCache,</span>
+<span id="L347"><span class="lineNum">     347</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params,</span>
+<span id="L348"><span class="lineNum">     348</span>                 :             :     uint256 healthFactor</span>
+<span id="L349"><span class="lineNum">     349</span>                 :             :   ) internal view returns (uint256, uint256) {</span>
+<span id="L350"><span class="lineNum">     350</span>                 :<span class="tlaGNC">       14501 :     uint256 userVariableDebt = IERC20(debtReserveCache.variableDebtTokenAddress).balanceOf(</span></span>
+<span id="L351"><span class="lineNum">     351</span>                 :             :       params.user</span>
+<span id="L352"><span class="lineNum">     352</span>                 :             :     );</span>
+<span id="L353"><span class="lineNum">     353</span>                 :             : </span>
+<span id="L354"><span class="lineNum">     354</span>                 :<span class="tlaGNC">       14501 :     uint256 closeFactor = healthFactor &gt; CLOSE_FACTOR_HF_THRESHOLD</span></span>
+<span id="L355"><span class="lineNum">     355</span>                 :             :       ? DEFAULT_LIQUIDATION_CLOSE_FACTOR</span>
+<span id="L356"><span class="lineNum">     356</span>                 :             :       : MAX_LIQUIDATION_CLOSE_FACTOR;</span>
+<span id="L357"><span class="lineNum">     357</span>                 :             : </span>
+<span id="L358"><span class="lineNum">     358</span>                 :<span class="tlaGNC">       14501 :     uint256 maxLiquidatableDebt = userVariableDebt.percentMul(closeFactor);</span></span>
+<span id="L359"><span class="lineNum">     359</span>                 :             : </span>
+<span id="L360"><span class="lineNum">     360</span>                 :<span class="tlaGNC">       14501 :     uint256 actualDebtToLiquidate = params.debtToCover &gt; maxLiquidatableDebt</span></span>
+<span id="L361"><span class="lineNum">     361</span>                 :             :       ? maxLiquidatableDebt</span>
+<span id="L362"><span class="lineNum">     362</span>                 :             :       : params.debtToCover;</span>
+<span id="L363"><span class="lineNum">     363</span>                 :             : </span>
+<span id="L364"><span class="lineNum">     364</span>                 :<span class="tlaGNC">       14501 :     return (userVariableDebt, actualDebtToLiquidate);</span></span>
+<span id="L365"><span class="lineNum">     365</span>                 :             :   }</span>
+<span id="L366"><span class="lineNum">     366</span>                 :             : </span>
+<span id="L367"><span class="lineNum">     367</span>                 :             :   struct AvailableCollateralToLiquidateLocalVars {</span>
+<span id="L368"><span class="lineNum">     368</span>                 :             :     uint256 collateralPrice;</span>
+<span id="L369"><span class="lineNum">     369</span>                 :             :     uint256 debtAssetPrice;</span>
+<span id="L370"><span class="lineNum">     370</span>                 :             :     uint256 maxCollateralToLiquidate;</span>
+<span id="L371"><span class="lineNum">     371</span>                 :             :     uint256 baseCollateral;</span>
+<span id="L372"><span class="lineNum">     372</span>                 :             :     uint256 bonusCollateral;</span>
+<span id="L373"><span class="lineNum">     373</span>                 :             :     uint256 debtAssetDecimals;</span>
+<span id="L374"><span class="lineNum">     374</span>                 :             :     uint256 collateralDecimals;</span>
+<span id="L375"><span class="lineNum">     375</span>                 :             :     uint256 collateralAssetUnit;</span>
+<span id="L376"><span class="lineNum">     376</span>                 :             :     uint256 debtAssetUnit;</span>
+<span id="L377"><span class="lineNum">     377</span>                 :             :     uint256 collateralAmount;</span>
+<span id="L378"><span class="lineNum">     378</span>                 :             :     uint256 debtAmountNeeded;</span>
+<span id="L379"><span class="lineNum">     379</span>                 :             :     uint256 liquidationProtocolFeePercentage;</span>
+<span id="L380"><span class="lineNum">     380</span>                 :             :     uint256 liquidationProtocolFee;</span>
+<span id="L381"><span class="lineNum">     381</span>                 :             :   }</span>
+<span id="L382"><span class="lineNum">     382</span>                 :             : </span>
+<span id="L383"><span class="lineNum">     383</span>                 :             :   /**</span>
+<span id="L384"><span class="lineNum">     384</span>                 :             :    * @notice Calculates how much of a specific collateral can be liquidated, given</span>
+<span id="L385"><span class="lineNum">     385</span>                 :             :    * a certain amount of debt asset.</span>
+<span id="L386"><span class="lineNum">     386</span>                 :             :    * @dev This function needs to be called after all the checks to validate the liquidation have been performed,</span>
+<span id="L387"><span class="lineNum">     387</span>                 :             :    *   otherwise it might fail.</span>
+<span id="L388"><span class="lineNum">     388</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
+<span id="L389"><span class="lineNum">     389</span>                 :             :    * @param debtReserveCache The cached data of the debt reserve</span>
+<span id="L390"><span class="lineNum">     390</span>                 :             :    * @param collateralAsset The address of the underlying asset used as collateral, to receive as result of the liquidation</span>
+<span id="L391"><span class="lineNum">     391</span>                 :             :    * @param debtAsset The address of the underlying borrowed asset to be repaid with the liquidation</span>
+<span id="L392"><span class="lineNum">     392</span>                 :             :    * @param debtToCover The debt amount of borrowed `asset` the liquidator wants to cover</span>
+<span id="L393"><span class="lineNum">     393</span>                 :             :    * @param userCollateralBalance The collateral balance for the specific `collateralAsset` of the user being liquidated</span>
+<span id="L394"><span class="lineNum">     394</span>                 :             :    * @param liquidationBonus The collateral bonus percentage to receive as result of the liquidation</span>
+<span id="L395"><span class="lineNum">     395</span>                 :             :    * @return The maximum amount that is possible to liquidate given all the liquidation constraints (user balance, close factor)</span>
+<span id="L396"><span class="lineNum">     396</span>                 :             :    * @return The amount to repay with the liquidation</span>
+<span id="L397"><span class="lineNum">     397</span>                 :             :    * @return The fee taken from the liquidation bonus amount to be paid to the protocol</span>
 <span id="L398"><span class="lineNum">     398</span>                 :             :    */</span>
-<span id="L399"><span class="lineNum">     399</span>                 :<span class="tlaGNC">        6012 :   function _getConfigurationData(</span></span>
-<span id="L400"><span class="lineNum">     400</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L401"><span class="lineNum">     401</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
-<span id="L402"><span class="lineNum">     402</span>                 :             :     DataTypes.ExecuteLiquidationCallParams memory params</span>
-<span id="L403"><span class="lineNum">     403</span>                 :             :   ) internal view returns (IAToken, address, address, uint256) {</span>
-<span id="L404"><span class="lineNum">     404</span>                 :<span class="tlaGNC">       18036 :     IAToken collateralAToken = IAToken(collateralReserve.aTokenAddress);</span></span>
-<span id="L405"><span class="lineNum">     405</span>                 :<span class="tlaGNC">       18036 :     uint256 liquidationBonus = collateralReserve.configuration.getLiquidationBonus();</span></span>
-<span id="L406"><span class="lineNum">     406</span>                 :             : </span>
-<span id="L407"><span class="lineNum">     407</span>                 :<span class="tlaGNC">       12024 :     address collateralPriceSource = params.collateralAsset;</span></span>
-<span id="L408"><span class="lineNum">     408</span>                 :<span class="tlaGNC">       12024 :     address debtPriceSource = params.debtAsset;</span></span>
-<span id="L409"><span class="lineNum">     409</span>                 :             : </span>
-<span id="L410"><span class="lineNum">     410</span>                 :<span class="tlaGNC">       12024 :     if (params.userEModeCategory != 0) {</span></span>
-<span id="L411"><span class="lineNum">     411</span>                 :<span class="tlaGNC">           4 :       address eModePriceSource = eModeCategories[params.userEModeCategory].priceSource;</span></span>
-<span id="L412"><span class="lineNum">     412</span>                 :             : </span>
-<span id="L413"><span class="lineNum">     413</span>                 :             :       if (</span>
-<span id="L414"><span class="lineNum">     414</span>                 :<span class="tlaGNC">           4 :         EModeLogic.isInEModeCategory(</span></span>
-<span id="L415"><span class="lineNum">     415</span>                 :             :           params.userEModeCategory,</span>
-<span id="L416"><span class="lineNum">     416</span>                 :             :           collateralReserve.configuration.getEModeCategory()</span>
-<span id="L417"><span class="lineNum">     417</span>                 :             :         )</span>
-<span id="L418"><span class="lineNum">     418</span>                 :             :       ) {</span>
-<span id="L419"><span class="lineNum">     419</span>                 :<span class="tlaGNC">           4 :         liquidationBonus = eModeCategories[params.userEModeCategory].liquidationBonus;</span></span>
-<span id="L420"><span class="lineNum">     420</span>                 :             : </span>
-<span id="L421"><span class="lineNum">     421</span>                 :<span class="tlaGNC">           6 :         if (eModePriceSource != address(0)) {</span></span>
-<span id="L422"><span class="lineNum">     422</span>                 :<span class="tlaGNC">           2 :           collateralPriceSource = eModePriceSource;</span></span>
-<span id="L423"><span class="lineNum">     423</span>                 :             :         }</span>
-<span id="L424"><span class="lineNum">     424</span>                 :             :       }</span>
+<span id="L399"><span class="lineNum">     399</span>                 :             :   function _calculateAvailableCollateralToLiquidate(</span>
+<span id="L400"><span class="lineNum">     400</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
+<span id="L401"><span class="lineNum">     401</span>                 :             :     DataTypes.ReserveCache memory debtReserveCache,</span>
+<span id="L402"><span class="lineNum">     402</span>                 :             :     address collateralAsset,</span>
+<span id="L403"><span class="lineNum">     403</span>                 :             :     address debtAsset,</span>
+<span id="L404"><span class="lineNum">     404</span>                 :             :     uint256 debtToCover,</span>
+<span id="L405"><span class="lineNum">     405</span>                 :             :     uint256 userCollateralBalance,</span>
+<span id="L406"><span class="lineNum">     406</span>                 :             :     uint256 liquidationBonus,</span>
+<span id="L407"><span class="lineNum">     407</span>                 :             :     IPriceOracleGetter oracle</span>
+<span id="L408"><span class="lineNum">     408</span>                 :             :   ) internal view returns (uint256, uint256, uint256) {</span>
+<span id="L409"><span class="lineNum">     409</span>                 :<span class="tlaGNC">       12021 :     AvailableCollateralToLiquidateLocalVars memory vars;</span></span>
+<span id="L410"><span class="lineNum">     410</span>                 :             : </span>
+<span id="L411"><span class="lineNum">     411</span>                 :<span class="tlaGNC">       12021 :     vars.collateralPrice = oracle.getAssetPrice(collateralAsset);</span></span>
+<span id="L412"><span class="lineNum">     412</span>                 :<span class="tlaGNC">       12021 :     vars.debtAssetPrice = oracle.getAssetPrice(debtAsset);</span></span>
+<span id="L413"><span class="lineNum">     413</span>                 :             : </span>
+<span id="L414"><span class="lineNum">     414</span>                 :<span class="tlaGNC">       12021 :     vars.collateralDecimals = collateralReserve.configuration.getDecimals();</span></span>
+<span id="L415"><span class="lineNum">     415</span>                 :<span class="tlaGNC">       12021 :     vars.debtAssetDecimals = debtReserveCache.reserveConfiguration.getDecimals();</span></span>
+<span id="L416"><span class="lineNum">     416</span>                 :             : </span>
+<span id="L417"><span class="lineNum">     417</span>                 :             :     unchecked {</span>
+<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">       12021 :       vars.collateralAssetUnit = 10 ** vars.collateralDecimals;</span></span>
+<span id="L419"><span class="lineNum">     419</span>                 :<span class="tlaGNC">       12021 :       vars.debtAssetUnit = 10 ** vars.debtAssetDecimals;</span></span>
+<span id="L420"><span class="lineNum">     420</span>                 :             :     }</span>
+<span id="L421"><span class="lineNum">     421</span>                 :             : </span>
+<span id="L422"><span class="lineNum">     422</span>                 :<span class="tlaGNC">       12021 :     vars.liquidationProtocolFeePercentage = collateralReserve</span></span>
+<span id="L423"><span class="lineNum">     423</span>                 :             :       .configuration</span>
+<span id="L424"><span class="lineNum">     424</span>                 :             :       .getLiquidationProtocolFee();</span>
 <span id="L425"><span class="lineNum">     425</span>                 :             : </span>
-<span id="L426"><span class="lineNum">     426</span>                 :             :       // when in eMode, debt will always be in the same eMode category, can skip matching category check</span>
-<span id="L427"><span class="lineNum">     427</span>                 :<span class="tlaGNC">           6 :       if (eModePriceSource != address(0)) {</span></span>
-<span id="L428"><span class="lineNum">     428</span>                 :<span class="tlaGNC">           2 :         debtPriceSource = eModePriceSource;</span></span>
-<span id="L429"><span class="lineNum">     429</span>                 :             :       }</span>
-<span id="L430"><span class="lineNum">     430</span>                 :             :     }</span>
-<span id="L431"><span class="lineNum">     431</span>                 :             : </span>
-<span id="L432"><span class="lineNum">     432</span>                 :<span class="tlaGNC">       12024 :     return (collateralAToken, collateralPriceSource, debtPriceSource, liquidationBonus);</span></span>
-<span id="L433"><span class="lineNum">     433</span>                 :             :   }</span>
-<span id="L434"><span class="lineNum">     434</span>                 :             : </span>
-<span id="L435"><span class="lineNum">     435</span>                 :             :   struct AvailableCollateralToLiquidateLocalVars {</span>
-<span id="L436"><span class="lineNum">     436</span>                 :             :     uint256 collateralPrice;</span>
-<span id="L437"><span class="lineNum">     437</span>                 :             :     uint256 debtAssetPrice;</span>
-<span id="L438"><span class="lineNum">     438</span>                 :             :     uint256 maxCollateralToLiquidate;</span>
-<span id="L439"><span class="lineNum">     439</span>                 :             :     uint256 baseCollateral;</span>
-<span id="L440"><span class="lineNum">     440</span>                 :             :     uint256 bonusCollateral;</span>
-<span id="L441"><span class="lineNum">     441</span>                 :             :     uint256 debtAssetDecimals;</span>
-<span id="L442"><span class="lineNum">     442</span>                 :             :     uint256 collateralDecimals;</span>
-<span id="L443"><span class="lineNum">     443</span>                 :             :     uint256 collateralAssetUnit;</span>
-<span id="L444"><span class="lineNum">     444</span>                 :             :     uint256 debtAssetUnit;</span>
-<span id="L445"><span class="lineNum">     445</span>                 :             :     uint256 collateralAmount;</span>
-<span id="L446"><span class="lineNum">     446</span>                 :             :     uint256 debtAmountNeeded;</span>
-<span id="L447"><span class="lineNum">     447</span>                 :             :     uint256 liquidationProtocolFeePercentage;</span>
-<span id="L448"><span class="lineNum">     448</span>                 :             :     uint256 liquidationProtocolFee;</span>
-<span id="L449"><span class="lineNum">     449</span>                 :             :   }</span>
+<span id="L426"><span class="lineNum">     426</span>                 :             :     // This is the base collateral to liquidate based on the given debt to cover</span>
+<span id="L427"><span class="lineNum">     427</span>                 :<span class="tlaGNC">       12021 :     vars.baseCollateral =</span></span>
+<span id="L428"><span class="lineNum">     428</span>                 :             :       ((vars.debtAssetPrice * debtToCover * vars.collateralAssetUnit)) /</span>
+<span id="L429"><span class="lineNum">     429</span>                 :             :       (vars.collateralPrice * vars.debtAssetUnit);</span>
+<span id="L430"><span class="lineNum">     430</span>                 :             : </span>
+<span id="L431"><span class="lineNum">     431</span>                 :<span class="tlaGNC">       12021 :     vars.maxCollateralToLiquidate = vars.baseCollateral.percentMul(liquidationBonus);</span></span>
+<span id="L432"><span class="lineNum">     432</span>                 :             : </span>
+<span id="L433"><span class="lineNum">     433</span>                 :<span class="tlaGNC">       12021 :     if (vars.maxCollateralToLiquidate &gt; userCollateralBalance) {</span></span>
+<span id="L434"><span class="lineNum">     434</span>                 :<span class="tlaGNC">        1011 :       vars.collateralAmount = userCollateralBalance;</span></span>
+<span id="L435"><span class="lineNum">     435</span>                 :<span class="tlaGNC">        1011 :       vars.debtAmountNeeded = ((vars.collateralPrice * vars.collateralAmount * vars.debtAssetUnit) /</span></span>
+<span id="L436"><span class="lineNum">     436</span>                 :             :         (vars.debtAssetPrice * vars.collateralAssetUnit)).percentDiv(liquidationBonus);</span>
+<span id="L437"><span class="lineNum">     437</span>                 :             :     } else {</span>
+<span id="L438"><span class="lineNum">     438</span>                 :<span class="tlaGNC">       11010 :       vars.collateralAmount = vars.maxCollateralToLiquidate;</span></span>
+<span id="L439"><span class="lineNum">     439</span>                 :<span class="tlaGNC">       11010 :       vars.debtAmountNeeded = debtToCover;</span></span>
+<span id="L440"><span class="lineNum">     440</span>                 :             :     }</span>
+<span id="L441"><span class="lineNum">     441</span>                 :             : </span>
+<span id="L442"><span class="lineNum">     442</span>                 :<span class="tlaGNC">       12021 :     if (vars.liquidationProtocolFeePercentage != 0) {</span></span>
+<span id="L443"><span class="lineNum">     443</span>                 :<span class="tlaGNC">       12019 :       vars.bonusCollateral =</span></span>
+<span id="L444"><span class="lineNum">     444</span>                 :             :         vars.collateralAmount -</span>
+<span id="L445"><span class="lineNum">     445</span>                 :             :         vars.collateralAmount.percentDiv(liquidationBonus);</span>
+<span id="L446"><span class="lineNum">     446</span>                 :             : </span>
+<span id="L447"><span class="lineNum">     447</span>                 :<span class="tlaGNC">       12019 :       vars.liquidationProtocolFee = vars.bonusCollateral.percentMul(</span></span>
+<span id="L448"><span class="lineNum">     448</span>                 :             :         vars.liquidationProtocolFeePercentage</span>
+<span id="L449"><span class="lineNum">     449</span>                 :             :       );</span>
 <span id="L450"><span class="lineNum">     450</span>                 :             : </span>
-<span id="L451"><span class="lineNum">     451</span>                 :             :   /**</span>
-<span id="L452"><span class="lineNum">     452</span>                 :             :    * @notice Calculates how much of a specific collateral can be liquidated, given</span>
-<span id="L453"><span class="lineNum">     453</span>                 :             :    * a certain amount of debt asset.</span>
-<span id="L454"><span class="lineNum">     454</span>                 :             :    * @dev This function needs to be called after all the checks to validate the liquidation have been performed,</span>
-<span id="L455"><span class="lineNum">     455</span>                 :             :    *   otherwise it might fail.</span>
-<span id="L456"><span class="lineNum">     456</span>                 :             :    * @param collateralReserve The data of the collateral reserve</span>
-<span id="L457"><span class="lineNum">     457</span>                 :             :    * @param debtReserveCache The cached data of the debt reserve</span>
-<span id="L458"><span class="lineNum">     458</span>                 :             :    * @param collateralAsset The address of the underlying asset used as collateral, to receive as result of the liquidation</span>
-<span id="L459"><span class="lineNum">     459</span>                 :             :    * @param debtAsset The address of the underlying borrowed asset to be repaid with the liquidation</span>
-<span id="L460"><span class="lineNum">     460</span>                 :             :    * @param debtToCover The debt amount of borrowed `asset` the liquidator wants to cover</span>
-<span id="L461"><span class="lineNum">     461</span>                 :             :    * @param userCollateralBalance The collateral balance for the specific `collateralAsset` of the user being liquidated</span>
-<span id="L462"><span class="lineNum">     462</span>                 :             :    * @param liquidationBonus The collateral bonus percentage to receive as result of the liquidation</span>
-<span id="L463"><span class="lineNum">     463</span>                 :             :    * @return The maximum amount that is possible to liquidate given all the liquidation constraints (user balance, close factor)</span>
-<span id="L464"><span class="lineNum">     464</span>                 :             :    * @return The amount to repay with the liquidation</span>
-<span id="L465"><span class="lineNum">     465</span>                 :             :    * @return The fee taken from the liquidation bonus amount to be paid to the protocol</span>
-<span id="L466"><span class="lineNum">     466</span>                 :             :    */</span>
-<span id="L467"><span class="lineNum">     467</span>                 :<span class="tlaGNC">        9023 :   function _calculateAvailableCollateralToLiquidate(</span></span>
-<span id="L468"><span class="lineNum">     468</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
-<span id="L469"><span class="lineNum">     469</span>                 :             :     DataTypes.ReserveCache memory debtReserveCache,</span>
-<span id="L470"><span class="lineNum">     470</span>                 :             :     address collateralAsset,</span>
-<span id="L471"><span class="lineNum">     471</span>                 :             :     address debtAsset,</span>
-<span id="L472"><span class="lineNum">     472</span>                 :             :     uint256 debtToCover,</span>
-<span id="L473"><span class="lineNum">     473</span>                 :             :     uint256 userCollateralBalance,</span>
-<span id="L474"><span class="lineNum">     474</span>                 :             :     uint256 liquidationBonus,</span>
-<span id="L475"><span class="lineNum">     475</span>                 :             :     IPriceOracleGetter oracle</span>
-<span id="L476"><span class="lineNum">     476</span>                 :             :   ) internal view returns (uint256, uint256, uint256) {</span>
-<span id="L477"><span class="lineNum">     477</span>                 :<span class="tlaGNC">       18046 :     AvailableCollateralToLiquidateLocalVars memory vars;</span></span>
-<span id="L478"><span class="lineNum">     478</span>                 :             : </span>
-<span id="L479"><span class="lineNum">     479</span>                 :<span class="tlaGNC">       18046 :     vars.collateralPrice = oracle.getAssetPrice(collateralAsset);</span></span>
-<span id="L480"><span class="lineNum">     480</span>                 :<span class="tlaGNC">       18046 :     vars.debtAssetPrice = oracle.getAssetPrice(debtAsset);</span></span>
-<span id="L481"><span class="lineNum">     481</span>                 :             : </span>
-<span id="L482"><span class="lineNum">     482</span>                 :<span class="tlaGNC">       18046 :     vars.collateralDecimals = collateralReserve.configuration.getDecimals();</span></span>
-<span id="L483"><span class="lineNum">     483</span>                 :<span class="tlaGNC">       18046 :     vars.debtAssetDecimals = debtReserveCache.reserveConfiguration.getDecimals();</span></span>
-<span id="L484"><span class="lineNum">     484</span>                 :             : </span>
-<span id="L485"><span class="lineNum">     485</span>                 :             :     unchecked {</span>
-<span id="L486"><span class="lineNum">     486</span>                 :<span class="tlaGNC">       18046 :       vars.collateralAssetUnit = 10 ** vars.collateralDecimals;</span></span>
-<span id="L487"><span class="lineNum">     487</span>                 :<span class="tlaGNC">       18046 :       vars.debtAssetUnit = 10 ** vars.debtAssetDecimals;</span></span>
-<span id="L488"><span class="lineNum">     488</span>                 :             :     }</span>
-<span id="L489"><span class="lineNum">     489</span>                 :             : </span>
-<span id="L490"><span class="lineNum">     490</span>                 :<span class="tlaGNC">       18046 :     vars.liquidationProtocolFeePercentage = collateralReserve</span></span>
-<span id="L491"><span class="lineNum">     491</span>                 :             :       .configuration</span>
-<span id="L492"><span class="lineNum">     492</span>                 :             :       .getLiquidationProtocolFee();</span>
-<span id="L493"><span class="lineNum">     493</span>                 :             : </span>
-<span id="L494"><span class="lineNum">     494</span>                 :             :     // This is the base collateral to liquidate based on the given debt to cover</span>
-<span id="L495"><span class="lineNum">     495</span>                 :<span class="tlaGNC">       18046 :     vars.baseCollateral =</span></span>
-<span id="L496"><span class="lineNum">     496</span>                 :             :       ((vars.debtAssetPrice * debtToCover * vars.collateralAssetUnit)) /</span>
-<span id="L497"><span class="lineNum">     497</span>                 :             :       (vars.collateralPrice * vars.debtAssetUnit);</span>
-<span id="L498"><span class="lineNum">     498</span>                 :             : </span>
-<span id="L499"><span class="lineNum">     499</span>                 :<span class="tlaGNC">       18046 :     vars.maxCollateralToLiquidate = vars.baseCollateral.percentMul(liquidationBonus);</span></span>
-<span id="L500"><span class="lineNum">     500</span>                 :             : </span>
-<span id="L501"><span class="lineNum">     501</span>                 :<span class="tlaGNC">       18046 :     if (vars.maxCollateralToLiquidate &gt; userCollateralBalance) {</span></span>
-<span id="L502"><span class="lineNum">     502</span>                 :<span class="tlaGNC">          22 :       vars.collateralAmount = userCollateralBalance;</span></span>
-<span id="L503"><span class="lineNum">     503</span>                 :<span class="tlaGNC">          22 :       vars.debtAmountNeeded = ((vars.collateralPrice * vars.collateralAmount * vars.debtAssetUnit) /</span></span>
-<span id="L504"><span class="lineNum">     504</span>                 :             :         (vars.debtAssetPrice * vars.collateralAssetUnit)).percentDiv(liquidationBonus);</span>
-<span id="L505"><span class="lineNum">     505</span>                 :             :     } else {</span>
-<span id="L506"><span class="lineNum">     506</span>                 :<span class="tlaGNC">       18024 :       vars.collateralAmount = vars.maxCollateralToLiquidate;</span></span>
-<span id="L507"><span class="lineNum">     507</span>                 :<span class="tlaGNC">       18024 :       vars.debtAmountNeeded = debtToCover;</span></span>
-<span id="L508"><span class="lineNum">     508</span>                 :             :     }</span>
-<span id="L509"><span class="lineNum">     509</span>                 :             : </span>
-<span id="L510"><span class="lineNum">     510</span>                 :<span class="tlaGNC">       18046 :     if (vars.liquidationProtocolFeePercentage != 0) {</span></span>
-<span id="L511"><span class="lineNum">     511</span>                 :<span class="tlaGNC">       18042 :       vars.bonusCollateral =</span></span>
-<span id="L512"><span class="lineNum">     512</span>                 :             :         vars.collateralAmount -</span>
-<span id="L513"><span class="lineNum">     513</span>                 :             :         vars.collateralAmount.percentDiv(liquidationBonus);</span>
-<span id="L514"><span class="lineNum">     514</span>                 :             : </span>
-<span id="L515"><span class="lineNum">     515</span>                 :<span class="tlaGNC">       18042 :       vars.liquidationProtocolFee = vars.bonusCollateral.percentMul(</span></span>
-<span id="L516"><span class="lineNum">     516</span>                 :             :         vars.liquidationProtocolFeePercentage</span>
-<span id="L517"><span class="lineNum">     517</span>                 :             :       );</span>
-<span id="L518"><span class="lineNum">     518</span>                 :             : </span>
-<span id="L519"><span class="lineNum">     519</span>                 :<span class="tlaGNC">       18042 :       return (</span></span>
-<span id="L520"><span class="lineNum">     520</span>                 :             :         vars.collateralAmount - vars.liquidationProtocolFee,</span>
-<span id="L521"><span class="lineNum">     521</span>                 :             :         vars.debtAmountNeeded,</span>
-<span id="L522"><span class="lineNum">     522</span>                 :             :         vars.liquidationProtocolFee</span>
-<span id="L523"><span class="lineNum">     523</span>                 :             :       );</span>
-<span id="L524"><span class="lineNum">     524</span>                 :             :     } else {</span>
-<span id="L525"><span class="lineNum">     525</span>                 :<span class="tlaGNC">           4 :       return (vars.collateralAmount, vars.debtAmountNeeded, 0);</span></span>
-<span id="L526"><span class="lineNum">     526</span>                 :             :     }</span>
-<span id="L527"><span class="lineNum">     527</span>                 :             :   }</span>
-<span id="L528"><span class="lineNum">     528</span>                 :             : }</span>
+<span id="L451"><span class="lineNum">     451</span>                 :<span class="tlaGNC">       12019 :       return (</span></span>
+<span id="L452"><span class="lineNum">     452</span>                 :             :         vars.collateralAmount - vars.liquidationProtocolFee,</span>
+<span id="L453"><span class="lineNum">     453</span>                 :             :         vars.debtAmountNeeded,</span>
+<span id="L454"><span class="lineNum">     454</span>                 :             :         vars.liquidationProtocolFee</span>
+<span id="L455"><span class="lineNum">     455</span>                 :             :       );</span>
+<span id="L456"><span class="lineNum">     456</span>                 :             :     } else {</span>
+<span id="L457"><span class="lineNum">     457</span>                 :<span class="tlaGNC">           2 :       return (vars.collateralAmount, vars.debtAmountNeeded, 0);</span></span>
+<span id="L458"><span class="lineNum">     458</span>                 :             :     }</span>
+<span id="L459"><span class="lineNum">     459</span>                 :             :   }</span>
+<span id="L460"><span class="lineNum">     460</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -604,8 +536,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func-c.html b/report/protocol/libraries/logic/PoolLogic.sol.func-c.html
similarity index 66%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func-c.html
rename to report/protocol/libraries/logic/PoolLogic.sol.func-c.html
index dfb17312..3fcf8767 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/PoolLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/PoolLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (<a href="PoolLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (<a href="PoolLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,70 +53,70 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L82">PoolLogic.executeMintToTreasury</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L81">PoolLogic.executeMintToTreasury</a></td>
               
               <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L144">PoolLogic.executeDropReserve</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L143">PoolLogic.executeDropReserve</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L115">PoolLogic.executeResetIsolationModeTotalDebt</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L114">PoolLogic.executeResetIsolationModeTotalDebt</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">1951</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L73">PoolLogic.executeRescueTokens</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L72">PoolLogic.executeRescueTokens</a></td>
               
               <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L36">PoolLogic.executeInitReserve</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L167">PoolLogic.executeGetUserAccountData</a></td>
               
-              <td class="coverFnHi">2889</td>
+              <td class="coverFnHi">10015</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L168">PoolLogic.executeGetUserAccountData</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L129">PoolLogic.executeSetLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">3013</td>
+              <td class="coverFnHi">12412</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L130">PoolLogic.executeSetLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L36">PoolLogic.executeInitReserve</a></td>
               
-              <td class="coverFnHi">9028</td>
+              <td class="coverFnHi">166023</td>
               
               
             </tr>
@@ -124,8 +124,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func.html b/report/protocol/libraries/logic/PoolLogic.sol.func.html
similarity index 66%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func.html
rename to report/protocol/libraries/logic/PoolLogic.sol.func.html
index 6cd89e2d..63ec4fd8 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.func.html
+++ b/report/protocol/libraries/logic/PoolLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/PoolLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (<a href="PoolLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (<a href="PoolLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,70 +53,70 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L144">PoolLogic.executeDropReserve</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L143">PoolLogic.executeDropReserve</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L168">PoolLogic.executeGetUserAccountData</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L167">PoolLogic.executeGetUserAccountData</a></td>
               
-              <td class="coverFnHi">3013</td>
+              <td class="coverFnHi">10015</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L36">PoolLogic.executeInitReserve</a></td>
               
-              <td class="coverFnHi">2889</td>
+              <td class="coverFnHi">166023</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L82">PoolLogic.executeMintToTreasury</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L81">PoolLogic.executeMintToTreasury</a></td>
               
               <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L73">PoolLogic.executeRescueTokens</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L72">PoolLogic.executeRescueTokens</a></td>
               
               <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L115">PoolLogic.executeResetIsolationModeTotalDebt</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L114">PoolLogic.executeResetIsolationModeTotalDebt</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">1951</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L130">PoolLogic.executeSetLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="PoolLogic.sol.gcov.html#L129">PoolLogic.executeSetLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">9028</td>
+              <td class="coverFnHi">12412</td>
               
               
             </tr>
@@ -124,8 +124,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.gcov.html b/report/protocol/libraries/logic/PoolLogic.sol.gcov.html
similarity index 86%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.gcov.html
rename to report/protocol/libraries/logic/PoolLogic.sol.gcov.html
index 1b87cbfe..bc54127d 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/PoolLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/PoolLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/PoolLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (source / <a href="PoolLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - PoolLogic.sol<span style="font-size: 80%;"> (source / <a href="PoolLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -106,171 +106,170 @@
 <span id="L35"><span class="lineNum">      35</span>                 :             :    * @param params Additional parameters needed for initiation</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :    * @return true if appended, false if inserted at existing empty spot</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :    */</span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC tlaBgGNC">        2889 :   function executeInitReserve(</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   function executeInitReserve(</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :     DataTypes.InitReserveParams memory params</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   ) external returns (bool) {</span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">        5778 :     require(Address.isContract(params.asset), Errors.NOT_CONTRACT);</span></span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">        5778 :     reservesData[params.asset].init(</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC tlaBgGNC">      166023 :     require(Address.isContract(params.asset), Errors.NOT_CONTRACT);</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">      166023 :     reservesData[params.asset].init(</span></span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :       params.aTokenAddress,</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :       params.stableDebtAddress,</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :       params.variableDebtAddress,</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :       params.interestRateStrategyAddress</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     );</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             : </span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">       11552 :     bool reserveAlreadyAdded = reservesData[params.asset].id != 0 ||</span></span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">        5776 :       reservesList[0] == params.asset;</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">        5776 :     require(!reserveAlreadyAdded, Errors.RESERVE_ALREADY_ADDED);</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :             : </span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">       34740 :     for (uint16 i = 0; i &lt; params.reservesCount; i++) {</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">       39117 :       if (reservesList[i] == address(0)) {</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           2 :         reservesData[params.asset].id = i;</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           2 :         reservesList[i] = params.asset;</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           2 :         return false;</span></span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :       }</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :     }</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             : </span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">        5774 :     require(params.reservesCount &lt; params.maxNumberReserves, Errors.NO_MORE_RESERVES_ALLOWED);</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">        5770 :     reservesData[params.asset].id = params.reservesCount;</span></span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">        5770 :     reservesList[params.reservesCount] = params.asset;</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">        5770 :     return true;</span></span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :   }</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             : </span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :   /**</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :    * @notice Rescue and transfer tokens locked in this contract</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :    * @param token The address of the token</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :    * @param to The address of the recipient</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :    * @param amount The amount of token to transfer</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :    */</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        2000 :   function executeRescueTokens(address token, address to, uint256 amount) external {</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">        4000 :     IERC20(token).safeTransfer(to, amount);</span></span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :   /**</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :    * @notice Mints the assets accrued through the reserve factor to the treasury in the form of aTokens</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :    * @param assets The list of reserves for which the minting needs to be executed</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :    */</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           4 :   function executeMintToTreasury(</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :     address[] calldata assets</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :   ) external {</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          24 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">          12 :       address assetAddress = assets[i];</span></span>
-<span id="L90"><span class="lineNum">      90</span>                 :             : </span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">          12 :       DataTypes.ReserveData storage reserve = reservesData[assetAddress];</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :             : </span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :       // this cover both inactive reserves and invalid reserves since the flag will be 0 for both</span>
-<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">          12 :       if (!reserve.configuration.getActive()) {</span></span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           4 :         continue;</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :       }</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             : </span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           8 :       uint256 accruedToTreasury = reserve.accruedToTreasury;</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           8 :       if (accruedToTreasury != 0) {</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           8 :         reserve.accruedToTreasury = 0;</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">          12 :         uint256 normalizedIncome = reserve.getNormalizedIncome();</span></span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">          12 :         uint256 amountToMint = accruedToTreasury.rayMul(normalizedIncome);</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           8 :         IAToken(reserve.aTokenAddress).mintToTreasury(amountToMint, normalizedIncome);</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           8 :         emit MintedToTreasury(assetAddress, amountToMint);</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :       }</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :     }</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   }</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             : </span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :   /**</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :    * @notice Resets the isolation mode total debt of the given asset to zero</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :    * @dev It requires the given asset has zero debt ceiling</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :    * @param asset The address of the underlying asset to reset the isolationModeTotalDebt</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :    */</span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">        1751 :   function executeResetIsolationModeTotalDebt(</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :     address asset</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :   ) external {</span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">        3502 :     require(reservesData[asset].configuration.getDebtCeiling() == 0, Errors.DEBT_CEILING_NOT_ZERO);</span></span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        3502 :     reservesData[asset].isolationModeTotalDebt = 0;</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        3502 :     emit IsolationModeTotalDebtUpdated(asset, 0);</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :   }</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             : </span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :   /**</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :    * @notice Sets the liquidation grace period of the asset</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :    * @param asset The address of the underlying asset to set the liquidationGracePeriod</span>
-<span id="L130"><span class="lineNum">     130</span>                 :             :    * @param until Timestamp when the liquidation grace period will end</span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :    */</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">        9028 :   function executeSetLiquidationGracePeriod(</span></span>
-<span id="L133"><span class="lineNum">     133</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :     address asset,</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :     uint40 until</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :   ) external {</span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">       18056 :     reservesData[asset].liquidationGracePeriodUntil = until;</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :   }</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             : </span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   /**</span>
-<span id="L141"><span class="lineNum">     141</span>                 :             :    * @notice Drop a reserve</span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :    * @param asset The address of the underlying asset of the reserve</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :    */</span>
-<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">           9 :   function executeDropReserve(</span></span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :     address asset</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :   ) external {</span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">          18 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">          18 :     ValidationLogic.validateDropReserve(reservesList, reserve, asset);</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">          10 :     reservesList[reservesData[asset].id] = address(0);</span></span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">          10 :     delete reservesData[asset];</span></span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :   }</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             : </span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :   /**</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :    * @notice Returns the user account data across all the reserves</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :    * @param params Additional params needed for the calculation</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :    * @return totalCollateralBase The total collateral of the user in the base currency used by the price feed</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :    * @return totalDebtBase The total debt of the user in the base currency used by the price feed</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :    * @return availableBorrowsBase The borrowing power left of the user in the base currency used by the price feed</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :    * @return currentLiquidationThreshold The liquidation threshold of the user</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :    * @return ltv The loan to value of The user</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :    * @return healthFactor The current health factor of the user</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :    */</span>
-<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">        3013 :   function executeGetUserAccountData(</span></span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :     DataTypes.CalculateUserAccountDataParams memory params</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :   )</span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :     external</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :     view</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :     returns (</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :       uint256 totalCollateralBase,</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :       uint256 totalDebtBase,</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :       uint256 availableBorrowsBase,</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :       uint256 currentLiquidationThreshold,</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :       uint256 ltv,</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :       uint256 healthFactor</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :     )</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :   {</span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">        6026 :     (</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :             :       totalCollateralBase,</span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :       totalDebtBase,</span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :       ltv,</span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :       currentLiquidationThreshold,</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :       healthFactor,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             : </span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :     ) = GenericLogic.calculateUserAccountData(reservesData, reservesList, eModeCategories, params);</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             : </span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">        6026 :     availableBorrowsBase = GenericLogic.calculateAvailableBorrows(</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :       totalCollateralBase,</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :       totalDebtBase,</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :       ltv</span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :     );</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :   }</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             : }</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :       params.variableDebtAddress,</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :       params.interestRateStrategyAddress</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :     );</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             : </span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">      166022 :     bool reserveAlreadyAdded = reservesData[params.asset].id != 0 ||</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">      166022 :       reservesList[0] == params.asset;</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">      166022 :     require(!reserveAlreadyAdded, Errors.RESERVE_ALREADY_ADDED);</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             : </span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">      166022 :     for (uint16 i = 0; i &lt; params.reservesCount; i++) {</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">     9608022 :       if (reservesList[i] == address(0)) {</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           1 :         reservesData[params.asset].id = i;</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           1 :         reservesList[i] = params.asset;</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           1 :         return false;</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :       }</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :     }</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             : </span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">      166021 :     require(params.reservesCount &lt; params.maxNumberReserves, Errors.NO_MORE_RESERVES_ALLOWED);</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">      165020 :     reservesData[params.asset].id = params.reservesCount;</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">      165020 :     reservesList[params.reservesCount] = params.asset;</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">      165020 :     return true;</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   }</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             : </span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :   /**</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :    * @notice Rescue and transfer tokens locked in this contract</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :    * @param token The address of the token</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :    * @param to The address of the recipient</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :    * @param amount The amount of token to transfer</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :    */</span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :   function executeRescueTokens(address token, address to, uint256 amount) external {</span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        2000 :     IERC20(token).safeTransfer(to, amount);</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :   }</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             : </span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :   /**</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :    * @notice Mints the assets accrued through the reserve factor to the treasury in the form of aTokens</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :    * @param assets The list of reserves for which the minting needs to be executed</span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :    */</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function executeMintToTreasury(</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :     address[] calldata assets</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :   ) external {</span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">           4 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">           6 :       address assetAddress = assets[i];</span></span>
+<span id="L89"><span class="lineNum">      89</span>                 :             : </span>
+<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">           6 :       DataTypes.ReserveData storage reserve = reservesData[assetAddress];</span></span>
+<span id="L91"><span class="lineNum">      91</span>                 :             : </span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :       // this cover both inactive reserves and invalid reserves since the flag will be 0 for both</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">           6 :       if (!reserve.configuration.getActive()) {</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :<span class="tlaGNC">           2 :         continue;</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :       }</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             : </span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           4 :       uint256 accruedToTreasury = reserve.accruedToTreasury;</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :             : </span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">           4 :       if (accruedToTreasury != 0) {</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           4 :         reserve.accruedToTreasury = 0;</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           4 :         uint256 normalizedIncome = reserve.getNormalizedIncome();</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           4 :         uint256 amountToMint = accruedToTreasury.rayMul(normalizedIncome);</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">           4 :         IAToken(reserve.aTokenAddress).mintToTreasury(amountToMint, normalizedIncome);</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           4 :         emit MintedToTreasury(assetAddress, amountToMint);</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :       }</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     }</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             : </span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   /**</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :    * @notice Resets the isolation mode total debt of the given asset to zero</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :    * @dev It requires the given asset has zero debt ceiling</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :    * @param asset The address of the underlying asset to reset the isolationModeTotalDebt</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :    */</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function executeResetIsolationModeTotalDebt(</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :     address asset</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :   ) external {</span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">        1951 :     require(reservesData[asset].configuration.getDebtCeiling() == 0, Errors.DEBT_CEILING_NOT_ZERO);</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">        1951 :     reservesData[asset].isolationModeTotalDebt = 0;</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        1951 :     emit IsolationModeTotalDebtUpdated(asset, 0);</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   }</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             : </span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   /**</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :    * @notice Sets the liquidation grace period of the asset</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :    * @param asset The address of the underlying asset to set the liquidationGracePeriod</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :    * @param until Timestamp when the liquidation grace period will end</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :    */</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :   function executeSetLiquidationGracePeriod(</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :     address asset,</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :     uint40 until</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :   ) external {</span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       12412 :     reservesData[asset].liquidationGracePeriodUntil = until;</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :   }</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             : </span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :   /**</span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :    * @notice Drop a reserve</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :    * @param asset The address of the underlying asset of the reserve</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :    */</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :   function executeDropReserve(</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :     address asset</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :   ) external {</span>
+<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">           9 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
+<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           9 :     ValidationLogic.validateDropReserve(reservesList, reserve, asset);</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           5 :     reservesList[reservesData[asset].id] = address(0);</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">           5 :     delete reservesData[asset];</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   }</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             : </span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :   /**</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :    * @notice Returns the user account data across all the reserves</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :    * @param params Additional params needed for the calculation</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :    * @return totalCollateralBase The total collateral of the user in the base currency used by the price feed</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :    * @return totalDebtBase The total debt of the user in the base currency used by the price feed</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :    * @return availableBorrowsBase The borrowing power left of the user in the base currency used by the price feed</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :    * @return currentLiquidationThreshold The liquidation threshold of the user</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :    * @return ltv The loan to value of The user</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :    * @return healthFactor The current health factor of the user</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :    */</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :   function executeGetUserAccountData(</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :     DataTypes.CalculateUserAccountDataParams memory params</span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :   )</span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :     external</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :     view</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :     returns (</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :       uint256 totalCollateralBase,</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :       uint256 totalDebtBase,</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :       uint256 availableBorrowsBase,</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :       uint256 currentLiquidationThreshold,</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :       uint256 ltv,</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :       uint256 healthFactor</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :     )</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :   {</span>
+<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">       10015 :     (</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :       totalCollateralBase,</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :       totalDebtBase,</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :       ltv,</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :       currentLiquidationThreshold,</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :       healthFactor,</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             : </span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :     ) = GenericLogic.calculateUserAccountData(reservesData, reservesList, eModeCategories, params);</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             : </span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">       10015 :     availableBorrowsBase = GenericLogic.calculateAvailableBorrows(</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :       totalCollateralBase,</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :       totalDebtBase,</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :       ltv</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :     );</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :   }</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -278,8 +277,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func-c.html b/report/protocol/libraries/logic/SupplyLogic.sol.func-c.html
similarity index 68%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func-c.html
rename to report/protocol/libraries/logic/SupplyLogic.sol.func-c.html
index 452c1606..f464f30d 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/SupplyLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/SupplyLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (<a href="SupplyLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (<a href="SupplyLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="SupplyLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="SupplyLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -81,21 +81,21 @@
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L104">SupplyLogic.executeWithdraw</a></td>
               
-              <td class="coverFnHi">45</td>
+              <td class="coverFnHi">2045</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L177">SupplyLogic.executeFinalizeTransfer</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L50">SupplyLogic.executeSupply</a></td>
               
-              <td class="coverFnHi">13582</td>
+              <td class="coverFnHi">44515</td>
               
               
             </tr>
@@ -103,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func.html b/report/protocol/libraries/logic/SupplyLogic.sol.func.html
similarity index 68%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func.html
rename to report/protocol/libraries/logic/SupplyLogic.sol.func.html
index 039c5115..88a637ef 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.func.html
+++ b/report/protocol/libraries/logic/SupplyLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/SupplyLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (<a href="SupplyLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (<a href="SupplyLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="SupplyLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="SupplyLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L177">SupplyLogic.executeFinalizeTransfer</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L50">SupplyLogic.executeSupply</a></td>
               
-              <td class="coverFnHi">13582</td>
+              <td class="coverFnHi">44515</td>
               
               
             </tr>
@@ -95,7 +95,7 @@
             <tr>
               <td class="coverFn"><a href="SupplyLogic.sol.gcov.html#L104">SupplyLogic.executeWithdraw</a></td>
               
-              <td class="coverFnHi">45</td>
+              <td class="coverFnHi">2045</td>
               
               
             </tr>
@@ -103,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.gcov.html b/report/protocol/libraries/logic/SupplyLogic.sol.gcov.html
similarity index 88%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.gcov.html
rename to report/protocol/libraries/logic/SupplyLogic.sol.gcov.html
index 5d94b67a..c4930385 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/SupplyLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/SupplyLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (source / <a href="SupplyLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - SupplyLogic.sol<span style="font-size: 80%;"> (source / <a href="SupplyLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -120,33 +120,33 @@
 <span id="L49"><span class="lineNum">      49</span>                 :             :    * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :    * @param params The additional parameters needed to execute the supply function</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :    */</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC tlaBgGNC">       13582 :   function executeSupply(</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   function executeSupply(</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :     DataTypes.ExecuteSupplyParams memory params</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   ) external {</span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       27164 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">       40746 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC tlaBgGNC">       44515 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">       44515 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
 <span id="L60"><span class="lineNum">      60</span>                 :             : </span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">       27164 :     reserve.updateState(reserveCache);</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">       44515 :     reserve.updateState(reserveCache);</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       27164 :     ValidationLogic.validateSupply(reserveCache, reserve, params.amount, params.onBehalfOf);</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       44515 :     ValidationLogic.validateSupply(reserveCache, reserve, params.amount, params.onBehalfOf);</span></span>
 <span id="L64"><span class="lineNum">      64</span>                 :             : </span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">       27148 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, params.amount, 0);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">       44507 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, params.amount, 0);</span></span>
 <span id="L66"><span class="lineNum">      66</span>                 :             : </span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">       27146 :     IERC20(params.asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, params.amount);</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">       44506 :     IERC20(params.asset).safeTransferFrom(msg.sender, reserveCache.aTokenAddress, params.amount);</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">       37719 :     bool isFirstSupply = IAToken(reserveCache.aTokenAddress).mint(</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">       43506 :     bool isFirstSupply = IAToken(reserveCache.aTokenAddress).mint(</span></span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :       msg.sender,</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :       params.onBehalfOf,</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :       params.amount,</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :       reserveCache.nextLiquidityIndex</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :     );</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             : </span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       12573 :     if (isFirstSupply) {</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       43506 :     if (isFirstSupply) {</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :       if (</span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       25094 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       43501 :         ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :           reservesData,</span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :           reservesList,</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :           userConfig,</span>
@@ -154,12 +154,12 @@
 <span id="L83"><span class="lineNum">      83</span>                 :             :           reserveCache.aTokenAddress</span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :         )</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :       ) {</span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       25068 :         userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">       25068 :         emit ReserveUsedAsCollateralEnabled(params.asset, params.onBehalfOf);</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       43488 :         userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">       43488 :         emit ReserveUsedAsCollateralEnabled(params.asset, params.onBehalfOf);</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :       }</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :     }</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">       25146 :     emit Supply(params.asset, msg.sender, params.onBehalfOf, params.amount, params.referralCode);</span></span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">       43506 :     emit Supply(params.asset, msg.sender, params.onBehalfOf, params.amount, params.referralCode);</span></span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   }</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             : </span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :   /**</span>
@@ -174,50 +174,50 @@
 <span id="L103"><span class="lineNum">     103</span>                 :             :    * @param params The additional parameters needed to execute the withdraw function</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :    * @return The actual amount withdrawn</span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :    */</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          45 :   function executeWithdraw(</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   function executeWithdraw(</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L109"><span class="lineNum">     109</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
 <span id="L110"><span class="lineNum">     110</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
 <span id="L111"><span class="lineNum">     111</span>                 :             :     DataTypes.ExecuteWithdrawParams memory params</span>
 <span id="L112"><span class="lineNum">     112</span>                 :             :   ) external returns (uint256) {</span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">          90 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">         135 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">        2045 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">        2045 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
 <span id="L115"><span class="lineNum">     115</span>                 :             : </span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">          90 :     require(params.to != reserveCache.aTokenAddress, Errors.WITHDRAW_TO_ATOKEN);</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">        2045 :     require(params.to != reserveCache.aTokenAddress, Errors.WITHDRAW_TO_ATOKEN);</span></span>
 <span id="L117"><span class="lineNum">     117</span>                 :             : </span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">          88 :     reserve.updateState(reserveCache);</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">        2044 :     reserve.updateState(reserveCache);</span></span>
 <span id="L119"><span class="lineNum">     119</span>                 :             : </span>
-<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">         132 :     uint256 userBalance = IAToken(reserveCache.aTokenAddress).scaledBalanceOf(msg.sender).rayMul(</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">        2044 :     uint256 userBalance = IAToken(reserveCache.aTokenAddress).scaledBalanceOf(msg.sender).rayMul(</span></span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :       reserveCache.nextLiquidityIndex</span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :     );</span>
 <span id="L123"><span class="lineNum">     123</span>                 :             : </span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">          88 :     uint256 amountToWithdraw = params.amount;</span></span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        2044 :     uint256 amountToWithdraw = params.amount;</span></span>
 <span id="L125"><span class="lineNum">     125</span>                 :             : </span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">          88 :     if (params.amount == type(uint256).max) {</span></span>
-<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">          10 :       amountToWithdraw = userBalance;</span></span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">        2044 :     if (params.amount == type(uint256).max) {</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">           5 :       amountToWithdraw = userBalance;</span></span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     }</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             : </span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">          88 :     ValidationLogic.validateWithdraw(reserveCache, amountToWithdraw, userBalance);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        2044 :     ValidationLogic.validateWithdraw(reserveCache, amountToWithdraw, userBalance);</span></span>
 <span id="L131"><span class="lineNum">     131</span>                 :             : </span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">          80 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, 0, amountToWithdraw);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">        2040 :     reserve.updateInterestRatesAndVirtualBalance(reserveCache, params.asset, 0, amountToWithdraw);</span></span>
 <span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">         111 :     bool isCollateral = userConfig.isUsingAsCollateral(reserve.id);</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">        2037 :     bool isCollateral = userConfig.isUsingAsCollateral(reserve.id);</span></span>
 <span id="L135"><span class="lineNum">     135</span>                 :             : </span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">         110 :     if (isCollateral &amp;&amp; amountToWithdraw == userBalance) {</span></span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">          60 :       userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">          60 :       emit ReserveUsedAsCollateralDisabled(params.asset, msg.sender);</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">        2037 :     if (isCollateral &amp;&amp; amountToWithdraw == userBalance) {</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        2030 :       userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">        2030 :       emit ReserveUsedAsCollateralDisabled(params.asset, msg.sender);</span></span>
 <span id="L139"><span class="lineNum">     139</span>                 :             :     }</span>
 <span id="L140"><span class="lineNum">     140</span>                 :             : </span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">          74 :     IAToken(reserveCache.aTokenAddress).burn(</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">        2037 :     IAToken(reserveCache.aTokenAddress).burn(</span></span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :       msg.sender,</span>
 <span id="L143"><span class="lineNum">     143</span>                 :             :       params.to,</span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :       amountToWithdraw,</span>
 <span id="L145"><span class="lineNum">     145</span>                 :             :       reserveCache.nextLiquidityIndex</span>
 <span id="L146"><span class="lineNum">     146</span>                 :             :     );</span>
 <span id="L147"><span class="lineNum">     147</span>                 :             : </span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">         110 :     if (isCollateral &amp;&amp; userConfig.isBorrowingAny()) {</span></span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">           2 :       ValidationLogic.validateHFAndLtv(</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">        2037 :     if (isCollateral &amp;&amp; userConfig.isBorrowingAny()) {</span></span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">           1 :       ValidationLogic.validateHFAndLtv(</span></span>
 <span id="L150"><span class="lineNum">     150</span>                 :             :         reservesData,</span>
 <span id="L151"><span class="lineNum">     151</span>                 :             :         reservesList,</span>
 <span id="L152"><span class="lineNum">     152</span>                 :             :         eModeCategories,</span>
@@ -230,9 +230,9 @@
 <span id="L159"><span class="lineNum">     159</span>                 :             :       );</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             :     }</span>
 <span id="L161"><span class="lineNum">     161</span>                 :             : </span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">          72 :     emit Withdraw(params.asset, msg.sender, params.to, amountToWithdraw);</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">        2036 :     emit Withdraw(params.asset, msg.sender, params.to, amountToWithdraw);</span></span>
 <span id="L163"><span class="lineNum">     163</span>                 :             : </span>
-<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">          72 :     return amountToWithdraw;</span></span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">        2036 :     return amountToWithdraw;</span></span>
 <span id="L165"><span class="lineNum">     165</span>                 :             :   }</span>
 <span id="L166"><span class="lineNum">     166</span>                 :             : </span>
 <span id="L167"><span class="lineNum">     167</span>                 :             :   /**</span>
@@ -247,26 +247,26 @@
 <span id="L176"><span class="lineNum">     176</span>                 :             :    * @param usersConfig The users configuration mapping that track the supplied/borrowed assets</span>
 <span id="L177"><span class="lineNum">     177</span>                 :             :    * @param params The additional parameters needed to execute the finalizeTransfer function</span>
 <span id="L178"><span class="lineNum">     178</span>                 :             :    */</span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">        1036 :   function executeFinalizeTransfer(</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :   function executeFinalizeTransfer(</span>
 <span id="L180"><span class="lineNum">     180</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L181"><span class="lineNum">     181</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L182"><span class="lineNum">     182</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
 <span id="L183"><span class="lineNum">     183</span>                 :             :     mapping(address =&gt; DataTypes.UserConfigurationMap) storage usersConfig,</span>
 <span id="L184"><span class="lineNum">     184</span>                 :             :     DataTypes.FinalizeTransferParams memory params</span>
 <span id="L185"><span class="lineNum">     185</span>                 :             :   ) external {</span>
-<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">        2072 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
+<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">       17042 :     DataTypes.ReserveData storage reserve = reservesData[params.asset];</span></span>
 <span id="L187"><span class="lineNum">     187</span>                 :             : </span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">        2072 :     ValidationLogic.validateTransfer(reserve);</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       17042 :     ValidationLogic.validateTransfer(reserve);</span></span>
 <span id="L189"><span class="lineNum">     189</span>                 :             : </span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">        2072 :     uint256 reserveId = reserve.id;</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">        3108 :     uint256 scaledAmount = params.amount.rayDiv(reserve.getNormalizedIncome());</span></span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">       17042 :     uint256 reserveId = reserve.id;</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">       17042 :     uint256 scaledAmount = params.amount.rayDiv(reserve.getNormalizedIncome());</span></span>
 <span id="L192"><span class="lineNum">     192</span>                 :             : </span>
-<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">        4142 :     if (params.from != params.to &amp;&amp; scaledAmount != 0) {</span></span>
-<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">        1558 :       DataTypes.UserConfigurationMap storage fromConfig = usersConfig[params.from];</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">       17042 :     if (params.from != params.to &amp;&amp; scaledAmount != 0) {</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">       16898 :       DataTypes.UserConfigurationMap storage fromConfig = usersConfig[params.from];</span></span>
 <span id="L195"><span class="lineNum">     195</span>                 :             : </span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">        1558 :       if (fromConfig.isUsingAsCollateral(reserveId)) {</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">        1558 :         if (fromConfig.isBorrowingAny()) {</span></span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">          12 :           ValidationLogic.validateHFAndLtv(</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">       16898 :       if (fromConfig.isUsingAsCollateral(reserveId)) {</span></span>
+<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">       16898 :         if (fromConfig.isBorrowingAny()) {</span></span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">           6 :           ValidationLogic.validateHFAndLtv(</span></span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :             reservesData,</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             :             reservesList,</span>
 <span id="L201"><span class="lineNum">     201</span>                 :             :             eModeCategories,</span>
@@ -278,16 +278,16 @@
 <span id="L207"><span class="lineNum">     207</span>                 :             :             params.fromEModeCategory</span>
 <span id="L208"><span class="lineNum">     208</span>                 :             :           );</span>
 <span id="L209"><span class="lineNum">     209</span>                 :             :         }</span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">        1556 :         if (params.balanceFromBefore == params.amount) {</span></span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">          14 :           fromConfig.setUsingAsCollateral(reserveId, false);</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC">          14 :           emit ReserveUsedAsCollateralDisabled(params.asset, params.from);</span></span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">       16897 :         if (params.balanceFromBefore == params.amount) {</span></span>
+<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">       15013 :           fromConfig.setUsingAsCollateral(reserveId, false);</span></span>
+<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC">       15013 :           emit ReserveUsedAsCollateralDisabled(params.asset, params.from);</span></span>
 <span id="L213"><span class="lineNum">     213</span>                 :             :         }</span>
 <span id="L214"><span class="lineNum">     214</span>                 :             :       }</span>
 <span id="L215"><span class="lineNum">     215</span>                 :             : </span>
-<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">        1556 :       if (params.balanceToBefore == 0) {</span></span>
-<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">        1548 :         DataTypes.UserConfigurationMap storage toConfig = usersConfig[params.to];</span></span>
+<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">       16897 :       if (params.balanceToBefore == 0) {</span></span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">       15893 :         DataTypes.UserConfigurationMap storage toConfig = usersConfig[params.to];</span></span>
 <span id="L218"><span class="lineNum">     218</span>                 :             :         if (</span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">        1548 :           ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
+<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">       15893 :           ValidationLogic.validateAutomaticUseAsCollateral(</span></span>
 <span id="L220"><span class="lineNum">     220</span>                 :             :             reservesData,</span>
 <span id="L221"><span class="lineNum">     221</span>                 :             :             reservesList,</span>
 <span id="L222"><span class="lineNum">     222</span>                 :             :             toConfig,</span>
@@ -295,8 +295,8 @@
 <span id="L224"><span class="lineNum">     224</span>                 :             :             reserve.aTokenAddress</span>
 <span id="L225"><span class="lineNum">     225</span>                 :             :           )</span>
 <span id="L226"><span class="lineNum">     226</span>                 :             :         ) {</span>
-<span id="L227"><span class="lineNum">     227</span>                 :<span class="tlaGNC">        1548 :           toConfig.setUsingAsCollateral(reserveId, true);</span></span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">        1548 :           emit ReserveUsedAsCollateralEnabled(params.asset, params.to);</span></span>
+<span id="L227"><span class="lineNum">     227</span>                 :<span class="tlaGNC">       15893 :           toConfig.setUsingAsCollateral(reserveId, true);</span></span>
+<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">       15893 :           emit ReserveUsedAsCollateralEnabled(params.asset, params.to);</span></span>
 <span id="L229"><span class="lineNum">     229</span>                 :             :         }</span>
 <span id="L230"><span class="lineNum">     230</span>                 :             :       }</span>
 <span id="L231"><span class="lineNum">     231</span>                 :             :     }</span>
@@ -318,7 +318,7 @@
 <span id="L247"><span class="lineNum">     247</span>                 :             :    * @param priceOracle The address of the price oracle</span>
 <span id="L248"><span class="lineNum">     248</span>                 :             :    * @param userEModeCategory The eMode category chosen by the user</span>
 <span id="L249"><span class="lineNum">     249</span>                 :             :    */</span>
-<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">          43 :   function executeUseReserveAsCollateral(</span></span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :   function executeUseReserveAsCollateral(</span>
 <span id="L251"><span class="lineNum">     251</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
 <span id="L252"><span class="lineNum">     252</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
 <span id="L253"><span class="lineNum">     253</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
@@ -329,17 +329,17 @@
 <span id="L258"><span class="lineNum">     258</span>                 :             :     address priceOracle,</span>
 <span id="L259"><span class="lineNum">     259</span>                 :             :     uint8 userEModeCategory</span>
 <span id="L260"><span class="lineNum">     260</span>                 :             :   ) external {</span>
-<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">          86 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">         129 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">          43 :     DataTypes.ReserveData storage reserve = reservesData[asset];</span></span>
+<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">          43 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
 <span id="L263"><span class="lineNum">     263</span>                 :             : </span>
-<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">         129 :     uint256 userBalance = IERC20(reserveCache.aTokenAddress).balanceOf(msg.sender);</span></span>
+<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">          43 :     uint256 userBalance = IERC20(reserveCache.aTokenAddress).balanceOf(msg.sender);</span></span>
 <span id="L265"><span class="lineNum">     265</span>                 :             : </span>
-<span id="L266"><span class="lineNum">     266</span>                 :<span class="tlaGNC">          86 :     ValidationLogic.validateSetUseReserveAsCollateral(reserveCache, userBalance);</span></span>
+<span id="L266"><span class="lineNum">     266</span>                 :<span class="tlaGNC">          43 :     ValidationLogic.validateSetUseReserveAsCollateral(reserveCache, userBalance);</span></span>
 <span id="L267"><span class="lineNum">     267</span>                 :             : </span>
-<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">         113 :     if (useAsCollateral == userConfig.isUsingAsCollateral(reserve.id)) return;</span></span>
+<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">          37 :     if (useAsCollateral == userConfig.isUsingAsCollateral(reserve.id)) return;</span></span>
 <span id="L269"><span class="lineNum">     269</span>                 :             : </span>
 <span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">          35 :     if (useAsCollateral) {</span></span>
-<span id="L271"><span class="lineNum">     271</span>                 :<span class="tlaGNC">          38 :       require(</span></span>
+<span id="L271"><span class="lineNum">     271</span>                 :<span class="tlaGNC">          19 :       require(</span></span>
 <span id="L272"><span class="lineNum">     272</span>                 :             :         ValidationLogic.validateUseAsCollateral(</span>
 <span id="L273"><span class="lineNum">     273</span>                 :             :           reservesData,</span>
 <span id="L274"><span class="lineNum">     274</span>                 :             :           reservesList,</span>
@@ -349,11 +349,11 @@
 <span id="L278"><span class="lineNum">     278</span>                 :             :         Errors.USER_IN_ISOLATION_MODE_OR_LTV_ZERO</span>
 <span id="L279"><span class="lineNum">     279</span>                 :             :       );</span>
 <span id="L280"><span class="lineNum">     280</span>                 :             : </span>
-<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">          30 :       userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
-<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">          30 :       emit ReserveUsedAsCollateralEnabled(asset, msg.sender);</span></span>
+<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">          15 :       userConfig.setUsingAsCollateral(reserve.id, true);</span></span>
+<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">          15 :       emit ReserveUsedAsCollateralEnabled(asset, msg.sender);</span></span>
 <span id="L283"><span class="lineNum">     283</span>                 :             :     } else {</span>
-<span id="L284"><span class="lineNum">     284</span>                 :<span class="tlaGNC">          32 :       userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
-<span id="L285"><span class="lineNum">     285</span>                 :<span class="tlaGNC">          32 :       ValidationLogic.validateHFAndLtv(</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :<span class="tlaGNC">          16 :       userConfig.setUsingAsCollateral(reserve.id, false);</span></span>
+<span id="L285"><span class="lineNum">     285</span>                 :<span class="tlaGNC">          16 :       ValidationLogic.validateHFAndLtv(</span></span>
 <span id="L286"><span class="lineNum">     286</span>                 :             :         reservesData,</span>
 <span id="L287"><span class="lineNum">     287</span>                 :             :         reservesList,</span>
 <span id="L288"><span class="lineNum">     288</span>                 :             :         eModeCategories,</span>
@@ -365,7 +365,7 @@
 <span id="L294"><span class="lineNum">     294</span>                 :             :         userEModeCategory</span>
 <span id="L295"><span class="lineNum">     295</span>                 :             :       );</span>
 <span id="L296"><span class="lineNum">     296</span>                 :             : </span>
-<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">          28 :       emit ReserveUsedAsCollateralDisabled(asset, msg.sender);</span></span>
+<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">          14 :       emit ReserveUsedAsCollateralDisabled(asset, msg.sender);</span></span>
 <span id="L298"><span class="lineNum">     298</span>                 :             :     }</span>
 <span id="L299"><span class="lineNum">     299</span>                 :             :   }</span>
 <span id="L300"><span class="lineNum">     300</span>                 :             : }</span>
@@ -376,8 +376,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func-c.html b/report/protocol/libraries/logic/ValidationLogic.sol.func-c.html
similarity index 57%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func-c.html
rename to report/protocol/libraries/logic/ValidationLogic.sol.func-c.html
index 1c7aa134..ecc963ea 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func-c.html
+++ b/report/protocol/libraries/logic/ValidationLogic.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ValidationLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (<a href="ValidationLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (<a href="ValidationLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">132</td>
-            <td class="headerCovTableEntry">132</td>
+            <td class="headerCovTableEntry">110</td>
+            <td class="headerCovTableEntry">110</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">17</td>
-            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">15</td>
           </tr>
           <tr>
             <td></td>
@@ -53,140 +53,126 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ValidationLogic.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ValidationLogic.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L406">ValidationLogic.validateRebalanceStableBorrowRate</a></td>
-              
-              <td class="coverFnHi">5</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L360">ValidationLogic.validateSwapRateMode</a></td>
-              
-              <td class="coverFnHi">8</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L651">ValidationLogic.validateDropReserve</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L525">ValidationLogic.validateDropReserve</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L464">ValidationLogic.validateFlashloan</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L349">ValidationLogic.validateFlashloanSimple</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L678">ValidationLogic.validateSetUserEMode</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L481">ValidationLogic.validateHFAndLtv</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L479">ValidationLogic.validateFlashloanSimple</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L314">ValidationLogic.validateSetUseReserveAsCollateral</a></td>
               
-              <td class="coverFnHi">21</td>
+              <td class="coverFnHi">43</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L607">ValidationLogic.validateHFAndLtv</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L331">ValidationLogic.validateFlashloan</a></td>
               
-              <td class="coverFnHi">23</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L563">ValidationLogic.validateHealthFactor</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L94">ValidationLogic.validateWithdraw</a></td>
               
-              <td class="coverFnHi">27</td>
+              <td class="coverFnHi">2044</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L447">ValidationLogic.validateSetUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L285">ValidationLogic.validateRepay</a></td>
               
-              <td class="coverFnHi">43</td>
+              <td class="coverFnHi">5030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L96">ValidationLogic.validateWithdraw</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L437">ValidationLogic.validateHealthFactor</a></td>
               
-              <td class="coverFnHi">44</td>
+              <td class="coverFnHi">8637</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L641">ValidationLogic.validateTransfer</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L549">ValidationLogic.validateSetUserEMode</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">9617</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L326">ValidationLogic.validateRepay</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L379">ValidationLogic.validateLiquidationCall</a></td>
               
-              <td class="coverFnHi">5029</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L139">ValidationLogic.validateBorrow</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L135">ValidationLogic.validateBorrow</a></td>
               
-              <td class="coverFnHi">9117</td>
+              <td class="coverFnHi">16110</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L505">ValidationLogic.validateLiquidationCall</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L515">ValidationLogic.validateTransfer</a></td>
               
-              <td class="coverFnHi">11292</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L751">ValidationLogic.validateAutomaticUseAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L64">ValidationLogic.validateSupply</a></td>
               
-              <td class="coverFnHi">13331</td>
+              <td class="coverFnHi">44531</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L724">ValidationLogic.validateUseAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L619">ValidationLogic.validateAutomaticUseAsCollateral</a></td>
               
-              <td class="coverFnHi">13338</td>
+              <td class="coverFnHi">59404</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L64">ValidationLogic.validateSupply</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L592">ValidationLogic.validateUseAsCollateral</a></td>
               
-              <td class="coverFnHi">13598</td>
+              <td class="coverFnHi">59411</td>
               
               
             </tr>
@@ -194,8 +180,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func.html b/report/protocol/libraries/logic/ValidationLogic.sol.func.html
similarity index 57%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func.html
rename to report/protocol/libraries/logic/ValidationLogic.sol.func.html
index 7319ff08..8e7a3e8d 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.func.html
+++ b/report/protocol/libraries/logic/ValidationLogic.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ValidationLogic.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (<a href="ValidationLogic.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (<a href="ValidationLogic.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">132</td>
-            <td class="headerCovTableEntry">132</td>
+            <td class="headerCovTableEntry">110</td>
+            <td class="headerCovTableEntry">110</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">17</td>
-            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">15</td>
           </tr>
           <tr>
             <td></td>
@@ -53,140 +53,126 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ValidationLogic.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ValidationLogic.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L751">ValidationLogic.validateAutomaticUseAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L619">ValidationLogic.validateAutomaticUseAsCollateral</a></td>
               
-              <td class="coverFnHi">13331</td>
+              <td class="coverFnHi">59404</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L139">ValidationLogic.validateBorrow</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L135">ValidationLogic.validateBorrow</a></td>
               
-              <td class="coverFnHi">9117</td>
+              <td class="coverFnHi">16110</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L651">ValidationLogic.validateDropReserve</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L525">ValidationLogic.validateDropReserve</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L464">ValidationLogic.validateFlashloan</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L331">ValidationLogic.validateFlashloan</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L479">ValidationLogic.validateFlashloanSimple</a></td>
-              
-              <td class="coverFnHi">21</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L607">ValidationLogic.validateHFAndLtv</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L349">ValidationLogic.validateFlashloanSimple</a></td>
               
               <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L563">ValidationLogic.validateHealthFactor</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L481">ValidationLogic.validateHFAndLtv</a></td>
               
-              <td class="coverFnHi">27</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L505">ValidationLogic.validateLiquidationCall</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L437">ValidationLogic.validateHealthFactor</a></td>
               
-              <td class="coverFnHi">11292</td>
+              <td class="coverFnHi">8637</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L406">ValidationLogic.validateRebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L379">ValidationLogic.validateLiquidationCall</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">14501</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L326">ValidationLogic.validateRepay</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L285">ValidationLogic.validateRepay</a></td>
               
-              <td class="coverFnHi">5029</td>
+              <td class="coverFnHi">5030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L447">ValidationLogic.validateSetUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L314">ValidationLogic.validateSetUseReserveAsCollateral</a></td>
               
               <td class="coverFnHi">43</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L678">ValidationLogic.validateSetUserEMode</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L549">ValidationLogic.validateSetUserEMode</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">9617</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L64">ValidationLogic.validateSupply</a></td>
               
-              <td class="coverFnHi">13598</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L360">ValidationLogic.validateSwapRateMode</a></td>
-              
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">44531</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L641">ValidationLogic.validateTransfer</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L515">ValidationLogic.validateTransfer</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L724">ValidationLogic.validateUseAsCollateral</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L592">ValidationLogic.validateUseAsCollateral</a></td>
               
-              <td class="coverFnHi">13338</td>
+              <td class="coverFnHi">59411</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L96">ValidationLogic.validateWithdraw</a></td>
+              <td class="coverFn"><a href="ValidationLogic.sol.gcov.html#L94">ValidationLogic.validateWithdraw</a></td>
               
-              <td class="coverFnHi">44</td>
+              <td class="coverFnHi">2044</td>
               
               
             </tr>
@@ -194,8 +180,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.gcov.html b/report/protocol/libraries/logic/ValidationLogic.sol.gcov.html
similarity index 71%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.gcov.html
rename to report/protocol/libraries/logic/ValidationLogic.sol.gcov.html
index d7f1dd6f..02916898 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol.gcov.html
+++ b/report/protocol/libraries/logic/ValidationLogic.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic/ValidationLogic.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (source / <a href="ValidationLogic.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/logic">protocol/libraries/logic</a> - ValidationLogic.sol<span style="font-size: 80%;"> (source / <a href="ValidationLogic.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">132</td>
-            <td class="headerCovTableEntry">132</td>
+            <td class="headerCovTableEntry">110</td>
+            <td class="headerCovTableEntry">110</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">17</td>
-            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">15</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -76,15 +76,15 @@
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {Address} from '../../../dependencies/openzeppelin/contracts/Address.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {IPriceOracleSentinel} from '../../../interfaces/IPriceOracleSentinel.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {IAccessControl} from '../../../dependencies/openzeppelin/contracts/IAccessControl.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {IAToken} from '../../../interfaces/IAToken.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {IPriceOracleSentinel} from '../../../interfaces/IPriceOracleSentinel.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {IAccessControl} from '../../../dependencies/openzeppelin/contracts/IAccessControl.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : import {UserConfiguration} from '../configuration/UserConfiguration.sol';</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : import {EModeConfiguration} from '../configuration/EModeConfiguration.sol';</span>
 <span id="L17"><span class="lineNum">      17</span>                 :             : import {Errors} from '../helpers/Errors.sol';</span>
 <span id="L18"><span class="lineNum">      18</span>                 :             : import {WadRayMath} from '../math/WadRayMath.sol';</span>
 <span id="L19"><span class="lineNum">      19</span>                 :             : import {PercentageMath} from '../math/PercentageMath.sol';</span>
@@ -134,715 +134,583 @@
 <span id="L63"><span class="lineNum">      63</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :    * @param amount The amount to be supplied</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :    */</span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC tlaBgGNC">       13598 :   function validateSupply(</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   function validateSupply(</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     uint256 amount,</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :     address onBehalfOf</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :   ) internal view {</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       27196 :     require(amount != 0, Errors.INVALID_AMOUNT);</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC tlaBgGNC">       44531 :     require(amount != 0, Errors.INVALID_AMOUNT);</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             : </span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">       40791 :     (bool isActive, bool isFrozen, , , bool isPaused) = reserveCache</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :       .reserveConfiguration</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :       .getFlags();</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       27194 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       27192 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       27190 :     require(!isFrozen, Errors.RESERVE_FROZEN);</span></span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">       27188 :     require(onBehalfOf != reserveCache.aTokenAddress, Errors.SUPPLY_TO_ATOKEN);</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :             : </span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">       40779 :     uint256 supplyCap = reserveCache.reserveConfiguration.getSupplyCap();</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">       27186 :     require(</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :             :       supplyCap == 0 ||</span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :         ((IAToken(reserveCache.aTokenAddress).scaledTotalSupply() +</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :           uint256(reserve.accruedToTreasury)).rayMul(reserveCache.nextLiquidityIndex) + amount) &lt;=</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :         supplyCap * (10 ** reserveCache.reserveConfiguration.getDecimals()),</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :       Errors.SUPPLY_CAP_EXCEEDED</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :     );</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :   }</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             : </span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :   /**</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :    * @notice Validates a withdraw action.</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :    * @param amount The amount to be withdrawn</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :    * @param userBalance The balance of the user</span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :    */</span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">          44 :   function validateWithdraw(</span></span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :     uint256 amount,</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :     uint256 userBalance</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :   ) internal pure {</span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">          88 :     require(amount != 0, Errors.INVALID_AMOUNT);</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">          86 :     require(amount &lt;= userBalance, Errors.NOT_ENOUGH_AVAILABLE_USER_BALANCE);</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">         126 :     (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">          84 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">          82 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   }</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             : </span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :   struct ValidateBorrowLocalVars {</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :     uint256 currentLtv;</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :     uint256 collateralNeededInBaseCurrency;</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :     uint256 userCollateralInBaseCurrency;</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :     uint256 userDebtInBaseCurrency;</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :     uint256 availableLiquidity;</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :     uint256 healthFactor;</span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :     uint256 totalDebt;</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :     uint256 totalSupplyVariableDebt;</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :     uint256 reserveDecimals;</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :     uint256 borrowCap;</span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :     uint256 amountInBaseCurrency;</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             :     uint256 assetUnit;</span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :     address eModePriceSource;</span>
-<span id="L125"><span class="lineNum">     125</span>                 :             :     address siloedBorrowingAddress;</span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :     bool isActive;</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :     bool isFrozen;</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :     bool isPaused;</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :     bool borrowingEnabled;</span>
-<span id="L130"><span class="lineNum">     130</span>                 :             :     bool stableRateBorrowingEnabled;</span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :     bool siloedBorrowingEnabled;</span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :   /**</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             :    * @notice Validates a borrow action.</span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :    * @param params Additional params needed for the validation</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :    */</span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">        9117 :   function validateBorrow(</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :     DataTypes.ValidateBorrowParams memory params</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :   ) internal view {</span>
-<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">       18234 :     require(params.amount != 0, Errors.INVALID_AMOUNT);</span></span>
-<span id="L148"><span class="lineNum">     148</span>                 :             : </span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       18232 :     ValidateBorrowLocalVars memory vars;</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :             : </span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">       18232 :     (</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :       vars.isActive,</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             :       vars.isFrozen,</span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :       vars.borrowingEnabled,</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :       vars.stableRateBorrowingEnabled,</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :       vars.isPaused</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :     ) = params.reserveCache.reserveConfiguration.getFlags();</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             : </span>
-<span id="L159"><span class="lineNum">     159</span>                 :<span class="tlaGNC">       18232 :     require(vars.isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">       18230 :     require(!vars.isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">       18228 :     require(!vars.isFrozen, Errors.RESERVE_FROZEN);</span></span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">       18226 :     require(vars.borrowingEnabled, Errors.BORROWING_NOT_ENABLED);</span></span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">       18226 :     require(</span></span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :       IERC20(params.reserveCache.aTokenAddress).totalSupply() &gt;= params.amount,</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :       Errors.INVALID_AMOUNT</span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">       44530 :     (bool isActive, bool isFrozen, , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       44530 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       44529 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       44528 :     require(!isFrozen, Errors.RESERVE_FROZEN);</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">       44527 :     require(onBehalfOf != reserveCache.aTokenAddress, Errors.SUPPLY_TO_ATOKEN);</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :             : </span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">       44526 :     uint256 supplyCap = reserveCache.reserveConfiguration.getSupplyCap();</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       44526 :     require(</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :       supplyCap == 0 ||</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :         ((IAToken(reserveCache.aTokenAddress).scaledTotalSupply() +</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :           uint256(reserve.accruedToTreasury)).rayMul(reserveCache.nextLiquidityIndex) + amount) &lt;=</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :         supplyCap * (10 ** reserveCache.reserveConfiguration.getDecimals()),</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :       Errors.SUPPLY_CAP_EXCEEDED</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :     );</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   }</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             : </span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :   /**</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :    * @notice Validates a withdraw action.</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :    * @param amount The amount to be withdrawn</span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :    * @param userBalance The balance of the user</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :    */</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   function validateWithdraw(</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :     uint256 amount,</span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :     uint256 userBalance</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   ) internal pure {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">        2044 :     require(amount != 0, Errors.INVALID_AMOUNT);</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">        2043 :     require(amount &lt;= userBalance, Errors.NOT_ENOUGH_AVAILABLE_USER_BALANCE);</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">        2042 :     (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">        2042 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">        2041 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :   }</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             : </span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :   struct ValidateBorrowLocalVars {</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :     uint256 currentLtv;</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :     uint256 collateralNeededInBaseCurrency;</span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :     uint256 userCollateralInBaseCurrency;</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :     uint256 userDebtInBaseCurrency;</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :     uint256 availableLiquidity;</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :     uint256 healthFactor;</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :     uint256 totalDebt;</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :     uint256 totalSupplyVariableDebt;</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :     uint256 reserveDecimals;</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :     uint256 borrowCap;</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :     uint256 amountInBaseCurrency;</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :     uint256 assetUnit;</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :     address siloedBorrowingAddress;</span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :     bool isActive;</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :     bool isFrozen;</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :     bool isPaused;</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     bool borrowingEnabled;</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :     bool siloedBorrowingEnabled;</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :   }</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             : </span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :   /**</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :    * @notice Validates a borrow action.</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :    * @param params Additional params needed for the validation</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :    */</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :   function validateBorrow(</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L140"><span class="lineNum">     140</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :     DataTypes.ValidateBorrowParams memory params</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :   ) internal view {</span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">       16110 :     require(params.amount != 0, Errors.INVALID_AMOUNT);</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :             : </span>
+<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">       16109 :     ValidateBorrowLocalVars memory vars;</span></span>
+<span id="L146"><span class="lineNum">     146</span>                 :             : </span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">       16109 :     (vars.isActive, vars.isFrozen, vars.borrowingEnabled, vars.isPaused) = params</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :       .reserveCache</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :       .reserveConfiguration</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :       .getFlags();</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             : </span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">       16109 :     require(vars.isActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">       16108 :     require(!vars.isPaused, Errors.RESERVE_PAUSED);</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">       16107 :     require(!vars.isFrozen, Errors.RESERVE_FROZEN);</span></span>
+<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">       16106 :     require(vars.borrowingEnabled, Errors.BORROWING_NOT_ENABLED);</span></span>
+<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">       15106 :     require(</span></span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :       !params.reserveCache.reserveConfiguration.getIsVirtualAccActive() ||</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :         IERC20(params.reserveCache.aTokenAddress).totalSupply() &gt;= params.amount,</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :       Errors.INVALID_AMOUNT</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :     );</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             : </span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">       15105 :     require(</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :       params.priceOracleSentinel == address(0) ||</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :         IPriceOracleSentinel(params.priceOracleSentinel).isBorrowAllowed(),</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :       Errors.PRICE_ORACLE_SENTINEL_CHECK_FAILED</span>
 <span id="L166"><span class="lineNum">     166</span>                 :             :     );</span>
 <span id="L167"><span class="lineNum">     167</span>                 :             : </span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">       18224 :     require(</span></span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :       params.priceOracleSentinel == address(0) ||</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :         IPriceOracleSentinel(params.priceOracleSentinel).isBorrowAllowed(),</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :       Errors.PRICE_ORACLE_SENTINEL_CHECK_FAILED</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :     //validate interest rate mode</span>
+<span id="L169"><span class="lineNum">     169</span>                 :<span class="tlaGNC">       15104 :     require(</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :       params.interestRateMode == DataTypes.InterestRateMode.VARIABLE,</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :       Errors.INVALID_INTEREST_RATE_MODE_SELECTED</span>
 <span id="L172"><span class="lineNum">     172</span>                 :             :     );</span>
 <span id="L173"><span class="lineNum">     173</span>                 :             : </span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :     //validate interest rate mode</span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">       18222 :     require(</span></span>
-<span id="L176"><span class="lineNum">     176</span>                 :             :       params.interestRateMode == DataTypes.InterestRateMode.VARIABLE ||</span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :         params.interestRateMode == DataTypes.InterestRateMode.STABLE,</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :       Errors.INVALID_INTEREST_RATE_MODE_SELECTED</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :     );</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             : </span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">       18220 :     vars.reserveDecimals = params.reserveCache.reserveConfiguration.getDecimals();</span></span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">       18220 :     vars.borrowCap = params.reserveCache.reserveConfiguration.getBorrowCap();</span></span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :     unchecked {</span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">       18220 :       vars.assetUnit = 10 ** vars.reserveDecimals;</span></span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :     }</span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">       15102 :     vars.reserveDecimals = params.reserveCache.reserveConfiguration.getDecimals();</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">       15102 :     vars.borrowCap = params.reserveCache.reserveConfiguration.getBorrowCap();</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :     unchecked {</span>
+<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">       15102 :       vars.assetUnit = 10 ** vars.reserveDecimals;</span></span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :     }</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             : </span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">       15102 :     if (vars.borrowCap != 0) {</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           7 :       vars.totalSupplyVariableDebt = params.reserveCache.currScaledVariableDebt.rayMul(</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :         params.reserveCache.nextVariableBorrowIndex</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :       );</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             : </span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">           7 :       vars.totalDebt = vars.totalSupplyVariableDebt + params.amount;</span></span>
 <span id="L186"><span class="lineNum">     186</span>                 :             : </span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">       18220 :     if (vars.borrowCap != 0) {</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">          14 :       vars.totalSupplyVariableDebt = params.reserveCache.currScaledVariableDebt.rayMul(</span></span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :         params.reserveCache.nextVariableBorrowIndex</span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :       );</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :       unchecked {</span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">           7 :         require(vars.totalDebt &lt;= vars.borrowCap * vars.assetUnit, Errors.BORROW_CAP_EXCEEDED);</span></span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :       }</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :     }</span>
 <span id="L191"><span class="lineNum">     191</span>                 :             : </span>
-<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">          14 :       vars.totalDebt =</span></span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :         params.reserveCache.currTotalStableDebt +</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :         vars.totalSupplyVariableDebt +</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :         params.amount;</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             : </span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :       unchecked {</span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">          14 :         require(vars.totalDebt &lt;= vars.borrowCap * vars.assetUnit, Errors.BORROW_CAP_EXCEEDED);</span></span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :       }</span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :     }</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             : </span>
-<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">        9107 :     if (params.isolationModeActive) {</span></span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :       // check that the asset being borrowed is borrowable in isolation mode AND</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :       // the total exposure is no bigger than the collateral debt ceiling</span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">          22 :       require(</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :         params.reserveCache.reserveConfiguration.getBorrowableInIsolation(),</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :         Errors.ASSET_NOT_BORROWABLE_IN_ISOLATION</span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :       );</span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">       15099 :     if (params.isolationModeActive) {</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :       // check that the asset being borrowed is borrowable in isolation mode AND</span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :       // the total exposure is no bigger than the collateral debt ceiling</span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">          11 :       require(</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :         params.reserveCache.reserveConfiguration.getBorrowableInIsolation(),</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :         Errors.ASSET_NOT_BORROWABLE_IN_ISOLATION</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :       );</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             : </span>
+<span id="L200"><span class="lineNum">     200</span>                 :<span class="tlaGNC">          10 :       require(</span></span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :         reservesData[params.isolationModeCollateralAddress].isolationModeTotalDebt +</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :           (params.amount /</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :             10 ** (vars.reserveDecimals - ReserveConfiguration.DEBT_CEILING_DECIMALS))</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :             .toUint128() &lt;=</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :           params.isolationModeDebtCeiling,</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :         Errors.DEBT_CEILING_EXCEEDED</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :       );</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :     }</span>
 <span id="L209"><span class="lineNum">     209</span>                 :             : </span>
-<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">          20 :       require(</span></span>
-<span id="L211"><span class="lineNum">     211</span>                 :             :         reservesData[params.isolationModeCollateralAddress].isolationModeTotalDebt +</span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :           (params.amount /</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :             10 ** (vars.reserveDecimals - ReserveConfiguration.DEBT_CEILING_DECIMALS))</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :             .toUint128() &lt;=</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :           params.isolationModeDebtCeiling,</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :         Errors.DEBT_CEILING_EXCEEDED</span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">       15096 :     if (params.userEModeCategory != 0) {</span></span>
+<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">        4006 :       require(</span></span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :         EModeConfiguration.isReserveEnabledOnBitmap(</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :           eModeCategories[params.userEModeCategory].borrowableBitmap,</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :           reservesData[params.asset].id</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :         ),</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :         Errors.NOT_BORROWABLE_IN_EMODE</span>
 <span id="L217"><span class="lineNum">     217</span>                 :             :       );</span>
 <span id="L218"><span class="lineNum">     218</span>                 :             :     }</span>
 <span id="L219"><span class="lineNum">     219</span>                 :             : </span>
-<span id="L220"><span class="lineNum">     220</span>                 :<span class="tlaGNC">       18208 :     if (params.userEModeCategory != 0) {</span></span>
-<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">          14 :       require(</span></span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :         params.reserveCache.reserveConfiguration.getEModeCategory() == params.userEModeCategory,</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :         Errors.INCONSISTENT_EMODE_CATEGORY</span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :       );</span>
-<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">          12 :       vars.eModePriceSource = eModeCategories[params.userEModeCategory].priceSource;</span></span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :     }</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             : </span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">       18206 :     (</span></span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :       vars.userCollateralInBaseCurrency,</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :       vars.userDebtInBaseCurrency,</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :       vars.currentLtv,</span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :       ,</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :       vars.healthFactor,</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             : </span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :     ) = GenericLogic.calculateUserAccountData(</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :       reservesData,</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :       reservesList,</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :       eModeCategories,</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :       DataTypes.CalculateUserAccountDataParams({</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :         userConfig: params.userConfig,</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             :         reservesCount: params.reservesCount,</span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :         user: params.userAddress,</span>
-<span id="L243"><span class="lineNum">     243</span>                 :             :         oracle: params.oracle,</span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :         userEModeCategory: params.userEModeCategory</span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :       })</span>
+<span id="L220"><span class="lineNum">     220</span>                 :<span class="tlaGNC">       15095 :     (</span></span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :       vars.userCollateralInBaseCurrency,</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :       vars.userDebtInBaseCurrency,</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :       vars.currentLtv,</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :       ,</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :       vars.healthFactor,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             : </span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :     ) = GenericLogic.calculateUserAccountData(</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :       reservesData,</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :       reservesList,</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :       eModeCategories,</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :       DataTypes.CalculateUserAccountDataParams({</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :         userConfig: params.userConfig,</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :         reservesCount: params.reservesCount,</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :         user: params.userAddress,</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :         oracle: params.oracle,</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :         userEModeCategory: params.userEModeCategory</span>
+<span id="L237"><span class="lineNum">     237</span>                 :             :       })</span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :     );</span>
+<span id="L239"><span class="lineNum">     239</span>                 :             : </span>
+<span id="L240"><span class="lineNum">     240</span>                 :<span class="tlaGNC">       15095 :     require(vars.userCollateralInBaseCurrency != 0, Errors.COLLATERAL_BALANCE_IS_ZERO);</span></span>
+<span id="L241"><span class="lineNum">     241</span>                 :<span class="tlaGNC">       15094 :     require(vars.currentLtv != 0, Errors.LTV_VALIDATION_FAILED);</span></span>
+<span id="L242"><span class="lineNum">     242</span>                 :             : </span>
+<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">       15094 :     require(</span></span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :       vars.healthFactor &gt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :       Errors.HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD</span>
 <span id="L246"><span class="lineNum">     246</span>                 :             :     );</span>
 <span id="L247"><span class="lineNum">     247</span>                 :             : </span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">       18206 :     require(vars.userCollateralInBaseCurrency != 0, Errors.COLLATERAL_BALANCE_IS_ZERO);</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">       18204 :     require(vars.currentLtv != 0, Errors.LTV_VALIDATION_FAILED);</span></span>
-<span id="L250"><span class="lineNum">     250</span>                 :             : </span>
-<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">       18204 :     require(</span></span>
-<span id="L252"><span class="lineNum">     252</span>                 :             :       vars.healthFactor &gt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :       Errors.HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :     );</span>
-<span id="L255"><span class="lineNum">     255</span>                 :             : </span>
-<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">       18202 :     vars.amountInBaseCurrency =</span></span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :       IPriceOracleGetter(params.oracle).getAssetPrice(</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :         vars.eModePriceSource != address(0) ? vars.eModePriceSource : params.asset</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :       ) *</span>
-<span id="L260"><span class="lineNum">     260</span>                 :             :       params.amount;</span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :     unchecked {</span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">       18202 :       vars.amountInBaseCurrency /= vars.assetUnit;</span></span>
-<span id="L263"><span class="lineNum">     263</span>                 :             :     }</span>
-<span id="L264"><span class="lineNum">     264</span>                 :             : </span>
-<span id="L265"><span class="lineNum">     265</span>                 :             :     //add the current already borrowed amount to the amount requested to calculate the total collateral needed.</span>
-<span id="L266"><span class="lineNum">     266</span>                 :<span class="tlaGNC">       18202 :     vars.collateralNeededInBaseCurrency = (vars.userDebtInBaseCurrency + vars.amountInBaseCurrency)</span></span>
-<span id="L267"><span class="lineNum">     267</span>                 :             :       .percentDiv(vars.currentLtv); //LTV is calculated in percentage</span>
+<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">       15093 :     vars.amountInBaseCurrency =</span></span>
+<span id="L249"><span class="lineNum">     249</span>                 :             :       IPriceOracleGetter(params.oracle).getAssetPrice(params.asset) *</span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :       params.amount;</span>
+<span id="L251"><span class="lineNum">     251</span>                 :             :     unchecked {</span>
+<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">       15093 :       vars.amountInBaseCurrency /= vars.assetUnit;</span></span>
+<span id="L253"><span class="lineNum">     253</span>                 :             :     }</span>
+<span id="L254"><span class="lineNum">     254</span>                 :             : </span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :     //add the current already borrowed amount to the amount requested to calculate the total collateral needed.</span>
+<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">       15093 :     vars.collateralNeededInBaseCurrency = (vars.userDebtInBaseCurrency + vars.amountInBaseCurrency)</span></span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :       .percentDiv(vars.currentLtv); //LTV is calculated in percentage</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             : </span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">       15093 :     require(</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :             :       vars.collateralNeededInBaseCurrency &lt;= vars.userCollateralInBaseCurrency,</span>
+<span id="L261"><span class="lineNum">     261</span>                 :             :       Errors.COLLATERAL_CANNOT_COVER_NEW_BORROW</span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :     );</span>
+<span id="L263"><span class="lineNum">     263</span>                 :             : </span>
+<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">       15092 :     if (params.userConfig.isBorrowingAny()) {</span></span>
+<span id="L265"><span class="lineNum">     265</span>                 :<span class="tlaGNC">           7 :       (vars.siloedBorrowingEnabled, vars.siloedBorrowingAddress) = params</span></span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :         .userConfig</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             :         .getSiloedBorrowingState(reservesData, reservesList);</span>
 <span id="L268"><span class="lineNum">     268</span>                 :             : </span>
-<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">       18202 :     require(</span></span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :       vars.collateralNeededInBaseCurrency &lt;= vars.userCollateralInBaseCurrency,</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :       Errors.COLLATERAL_CANNOT_COVER_NEW_BORROW</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :     );</span>
-<span id="L273"><span class="lineNum">     273</span>                 :             : </span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :     /**</span>
-<span id="L275"><span class="lineNum">     275</span>                 :             :      * Following conditions need to be met if the user is borrowing at a stable rate:</span>
-<span id="L276"><span class="lineNum">     276</span>                 :             :      * 1. Reserve must be enabled for stable rate borrowing</span>
-<span id="L277"><span class="lineNum">     277</span>                 :             :      * 2. Users cannot borrow from the reserve if their collateral is (mostly) the same currency</span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :      *    they are borrowing, to prevent abuses.</span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :      * 3. Users will be able to borrow only a portion of the total available liquidity</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :      */</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             : </span>
-<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">       18200 :     if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {</span></span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :       //check if the borrow mode is stable and if stable rate borrowing is enabled on this reserve</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             : </span>
-<span id="L285"><span class="lineNum">     285</span>                 :<span class="tlaGNC">           8 :       require(vars.stableRateBorrowingEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);</span></span>
-<span id="L286"><span class="lineNum">     286</span>                 :             : </span>
-<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">           6 :       require(</span></span>
-<span id="L288"><span class="lineNum">     288</span>                 :             :         !params.userConfig.isUsingAsCollateral(reservesData[params.asset].id) ||</span>
-<span id="L289"><span class="lineNum">     289</span>                 :             :           params.reserveCache.reserveConfiguration.getLtv() == 0 ||</span>
-<span id="L290"><span class="lineNum">     290</span>                 :             :           params.amount &gt; IERC20(params.reserveCache.aTokenAddress).balanceOf(params.userAddress),</span>
-<span id="L291"><span class="lineNum">     291</span>                 :             :         Errors.COLLATERAL_SAME_AS_BORROWING_CURRENCY</span>
-<span id="L292"><span class="lineNum">     292</span>                 :             :       );</span>
-<span id="L293"><span class="lineNum">     293</span>                 :             : </span>
-<span id="L294"><span class="lineNum">     294</span>                 :<span class="tlaGNC">           4 :       vars.availableLiquidity = reservesData[params.asset].virtualUnderlyingBalance;</span></span>
-<span id="L295"><span class="lineNum">     295</span>                 :             : </span>
-<span id="L296"><span class="lineNum">     296</span>                 :             :       //calculate the max available loan size in stable rate mode as a percentage of the</span>
-<span id="L297"><span class="lineNum">     297</span>                 :             :       //available liquidity</span>
-<span id="L298"><span class="lineNum">     298</span>                 :<span class="tlaGNC">           6 :       uint256 maxLoanSizeStable = vars.availableLiquidity.percentMul(params.maxStableLoanPercent);</span></span>
-<span id="L299"><span class="lineNum">     299</span>                 :             : </span>
-<span id="L300"><span class="lineNum">     300</span>                 :<span class="tlaGNC">           4 :       require(params.amount &lt;= maxLoanSizeStable, Errors.AMOUNT_BIGGER_THAN_MAX_LOAN_SIZE_STABLE);</span></span>
-<span id="L301"><span class="lineNum">     301</span>                 :             :     }</span>
-<span id="L302"><span class="lineNum">     302</span>                 :             : </span>
-<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">       18194 :     if (params.userConfig.isBorrowingAny()) {</span></span>
-<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">          14 :       (vars.siloedBorrowingEnabled, vars.siloedBorrowingAddress) = params</span></span>
-<span id="L305"><span class="lineNum">     305</span>                 :             :         .userConfig</span>
-<span id="L306"><span class="lineNum">     306</span>                 :             :         .getSiloedBorrowingState(reservesData, reservesList);</span>
+<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">           7 :       if (vars.siloedBorrowingEnabled) {</span></span>
+<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">           1 :         require(vars.siloedBorrowingAddress == params.asset, Errors.SILOED_BORROWING_VIOLATION);</span></span>
+<span id="L271"><span class="lineNum">     271</span>                 :             :       } else {</span>
+<span id="L272"><span class="lineNum">     272</span>                 :<span class="tlaGNC">           6 :         require(</span></span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :           !params.reserveCache.reserveConfiguration.getSiloedBorrowing(),</span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :           Errors.SILOED_BORROWING_VIOLATION</span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :         );</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :       }</span>
+<span id="L277"><span class="lineNum">     277</span>                 :             :     }</span>
+<span id="L278"><span class="lineNum">     278</span>                 :             :   }</span>
+<span id="L279"><span class="lineNum">     279</span>                 :             : </span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :   /**</span>
+<span id="L281"><span class="lineNum">     281</span>                 :             :    * @notice Validates a repay action.</span>
+<span id="L282"><span class="lineNum">     282</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
+<span id="L283"><span class="lineNum">     283</span>                 :             :    * @param amountSent The amount sent for the repayment. Can be an actual value or uint(-1)</span>
+<span id="L284"><span class="lineNum">     284</span>                 :             :    * @param onBehalfOf The address of the user msg.sender is repaying for</span>
+<span id="L285"><span class="lineNum">     285</span>                 :             :    * @param debt The borrow balance of the user</span>
+<span id="L286"><span class="lineNum">     286</span>                 :             :    */</span>
+<span id="L287"><span class="lineNum">     287</span>                 :             :   function validateRepay(</span>
+<span id="L288"><span class="lineNum">     288</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
+<span id="L289"><span class="lineNum">     289</span>                 :             :     uint256 amountSent,</span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
+<span id="L291"><span class="lineNum">     291</span>                 :             :     address onBehalfOf,</span>
+<span id="L292"><span class="lineNum">     292</span>                 :             :     uint256 debt</span>
+<span id="L293"><span class="lineNum">     293</span>                 :             :   ) internal view {</span>
+<span id="L294"><span class="lineNum">     294</span>                 :<span class="tlaGNC">        5030 :     require(amountSent != 0, Errors.INVALID_AMOUNT);</span></span>
+<span id="L295"><span class="lineNum">     295</span>                 :<span class="tlaGNC">        5029 :     require(</span></span>
+<span id="L296"><span class="lineNum">     296</span>                 :             :       interestRateMode == DataTypes.InterestRateMode.VARIABLE,</span>
+<span id="L297"><span class="lineNum">     297</span>                 :             :       Errors.INVALID_INTEREST_RATE_MODE_SELECTED</span>
+<span id="L298"><span class="lineNum">     298</span>                 :             :     );</span>
+<span id="L299"><span class="lineNum">     299</span>                 :<span class="tlaGNC">        5028 :     require(</span></span>
+<span id="L300"><span class="lineNum">     300</span>                 :             :       amountSent != type(uint256).max || msg.sender == onBehalfOf,</span>
+<span id="L301"><span class="lineNum">     301</span>                 :             :       Errors.NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF</span>
+<span id="L302"><span class="lineNum">     302</span>                 :             :     );</span>
+<span id="L303"><span class="lineNum">     303</span>                 :             : </span>
+<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">        5027 :     (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
+<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">        5027 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L306"><span class="lineNum">     306</span>                 :<span class="tlaGNC">        5026 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
 <span id="L307"><span class="lineNum">     307</span>                 :             : </span>
-<span id="L308"><span class="lineNum">     308</span>                 :<span class="tlaGNC">           7 :       if (vars.siloedBorrowingEnabled) {</span></span>
-<span id="L309"><span class="lineNum">     309</span>                 :<span class="tlaGNC">           2 :         require(vars.siloedBorrowingAddress == params.asset, Errors.SILOED_BORROWING_VIOLATION);</span></span>
-<span id="L310"><span class="lineNum">     310</span>                 :             :       } else {</span>
-<span id="L311"><span class="lineNum">     311</span>                 :<span class="tlaGNC">          12 :         require(</span></span>
-<span id="L312"><span class="lineNum">     312</span>                 :             :           !params.reserveCache.reserveConfiguration.getSiloedBorrowing(),</span>
-<span id="L313"><span class="lineNum">     313</span>                 :             :           Errors.SILOED_BORROWING_VIOLATION</span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :         );</span>
-<span id="L315"><span class="lineNum">     315</span>                 :             :       }</span>
-<span id="L316"><span class="lineNum">     316</span>                 :             :     }</span>
-<span id="L317"><span class="lineNum">     317</span>                 :             :   }</span>
-<span id="L318"><span class="lineNum">     318</span>                 :             : </span>
-<span id="L319"><span class="lineNum">     319</span>                 :             :   /**</span>
-<span id="L320"><span class="lineNum">     320</span>                 :             :    * @notice Validates a repay action.</span>
-<span id="L321"><span class="lineNum">     321</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
-<span id="L322"><span class="lineNum">     322</span>                 :             :    * @param amountSent The amount sent for the repayment. Can be an actual value or uint(-1)</span>
-<span id="L323"><span class="lineNum">     323</span>                 :             :    * @param interestRateMode The interest rate mode of the debt being repaid</span>
-<span id="L324"><span class="lineNum">     324</span>                 :             :    * @param onBehalfOf The address of the user msg.sender is repaying for</span>
-<span id="L325"><span class="lineNum">     325</span>                 :             :    * @param stableDebt The borrow balance of the user</span>
-<span id="L326"><span class="lineNum">     326</span>                 :             :    * @param variableDebt The borrow balance of the user</span>
-<span id="L327"><span class="lineNum">     327</span>                 :             :    */</span>
-<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">        5029 :   function validateRepay(</span></span>
-<span id="L329"><span class="lineNum">     329</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
-<span id="L330"><span class="lineNum">     330</span>                 :             :     uint256 amountSent,</span>
-<span id="L331"><span class="lineNum">     331</span>                 :             :     DataTypes.InterestRateMode interestRateMode,</span>
-<span id="L332"><span class="lineNum">     332</span>                 :             :     address onBehalfOf,</span>
-<span id="L333"><span class="lineNum">     333</span>                 :             :     uint256 stableDebt,</span>
-<span id="L334"><span class="lineNum">     334</span>                 :             :     uint256 variableDebt</span>
-<span id="L335"><span class="lineNum">     335</span>                 :             :   ) internal view {</span>
-<span id="L336"><span class="lineNum">     336</span>                 :<span class="tlaGNC">       10058 :     require(amountSent != 0, Errors.INVALID_AMOUNT);</span></span>
-<span id="L337"><span class="lineNum">     337</span>                 :<span class="tlaGNC">       10056 :     require(</span></span>
-<span id="L338"><span class="lineNum">     338</span>                 :             :       amountSent != type(uint256).max || msg.sender == onBehalfOf,</span>
-<span id="L339"><span class="lineNum">     339</span>                 :             :       Errors.NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF</span>
-<span id="L340"><span class="lineNum">     340</span>                 :             :     );</span>
-<span id="L341"><span class="lineNum">     341</span>                 :             : </span>
-<span id="L342"><span class="lineNum">     342</span>                 :<span class="tlaGNC">       15081 :     (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
-<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC">       10054 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L344"><span class="lineNum">     344</span>                 :<span class="tlaGNC">       10052 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L345"><span class="lineNum">     345</span>                 :             : </span>
-<span id="L346"><span class="lineNum">     346</span>                 :<span class="tlaGNC">       10050 :     require(</span></span>
-<span id="L347"><span class="lineNum">     347</span>                 :             :       (stableDebt != 0 &amp;&amp; interestRateMode == DataTypes.InterestRateMode.STABLE) ||</span>
-<span id="L348"><span class="lineNum">     348</span>                 :             :         (variableDebt != 0 &amp;&amp; interestRateMode == DataTypes.InterestRateMode.VARIABLE),</span>
-<span id="L349"><span class="lineNum">     349</span>                 :             :       Errors.NO_DEBT_OF_SELECTED_TYPE</span>
-<span id="L350"><span class="lineNum">     350</span>                 :             :     );</span>
-<span id="L351"><span class="lineNum">     351</span>                 :             :   }</span>
-<span id="L352"><span class="lineNum">     352</span>                 :             : </span>
-<span id="L353"><span class="lineNum">     353</span>                 :             :   /**</span>
-<span id="L354"><span class="lineNum">     354</span>                 :             :    * @notice Validates a swap of borrow rate mode.</span>
-<span id="L355"><span class="lineNum">     355</span>                 :             :    * @param reserve The reserve state on which the user is swapping the rate</span>
-<span id="L356"><span class="lineNum">     356</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
-<span id="L357"><span class="lineNum">     357</span>                 :             :    * @param userConfig The user reserves configuration</span>
-<span id="L358"><span class="lineNum">     358</span>                 :             :    * @param stableDebt The stable debt of the user</span>
-<span id="L359"><span class="lineNum">     359</span>                 :             :    * @param variableDebt The variable debt of the user</span>
-<span id="L360"><span class="lineNum">     360</span>                 :             :    * @param currentRateMode The rate mode of the debt being swapped</span>
-<span id="L361"><span class="lineNum">     361</span>                 :             :    */</span>
-<span id="L362"><span class="lineNum">     362</span>                 :<span class="tlaGNC">           8 :   function validateSwapRateMode(</span></span>
-<span id="L363"><span class="lineNum">     363</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L364"><span class="lineNum">     364</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
-<span id="L365"><span class="lineNum">     365</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L366"><span class="lineNum">     366</span>                 :             :     uint256 stableDebt,</span>
-<span id="L367"><span class="lineNum">     367</span>                 :             :     uint256 variableDebt,</span>
-<span id="L368"><span class="lineNum">     368</span>                 :             :     DataTypes.InterestRateMode currentRateMode</span>
-<span id="L369"><span class="lineNum">     369</span>                 :             :   ) internal view {</span>
-<span id="L370"><span class="lineNum">     370</span>                 :<span class="tlaGNC">          24 :     (bool isActive, , , bool stableRateEnabled, bool isPaused) = reserveCache</span></span>
-<span id="L371"><span class="lineNum">     371</span>                 :             :       .reserveConfiguration</span>
-<span id="L372"><span class="lineNum">     372</span>                 :             :       .getFlags();</span>
-<span id="L373"><span class="lineNum">     373</span>                 :<span class="tlaGNC">          16 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L374"><span class="lineNum">     374</span>                 :<span class="tlaGNC">          14 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L375"><span class="lineNum">     375</span>                 :             : </span>
-<span id="L376"><span class="lineNum">     376</span>                 :<span class="tlaGNC">          12 :     if (currentRateMode == DataTypes.InterestRateMode.STABLE) {</span></span>
-<span id="L377"><span class="lineNum">     377</span>                 :<span class="tlaGNC">           2 :       require(stableDebt != 0, Errors.NO_OUTSTANDING_STABLE_DEBT);</span></span>
-<span id="L378"><span class="lineNum">     378</span>                 :<span class="tlaGNC">          10 :     } else if (currentRateMode == DataTypes.InterestRateMode.VARIABLE) {</span></span>
-<span id="L379"><span class="lineNum">     379</span>                 :<span class="tlaGNC">           8 :       require(variableDebt != 0, Errors.NO_OUTSTANDING_VARIABLE_DEBT);</span></span>
-<span id="L380"><span class="lineNum">     380</span>                 :             :       /**</span>
-<span id="L381"><span class="lineNum">     381</span>                 :             :        * user wants to swap to stable, before swapping we need to ensure that</span>
-<span id="L382"><span class="lineNum">     382</span>                 :             :        * 1. stable borrow rate is enabled on the reserve</span>
-<span id="L383"><span class="lineNum">     383</span>                 :             :        * 2. user is not trying to abuse the reserve by supplying</span>
-<span id="L384"><span class="lineNum">     384</span>                 :             :        * more collateral than he is borrowing, artificially lowering</span>
-<span id="L385"><span class="lineNum">     385</span>                 :             :        * the interest rate, borrowing at variable, and switching to stable</span>
-<span id="L386"><span class="lineNum">     386</span>                 :             :        */</span>
-<span id="L387"><span class="lineNum">     387</span>                 :<span class="tlaGNC">           6 :       require(stableRateEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);</span></span>
+<span id="L308"><span class="lineNum">     308</span>                 :<span class="tlaGNC">        5025 :     require(debt != 0, Errors.NO_DEBT_OF_SELECTED_TYPE);</span></span>
+<span id="L309"><span class="lineNum">     309</span>                 :             :   }</span>
+<span id="L310"><span class="lineNum">     310</span>                 :             : </span>
+<span id="L311"><span class="lineNum">     311</span>                 :             :   /**</span>
+<span id="L312"><span class="lineNum">     312</span>                 :             :    * @notice Validates the action of setting an asset as collateral.</span>
+<span id="L313"><span class="lineNum">     313</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
+<span id="L314"><span class="lineNum">     314</span>                 :             :    * @param userBalance The balance of the user</span>
+<span id="L315"><span class="lineNum">     315</span>                 :             :    */</span>
+<span id="L316"><span class="lineNum">     316</span>                 :             :   function validateSetUseReserveAsCollateral(</span>
+<span id="L317"><span class="lineNum">     317</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
+<span id="L318"><span class="lineNum">     318</span>                 :             :     uint256 userBalance</span>
+<span id="L319"><span class="lineNum">     319</span>                 :             :   ) internal pure {</span>
+<span id="L320"><span class="lineNum">     320</span>                 :<span class="tlaGNC">          43 :     require(userBalance != 0, Errors.UNDERLYING_BALANCE_ZERO);</span></span>
+<span id="L321"><span class="lineNum">     321</span>                 :             : </span>
+<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">          41 :     (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
+<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">          41 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">          39 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
+<span id="L325"><span class="lineNum">     325</span>                 :             :   }</span>
+<span id="L326"><span class="lineNum">     326</span>                 :             : </span>
+<span id="L327"><span class="lineNum">     327</span>                 :             :   /**</span>
+<span id="L328"><span class="lineNum">     328</span>                 :             :    * @notice Validates a flashloan action.</span>
+<span id="L329"><span class="lineNum">     329</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L330"><span class="lineNum">     330</span>                 :             :    * @param assets The assets being flash-borrowed</span>
+<span id="L331"><span class="lineNum">     331</span>                 :             :    * @param amounts The amounts for each asset being borrowed</span>
+<span id="L332"><span class="lineNum">     332</span>                 :             :    */</span>
+<span id="L333"><span class="lineNum">     333</span>                 :             :   function validateFlashloan(</span>
+<span id="L334"><span class="lineNum">     334</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L335"><span class="lineNum">     335</span>                 :             :     address[] memory assets,</span>
+<span id="L336"><span class="lineNum">     336</span>                 :             :     uint256[] memory amounts</span>
+<span id="L337"><span class="lineNum">     337</span>                 :             :   ) internal view {</span>
+<span id="L338"><span class="lineNum">     338</span>                 :<span class="tlaGNC">        1011 :     require(assets.length == amounts.length, Errors.INCONSISTENT_FLASHLOAN_PARAMS);</span></span>
+<span id="L339"><span class="lineNum">     339</span>                 :<span class="tlaGNC">        1011 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L340"><span class="lineNum">     340</span>                 :<span class="tlaGNC">        1012 :       for (uint256 j = i + 1; j &lt; assets.length; j++) {</span></span>
+<span id="L341"><span class="lineNum">     341</span>                 :<span class="tlaGNC">        1001 :         require(assets[i] != assets[j], Errors.INCONSISTENT_FLASHLOAN_PARAMS);</span></span>
+<span id="L342"><span class="lineNum">     342</span>                 :             :       }</span>
+<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC">          12 :       validateFlashloanSimple(reservesData[assets[i]], amounts[i]);</span></span>
+<span id="L344"><span class="lineNum">     344</span>                 :             :     }</span>
+<span id="L345"><span class="lineNum">     345</span>                 :             :   }</span>
+<span id="L346"><span class="lineNum">     346</span>                 :             : </span>
+<span id="L347"><span class="lineNum">     347</span>                 :             :   /**</span>
+<span id="L348"><span class="lineNum">     348</span>                 :             :    * @notice Validates a flashloan action.</span>
+<span id="L349"><span class="lineNum">     349</span>                 :             :    * @param reserve The state of the reserve</span>
+<span id="L350"><span class="lineNum">     350</span>                 :             :    */</span>
+<span id="L351"><span class="lineNum">     351</span>                 :             :   function validateFlashloanSimple(</span>
+<span id="L352"><span class="lineNum">     352</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
+<span id="L353"><span class="lineNum">     353</span>                 :             :     uint256 amount</span>
+<span id="L354"><span class="lineNum">     354</span>                 :             :   ) internal view {</span>
+<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaGNC">          23 :     DataTypes.ReserveConfigurationMap memory configuration = reserve.configuration;</span></span>
+<span id="L356"><span class="lineNum">     356</span>                 :<span class="tlaGNC">          23 :     require(!configuration.getPaused(), Errors.RESERVE_PAUSED);</span></span>
+<span id="L357"><span class="lineNum">     357</span>                 :<span class="tlaGNC">          22 :     require(configuration.getActive(), Errors.RESERVE_INACTIVE);</span></span>
+<span id="L358"><span class="lineNum">     358</span>                 :<span class="tlaGNC">          21 :     require(configuration.getFlashLoanEnabled(), Errors.FLASHLOAN_DISABLED);</span></span>
+<span id="L359"><span class="lineNum">     359</span>                 :<span class="tlaGNC">          20 :     require(</span></span>
+<span id="L360"><span class="lineNum">     360</span>                 :             :       !configuration.getIsVirtualAccActive() ||</span>
+<span id="L361"><span class="lineNum">     361</span>                 :             :         IERC20(reserve.aTokenAddress).totalSupply() &gt;= amount,</span>
+<span id="L362"><span class="lineNum">     362</span>                 :             :       Errors.INVALID_AMOUNT</span>
+<span id="L363"><span class="lineNum">     363</span>                 :             :     );</span>
+<span id="L364"><span class="lineNum">     364</span>                 :             :   }</span>
+<span id="L365"><span class="lineNum">     365</span>                 :             : </span>
+<span id="L366"><span class="lineNum">     366</span>                 :             :   struct ValidateLiquidationCallLocalVars {</span>
+<span id="L367"><span class="lineNum">     367</span>                 :             :     bool collateralReserveActive;</span>
+<span id="L368"><span class="lineNum">     368</span>                 :             :     bool collateralReservePaused;</span>
+<span id="L369"><span class="lineNum">     369</span>                 :             :     bool principalReserveActive;</span>
+<span id="L370"><span class="lineNum">     370</span>                 :             :     bool principalReservePaused;</span>
+<span id="L371"><span class="lineNum">     371</span>                 :             :     bool isCollateralEnabled;</span>
+<span id="L372"><span class="lineNum">     372</span>                 :             :   }</span>
+<span id="L373"><span class="lineNum">     373</span>                 :             : </span>
+<span id="L374"><span class="lineNum">     374</span>                 :             :   /**</span>
+<span id="L375"><span class="lineNum">     375</span>                 :             :    * @notice Validates the liquidation action.</span>
+<span id="L376"><span class="lineNum">     376</span>                 :             :    * @param userConfig The user configuration mapping</span>
+<span id="L377"><span class="lineNum">     377</span>                 :             :    * @param collateralReserve The reserve data of the collateral</span>
+<span id="L378"><span class="lineNum">     378</span>                 :             :    * @param debtReserve The reserve data of the debt</span>
+<span id="L379"><span class="lineNum">     379</span>                 :             :    * @param params Additional parameters needed for the validation</span>
+<span id="L380"><span class="lineNum">     380</span>                 :             :    */</span>
+<span id="L381"><span class="lineNum">     381</span>                 :             :   function validateLiquidationCall(</span>
+<span id="L382"><span class="lineNum">     382</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L383"><span class="lineNum">     383</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
+<span id="L384"><span class="lineNum">     384</span>                 :             :     DataTypes.ReserveData storage debtReserve,</span>
+<span id="L385"><span class="lineNum">     385</span>                 :             :     DataTypes.ValidateLiquidationCallParams memory params</span>
+<span id="L386"><span class="lineNum">     386</span>                 :             :   ) internal view {</span>
+<span id="L387"><span class="lineNum">     387</span>                 :<span class="tlaGNC">       14501 :     ValidateLiquidationCallLocalVars memory vars;</span></span>
 <span id="L388"><span class="lineNum">     388</span>                 :             : </span>
-<span id="L389"><span class="lineNum">     389</span>                 :<span class="tlaGNC">           6 :       require(</span></span>
-<span id="L390"><span class="lineNum">     390</span>                 :             :         !userConfig.isUsingAsCollateral(reserve.id) ||</span>
-<span id="L391"><span class="lineNum">     391</span>                 :             :           reserveCache.reserveConfiguration.getLtv() == 0 ||</span>
-<span id="L392"><span class="lineNum">     392</span>                 :             :           stableDebt + variableDebt &gt; IERC20(reserveCache.aTokenAddress).balanceOf(msg.sender),</span>
-<span id="L393"><span class="lineNum">     393</span>                 :             :         Errors.COLLATERAL_SAME_AS_BORROWING_CURRENCY</span>
-<span id="L394"><span class="lineNum">     394</span>                 :             :       );</span>
-<span id="L395"><span class="lineNum">     395</span>                 :             :     } else {</span>
-<span id="L396"><span class="lineNum">     396</span>                 :<span class="tlaGNC">           2 :       revert(Errors.INVALID_INTEREST_RATE_MODE_SELECTED);</span></span>
-<span id="L397"><span class="lineNum">     397</span>                 :             :     }</span>
-<span id="L398"><span class="lineNum">     398</span>                 :             :   }</span>
-<span id="L399"><span class="lineNum">     399</span>                 :             : </span>
-<span id="L400"><span class="lineNum">     400</span>                 :             :   /**</span>
-<span id="L401"><span class="lineNum">     401</span>                 :             :    * @notice Validates a stable borrow rate rebalance action.</span>
-<span id="L402"><span class="lineNum">     402</span>                 :             :    * @dev Rebalancing is accepted when depositors are earning &lt;= 90% of their earnings in pure supply/demand market (variable rate only)</span>
-<span id="L403"><span class="lineNum">     403</span>                 :             :    * For this to be the case, there has to be quite large stable debt with an interest rate below the current variable rate.</span>
-<span id="L404"><span class="lineNum">     404</span>                 :             :    * @param reserve The reserve state on which the user is getting rebalanced</span>
-<span id="L405"><span class="lineNum">     405</span>                 :             :    * @param reserveCache The cached state of the reserve</span>
-<span id="L406"><span class="lineNum">     406</span>                 :             :    * @param reserveAddress The address of the reserve</span>
-<span id="L407"><span class="lineNum">     407</span>                 :             :    */</span>
-<span id="L408"><span class="lineNum">     408</span>                 :<span class="tlaGNC">           5 :   function validateRebalanceStableBorrowRate(</span></span>
-<span id="L409"><span class="lineNum">     409</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L410"><span class="lineNum">     410</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
-<span id="L411"><span class="lineNum">     411</span>                 :             :     address reserveAddress</span>
-<span id="L412"><span class="lineNum">     412</span>                 :             :   ) internal view {</span>
-<span id="L413"><span class="lineNum">     413</span>                 :<span class="tlaGNC">          15 :     (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
-<span id="L414"><span class="lineNum">     414</span>                 :<span class="tlaGNC">          10 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L415"><span class="lineNum">     415</span>                 :<span class="tlaGNC">           8 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L416"><span class="lineNum">     416</span>                 :             : </span>
-<span id="L417"><span class="lineNum">     417</span>                 :<span class="tlaGNC">          12 :     uint256 totalDebt = IERC20(reserveCache.stableDebtTokenAddress).totalSupply() +</span></span>
-<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">           6 :       IERC20(reserveCache.variableDebtTokenAddress).totalSupply();</span></span>
-<span id="L419"><span class="lineNum">     419</span>                 :             : </span>
-<span id="L420"><span class="lineNum">     420</span>                 :<span class="tlaGNC">           9 :     (uint256 liquidityRateVariableDebtOnly, , ) = IReserveInterestRateStrategy(</span></span>
-<span id="L421"><span class="lineNum">     421</span>                 :             :       reserve.interestRateStrategyAddress</span>
-<span id="L422"><span class="lineNum">     422</span>                 :             :     ).calculateInterestRates(</span>
-<span id="L423"><span class="lineNum">     423</span>                 :             :         DataTypes.CalculateInterestRatesParams({</span>
-<span id="L424"><span class="lineNum">     424</span>                 :             :           unbacked: reserve.unbacked,</span>
-<span id="L425"><span class="lineNum">     425</span>                 :             :           liquidityAdded: 0,</span>
-<span id="L426"><span class="lineNum">     426</span>                 :             :           liquidityTaken: 0,</span>
-<span id="L427"><span class="lineNum">     427</span>                 :             :           totalStableDebt: 0,</span>
-<span id="L428"><span class="lineNum">     428</span>                 :             :           totalVariableDebt: totalDebt,</span>
-<span id="L429"><span class="lineNum">     429</span>                 :             :           averageStableBorrowRate: 0,</span>
-<span id="L430"><span class="lineNum">     430</span>                 :             :           reserveFactor: reserveCache.reserveFactor,</span>
-<span id="L431"><span class="lineNum">     431</span>                 :             :           reserve: reserveAddress,</span>
-<span id="L432"><span class="lineNum">     432</span>                 :             :           usingVirtualBalance: reserve.configuration.getIsVirtualAccActive(),</span>
-<span id="L433"><span class="lineNum">     433</span>                 :             :           virtualUnderlyingBalance: reserve.virtualUnderlyingBalance</span>
-<span id="L434"><span class="lineNum">     434</span>                 :             :         })</span>
-<span id="L435"><span class="lineNum">     435</span>                 :             :       );</span>
-<span id="L436"><span class="lineNum">     436</span>                 :             : </span>
-<span id="L437"><span class="lineNum">     437</span>                 :<span class="tlaGNC">           6 :     require(</span></span>
-<span id="L438"><span class="lineNum">     438</span>                 :             :       reserveCache.currLiquidityRate &lt;=</span>
-<span id="L439"><span class="lineNum">     439</span>                 :             :         liquidityRateVariableDebtOnly.percentMul(REBALANCE_UP_LIQUIDITY_RATE_THRESHOLD),</span>
-<span id="L440"><span class="lineNum">     440</span>                 :             :       Errors.INTEREST_RATE_REBALANCE_CONDITIONS_NOT_MET</span>
-<span id="L441"><span class="lineNum">     441</span>                 :             :     );</span>
-<span id="L442"><span class="lineNum">     442</span>                 :             :   }</span>
-<span id="L443"><span class="lineNum">     443</span>                 :             : </span>
-<span id="L444"><span class="lineNum">     444</span>                 :             :   /**</span>
-<span id="L445"><span class="lineNum">     445</span>                 :             :    * @notice Validates the action of setting an asset as collateral.</span>
-<span id="L446"><span class="lineNum">     446</span>                 :             :    * @param reserveCache The cached data of the reserve</span>
-<span id="L447"><span class="lineNum">     447</span>                 :             :    * @param userBalance The balance of the user</span>
-<span id="L448"><span class="lineNum">     448</span>                 :             :    */</span>
-<span id="L449"><span class="lineNum">     449</span>                 :<span class="tlaGNC">          43 :   function validateSetUseReserveAsCollateral(</span></span>
-<span id="L450"><span class="lineNum">     450</span>                 :             :     DataTypes.ReserveCache memory reserveCache,</span>
-<span id="L451"><span class="lineNum">     451</span>                 :             :     uint256 userBalance</span>
-<span id="L452"><span class="lineNum">     452</span>                 :             :   ) internal pure {</span>
-<span id="L453"><span class="lineNum">     453</span>                 :<span class="tlaGNC">          86 :     require(userBalance != 0, Errors.UNDERLYING_BALANCE_ZERO);</span></span>
-<span id="L454"><span class="lineNum">     454</span>                 :             : </span>
-<span id="L455"><span class="lineNum">     455</span>                 :<span class="tlaGNC">         123 :     (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();</span></span>
-<span id="L456"><span class="lineNum">     456</span>                 :<span class="tlaGNC">          82 :     require(isActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L457"><span class="lineNum">     457</span>                 :<span class="tlaGNC">          78 :     require(!isPaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L458"><span class="lineNum">     458</span>                 :             :   }</span>
-<span id="L459"><span class="lineNum">     459</span>                 :             : </span>
-<span id="L460"><span class="lineNum">     460</span>                 :             :   /**</span>
-<span id="L461"><span class="lineNum">     461</span>                 :             :    * @notice Validates a flashloan action.</span>
-<span id="L462"><span class="lineNum">     462</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L463"><span class="lineNum">     463</span>                 :             :    * @param assets The assets being flash-borrowed</span>
-<span id="L464"><span class="lineNum">     464</span>                 :             :    * @param amounts The amounts for each asset being borrowed</span>
-<span id="L465"><span class="lineNum">     465</span>                 :             :    */</span>
-<span id="L466"><span class="lineNum">     466</span>                 :<span class="tlaGNC">          10 :   function validateFlashloan(</span></span>
-<span id="L467"><span class="lineNum">     467</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L468"><span class="lineNum">     468</span>                 :             :     address[] memory assets,</span>
-<span id="L469"><span class="lineNum">     469</span>                 :             :     uint256[] memory amounts</span>
-<span id="L470"><span class="lineNum">     470</span>                 :             :   ) internal view {</span>
-<span id="L471"><span class="lineNum">     471</span>                 :<span class="tlaGNC">          20 :     require(assets.length == amounts.length, Errors.INCONSISTENT_FLASHLOAN_PARAMS);</span></span>
-<span id="L472"><span class="lineNum">     472</span>                 :<span class="tlaGNC">          44 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L473"><span class="lineNum">     473</span>                 :<span class="tlaGNC">          22 :       validateFlashloanSimple(reservesData[assets[i]], amounts[i]);</span></span>
-<span id="L474"><span class="lineNum">     474</span>                 :             :     }</span>
-<span id="L475"><span class="lineNum">     475</span>                 :             :   }</span>
-<span id="L476"><span class="lineNum">     476</span>                 :             : </span>
-<span id="L477"><span class="lineNum">     477</span>                 :             :   /**</span>
-<span id="L478"><span class="lineNum">     478</span>                 :             :    * @notice Validates a flashloan action.</span>
-<span id="L479"><span class="lineNum">     479</span>                 :             :    * @param reserve The state of the reserve</span>
-<span id="L480"><span class="lineNum">     480</span>                 :             :    */</span>
-<span id="L481"><span class="lineNum">     481</span>                 :<span class="tlaGNC">          21 :   function validateFlashloanSimple(</span></span>
-<span id="L482"><span class="lineNum">     482</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L483"><span class="lineNum">     483</span>                 :             :     uint256 amount</span>
-<span id="L484"><span class="lineNum">     484</span>                 :             :   ) internal view {</span>
-<span id="L485"><span class="lineNum">     485</span>                 :<span class="tlaGNC">          42 :     DataTypes.ReserveConfigurationMap memory configuration = reserve.configuration;</span></span>
-<span id="L486"><span class="lineNum">     486</span>                 :<span class="tlaGNC">          42 :     require(!configuration.getPaused(), Errors.RESERVE_PAUSED);</span></span>
-<span id="L487"><span class="lineNum">     487</span>                 :<span class="tlaGNC">          40 :     require(configuration.getActive(), Errors.RESERVE_INACTIVE);</span></span>
-<span id="L488"><span class="lineNum">     488</span>                 :<span class="tlaGNC">          38 :     require(configuration.getFlashLoanEnabled(), Errors.FLASHLOAN_DISABLED);</span></span>
-<span id="L489"><span class="lineNum">     489</span>                 :<span class="tlaGNC">          36 :     require(IERC20(reserve.aTokenAddress).totalSupply() &gt;= amount, Errors.INVALID_AMOUNT);</span></span>
-<span id="L490"><span class="lineNum">     490</span>                 :             :   }</span>
-<span id="L491"><span class="lineNum">     491</span>                 :             : </span>
-<span id="L492"><span class="lineNum">     492</span>                 :             :   struct ValidateLiquidationCallLocalVars {</span>
-<span id="L493"><span class="lineNum">     493</span>                 :             :     bool collateralReserveActive;</span>
-<span id="L494"><span class="lineNum">     494</span>                 :             :     bool collateralReservePaused;</span>
-<span id="L495"><span class="lineNum">     495</span>                 :             :     bool principalReserveActive;</span>
-<span id="L496"><span class="lineNum">     496</span>                 :             :     bool principalReservePaused;</span>
-<span id="L497"><span class="lineNum">     497</span>                 :             :     bool isCollateralEnabled;</span>
-<span id="L498"><span class="lineNum">     498</span>                 :             :   }</span>
-<span id="L499"><span class="lineNum">     499</span>                 :             : </span>
-<span id="L500"><span class="lineNum">     500</span>                 :             :   /**</span>
-<span id="L501"><span class="lineNum">     501</span>                 :             :    * @notice Validates the liquidation action.</span>
-<span id="L502"><span class="lineNum">     502</span>                 :             :    * @param userConfig The user configuration mapping</span>
-<span id="L503"><span class="lineNum">     503</span>                 :             :    * @param collateralReserve The reserve data of the collateral</span>
-<span id="L504"><span class="lineNum">     504</span>                 :             :    * @param debtReserve The reserve data of the debt</span>
-<span id="L505"><span class="lineNum">     505</span>                 :             :    * @param params Additional parameters needed for the validation</span>
-<span id="L506"><span class="lineNum">     506</span>                 :             :    */</span>
-<span id="L507"><span class="lineNum">     507</span>                 :<span class="tlaGNC">       11292 :   function validateLiquidationCall(</span></span>
-<span id="L508"><span class="lineNum">     508</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L509"><span class="lineNum">     509</span>                 :             :     DataTypes.ReserveData storage collateralReserve,</span>
-<span id="L510"><span class="lineNum">     510</span>                 :             :     DataTypes.ReserveData storage debtReserve,</span>
-<span id="L511"><span class="lineNum">     511</span>                 :             :     DataTypes.ValidateLiquidationCallParams memory params</span>
-<span id="L512"><span class="lineNum">     512</span>                 :             :   ) internal view {</span>
-<span id="L513"><span class="lineNum">     513</span>                 :<span class="tlaGNC">       22584 :     ValidateLiquidationCallLocalVars memory vars;</span></span>
-<span id="L514"><span class="lineNum">     514</span>                 :             : </span>
-<span id="L515"><span class="lineNum">     515</span>                 :<span class="tlaGNC">       22584 :     (vars.collateralReserveActive, , , , vars.collateralReservePaused) = collateralReserve</span></span>
-<span id="L516"><span class="lineNum">     516</span>                 :             :       .configuration</span>
-<span id="L517"><span class="lineNum">     517</span>                 :             :       .getFlags();</span>
-<span id="L518"><span class="lineNum">     518</span>                 :             : </span>
-<span id="L519"><span class="lineNum">     519</span>                 :<span class="tlaGNC">       22584 :     (vars.principalReserveActive, , , , vars.principalReservePaused) = params</span></span>
-<span id="L520"><span class="lineNum">     520</span>                 :             :       .debtReserveCache</span>
-<span id="L521"><span class="lineNum">     521</span>                 :             :       .reserveConfiguration</span>
-<span id="L522"><span class="lineNum">     522</span>                 :             :       .getFlags();</span>
-<span id="L523"><span class="lineNum">     523</span>                 :             : </span>
-<span id="L524"><span class="lineNum">     524</span>                 :<span class="tlaGNC">       22584 :     require(vars.collateralReserveActive &amp;&amp; vars.principalReserveActive, Errors.RESERVE_INACTIVE);</span></span>
-<span id="L525"><span class="lineNum">     525</span>                 :<span class="tlaGNC">       22582 :     require(!vars.collateralReservePaused &amp;&amp; !vars.principalReservePaused, Errors.RESERVE_PAUSED);</span></span>
-<span id="L526"><span class="lineNum">     526</span>                 :             : </span>
-<span id="L527"><span class="lineNum">     527</span>                 :<span class="tlaGNC">       22580 :     require(</span></span>
-<span id="L528"><span class="lineNum">     528</span>                 :             :       params.priceOracleSentinel == address(0) ||</span>
-<span id="L529"><span class="lineNum">     529</span>                 :             :         params.healthFactor &lt; MINIMUM_HEALTH_FACTOR_LIQUIDATION_THRESHOLD ||</span>
-<span id="L530"><span class="lineNum">     530</span>                 :             :         IPriceOracleSentinel(params.priceOracleSentinel).isLiquidationAllowed(),</span>
-<span id="L531"><span class="lineNum">     531</span>                 :             :       Errors.PRICE_ORACLE_SENTINEL_CHECK_FAILED</span>
-<span id="L532"><span class="lineNum">     532</span>                 :             :     );</span>
-<span id="L533"><span class="lineNum">     533</span>                 :             : </span>
-<span id="L534"><span class="lineNum">     534</span>                 :<span class="tlaGNC">       22578 :     require(</span></span>
-<span id="L535"><span class="lineNum">     535</span>                 :             :       collateralReserve.liquidationGracePeriodUntil &lt; uint40(block.timestamp) &amp;&amp;</span>
-<span id="L536"><span class="lineNum">     536</span>                 :             :         debtReserve.liquidationGracePeriodUntil &lt; uint40(block.timestamp),</span>
-<span id="L537"><span class="lineNum">     537</span>                 :             :       Errors.LIQUIDATION_GRACE_SENTINEL_CHECK_FAILED</span>
-<span id="L538"><span class="lineNum">     538</span>                 :             :     );</span>
-<span id="L539"><span class="lineNum">     539</span>                 :             : </span>
-<span id="L540"><span class="lineNum">     540</span>                 :<span class="tlaGNC">       12030 :     require(</span></span>
-<span id="L541"><span class="lineNum">     541</span>                 :             :       params.healthFactor &lt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
-<span id="L542"><span class="lineNum">     542</span>                 :             :       Errors.HEALTH_FACTOR_NOT_BELOW_THRESHOLD</span>
-<span id="L543"><span class="lineNum">     543</span>                 :             :     );</span>
-<span id="L544"><span class="lineNum">     544</span>                 :             : </span>
-<span id="L545"><span class="lineNum">     545</span>                 :<span class="tlaGNC">       12028 :     vars.isCollateralEnabled =</span></span>
-<span id="L546"><span class="lineNum">     546</span>                 :             :       collateralReserve.configuration.getLiquidationThreshold() != 0 &amp;&amp;</span>
-<span id="L547"><span class="lineNum">     547</span>                 :             :       userConfig.isUsingAsCollateral(collateralReserve.id);</span>
-<span id="L548"><span class="lineNum">     548</span>                 :             : </span>
-<span id="L549"><span class="lineNum">     549</span>                 :             :     //if collateral isn't enabled as collateral by user, it cannot be liquidated</span>
-<span id="L550"><span class="lineNum">     550</span>                 :<span class="tlaGNC">       12028 :     require(vars.isCollateralEnabled, Errors.COLLATERAL_CANNOT_BE_LIQUIDATED);</span></span>
-<span id="L551"><span class="lineNum">     551</span>                 :<span class="tlaGNC">       12026 :     require(params.totalDebt != 0, Errors.SPECIFIED_CURRENCY_NOT_BORROWED_BY_USER);</span></span>
-<span id="L552"><span class="lineNum">     552</span>                 :             :   }</span>
-<span id="L553"><span class="lineNum">     553</span>                 :             : </span>
-<span id="L554"><span class="lineNum">     554</span>                 :             :   /**</span>
-<span id="L555"><span class="lineNum">     555</span>                 :             :    * @notice Validates the health factor of a user.</span>
-<span id="L556"><span class="lineNum">     556</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L557"><span class="lineNum">     557</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L558"><span class="lineNum">     558</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L559"><span class="lineNum">     559</span>                 :             :    * @param userConfig The state of the user for the specific reserve</span>
-<span id="L560"><span class="lineNum">     560</span>                 :             :    * @param user The user to validate health factor of</span>
-<span id="L561"><span class="lineNum">     561</span>                 :             :    * @param userEModeCategory The users active efficiency mode category</span>
-<span id="L562"><span class="lineNum">     562</span>                 :             :    * @param reservesCount The number of available reserves</span>
-<span id="L563"><span class="lineNum">     563</span>                 :             :    * @param oracle The price oracle</span>
-<span id="L564"><span class="lineNum">     564</span>                 :             :    */</span>
-<span id="L565"><span class="lineNum">     565</span>                 :<span class="tlaGNC">          27 :   function validateHealthFactor(</span></span>
-<span id="L566"><span class="lineNum">     566</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L567"><span class="lineNum">     567</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L568"><span class="lineNum">     568</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L569"><span class="lineNum">     569</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
-<span id="L570"><span class="lineNum">     570</span>                 :             :     address user,</span>
-<span id="L571"><span class="lineNum">     571</span>                 :             :     uint8 userEModeCategory,</span>
-<span id="L572"><span class="lineNum">     572</span>                 :             :     uint256 reservesCount,</span>
-<span id="L573"><span class="lineNum">     573</span>                 :             :     address oracle</span>
-<span id="L574"><span class="lineNum">     574</span>                 :             :   ) internal view returns (uint256, bool) {</span>
-<span id="L575"><span class="lineNum">     575</span>                 :<span class="tlaGNC">          81 :     (, , , , uint256 healthFactor, bool hasZeroLtvCollateral) = GenericLogic</span></span>
-<span id="L576"><span class="lineNum">     576</span>                 :             :       .calculateUserAccountData(</span>
-<span id="L577"><span class="lineNum">     577</span>                 :             :         reservesData,</span>
-<span id="L578"><span class="lineNum">     578</span>                 :             :         reservesList,</span>
-<span id="L579"><span class="lineNum">     579</span>                 :             :         eModeCategories,</span>
-<span id="L580"><span class="lineNum">     580</span>                 :             :         DataTypes.CalculateUserAccountDataParams({</span>
-<span id="L581"><span class="lineNum">     581</span>                 :             :           userConfig: userConfig,</span>
-<span id="L582"><span class="lineNum">     582</span>                 :             :           reservesCount: reservesCount,</span>
-<span id="L583"><span class="lineNum">     583</span>                 :             :           user: user,</span>
-<span id="L584"><span class="lineNum">     584</span>                 :             :           oracle: oracle,</span>
-<span id="L585"><span class="lineNum">     585</span>                 :             :           userEModeCategory: userEModeCategory</span>
-<span id="L586"><span class="lineNum">     586</span>                 :             :         })</span>
-<span id="L587"><span class="lineNum">     587</span>                 :             :       );</span>
-<span id="L588"><span class="lineNum">     588</span>                 :             : </span>
-<span id="L589"><span class="lineNum">     589</span>                 :<span class="tlaGNC">          54 :     require(</span></span>
-<span id="L590"><span class="lineNum">     590</span>                 :             :       healthFactor &gt;= HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
-<span id="L591"><span class="lineNum">     591</span>                 :             :       Errors.HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD</span>
-<span id="L592"><span class="lineNum">     592</span>                 :             :     );</span>
-<span id="L593"><span class="lineNum">     593</span>                 :             : </span>
-<span id="L594"><span class="lineNum">     594</span>                 :<span class="tlaGNC">          42 :     return (healthFactor, hasZeroLtvCollateral);</span></span>
-<span id="L595"><span class="lineNum">     595</span>                 :             :   }</span>
-<span id="L596"><span class="lineNum">     596</span>                 :             : </span>
-<span id="L597"><span class="lineNum">     597</span>                 :             :   /**</span>
-<span id="L598"><span class="lineNum">     598</span>                 :             :    * @notice Validates the health factor of a user and the ltv of the asset being withdrawn.</span>
-<span id="L599"><span class="lineNum">     599</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L600"><span class="lineNum">     600</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L601"><span class="lineNum">     601</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
-<span id="L602"><span class="lineNum">     602</span>                 :             :    * @param userConfig The state of the user for the specific reserve</span>
-<span id="L603"><span class="lineNum">     603</span>                 :             :    * @param asset The asset for which the ltv will be validated</span>
-<span id="L604"><span class="lineNum">     604</span>                 :             :    * @param from The user from which the aTokens are being transferred</span>
-<span id="L605"><span class="lineNum">     605</span>                 :             :    * @param reservesCount The number of available reserves</span>
-<span id="L606"><span class="lineNum">     606</span>                 :             :    * @param oracle The price oracle</span>
-<span id="L607"><span class="lineNum">     607</span>                 :             :    * @param userEModeCategory The users active efficiency mode category</span>
-<span id="L608"><span class="lineNum">     608</span>                 :             :    */</span>
-<span id="L609"><span class="lineNum">     609</span>                 :<span class="tlaGNC">          23 :   function validateHFAndLtv(</span></span>
-<span id="L610"><span class="lineNum">     610</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L611"><span class="lineNum">     611</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L612"><span class="lineNum">     612</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L613"><span class="lineNum">     613</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
-<span id="L614"><span class="lineNum">     614</span>                 :             :     address asset,</span>
-<span id="L615"><span class="lineNum">     615</span>                 :             :     address from,</span>
-<span id="L616"><span class="lineNum">     616</span>                 :             :     uint256 reservesCount,</span>
-<span id="L617"><span class="lineNum">     617</span>                 :             :     address oracle,</span>
-<span id="L618"><span class="lineNum">     618</span>                 :             :     uint8 userEModeCategory</span>
-<span id="L619"><span class="lineNum">     619</span>                 :             :   ) internal view {</span>
-<span id="L620"><span class="lineNum">     620</span>                 :<span class="tlaGNC">          46 :     DataTypes.ReserveData memory reserve = reservesData[asset];</span></span>
-<span id="L621"><span class="lineNum">     621</span>                 :             : </span>
-<span id="L622"><span class="lineNum">     622</span>                 :<span class="tlaGNC">          69 :     (, bool hasZeroLtvCollateral) = validateHealthFactor(</span></span>
-<span id="L623"><span class="lineNum">     623</span>                 :             :       reservesData,</span>
-<span id="L624"><span class="lineNum">     624</span>                 :             :       reservesList,</span>
-<span id="L625"><span class="lineNum">     625</span>                 :             :       eModeCategories,</span>
-<span id="L626"><span class="lineNum">     626</span>                 :             :       userConfig,</span>
-<span id="L627"><span class="lineNum">     627</span>                 :             :       from,</span>
-<span id="L628"><span class="lineNum">     628</span>                 :             :       userEModeCategory,</span>
-<span id="L629"><span class="lineNum">     629</span>                 :             :       reservesCount,</span>
-<span id="L630"><span class="lineNum">     630</span>                 :             :       oracle</span>
-<span id="L631"><span class="lineNum">     631</span>                 :             :     );</span>
-<span id="L632"><span class="lineNum">     632</span>                 :             : </span>
-<span id="L633"><span class="lineNum">     633</span>                 :<span class="tlaGNC">          38 :     require(</span></span>
-<span id="L634"><span class="lineNum">     634</span>                 :             :       !hasZeroLtvCollateral || reserve.configuration.getLtv() == 0,</span>
-<span id="L635"><span class="lineNum">     635</span>                 :             :       Errors.LTV_VALIDATION_FAILED</span>
-<span id="L636"><span class="lineNum">     636</span>                 :             :     );</span>
-<span id="L637"><span class="lineNum">     637</span>                 :             :   }</span>
-<span id="L638"><span class="lineNum">     638</span>                 :             : </span>
-<span id="L639"><span class="lineNum">     639</span>                 :             :   /**</span>
-<span id="L640"><span class="lineNum">     640</span>                 :             :    * @notice Validates a transfer action.</span>
-<span id="L641"><span class="lineNum">     641</span>                 :             :    * @param reserve The reserve object</span>
-<span id="L642"><span class="lineNum">     642</span>                 :             :    */</span>
-<span id="L643"><span class="lineNum">     643</span>                 :<span class="tlaGNC">        1036 :   function validateTransfer(DataTypes.ReserveData storage reserve) internal view {</span></span>
-<span id="L644"><span class="lineNum">     644</span>                 :<span class="tlaGNC">        2072 :     require(!reserve.configuration.getPaused(), Errors.RESERVE_PAUSED);</span></span>
-<span id="L645"><span class="lineNum">     645</span>                 :             :   }</span>
-<span id="L646"><span class="lineNum">     646</span>                 :             : </span>
-<span id="L647"><span class="lineNum">     647</span>                 :             :   /**</span>
-<span id="L648"><span class="lineNum">     648</span>                 :             :    * @notice Validates a drop reserve action.</span>
-<span id="L649"><span class="lineNum">     649</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L650"><span class="lineNum">     650</span>                 :             :    * @param reserve The reserve object</span>
-<span id="L651"><span class="lineNum">     651</span>                 :             :    * @param asset The address of the reserve's underlying asset</span>
-<span id="L652"><span class="lineNum">     652</span>                 :             :    */</span>
-<span id="L653"><span class="lineNum">     653</span>                 :<span class="tlaGNC">           9 :   function validateDropReserve(</span></span>
-<span id="L654"><span class="lineNum">     654</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L655"><span class="lineNum">     655</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
-<span id="L656"><span class="lineNum">     656</span>                 :             :     address asset</span>
-<span id="L657"><span class="lineNum">     657</span>                 :             :   ) internal view {</span>
-<span id="L658"><span class="lineNum">     658</span>                 :<span class="tlaGNC">          18 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
-<span id="L659"><span class="lineNum">     659</span>                 :<span class="tlaGNC">          16 :     require(reserve.id != 0 || reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
-<span id="L660"><span class="lineNum">     660</span>                 :<span class="tlaGNC">          14 :     require(IERC20(reserve.stableDebtTokenAddress).totalSupply() == 0, Errors.STABLE_DEBT_NOT_ZERO);</span></span>
-<span id="L661"><span class="lineNum">     661</span>                 :<span class="tlaGNC">          14 :     require(</span></span>
-<span id="L662"><span class="lineNum">     662</span>                 :             :       IERC20(reserve.variableDebtTokenAddress).totalSupply() == 0,</span>
-<span id="L663"><span class="lineNum">     663</span>                 :             :       Errors.VARIABLE_DEBT_SUPPLY_NOT_ZERO</span>
-<span id="L664"><span class="lineNum">     664</span>                 :             :     );</span>
-<span id="L665"><span class="lineNum">     665</span>                 :<span class="tlaGNC">          12 :     require(</span></span>
-<span id="L666"><span class="lineNum">     666</span>                 :             :       IERC20(reserve.aTokenAddress).totalSupply() == 0 &amp;&amp; reserve.accruedToTreasury == 0,</span>
-<span id="L667"><span class="lineNum">     667</span>                 :             :       Errors.UNDERLYING_CLAIMABLE_RIGHTS_NOT_ZERO</span>
-<span id="L668"><span class="lineNum">     668</span>                 :             :     );</span>
-<span id="L669"><span class="lineNum">     669</span>                 :             :   }</span>
-<span id="L670"><span class="lineNum">     670</span>                 :             : </span>
-<span id="L671"><span class="lineNum">     671</span>                 :             :   /**</span>
-<span id="L672"><span class="lineNum">     672</span>                 :             :    * @notice Validates the action of setting efficiency mode.</span>
-<span id="L673"><span class="lineNum">     673</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L674"><span class="lineNum">     674</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L675"><span class="lineNum">     675</span>                 :             :    * @param eModeCategories a mapping storing configurations for all efficiency mode categories</span>
-<span id="L676"><span class="lineNum">     676</span>                 :             :    * @param userConfig the user configuration</span>
-<span id="L677"><span class="lineNum">     677</span>                 :             :    * @param reservesCount The total number of valid reserves</span>
-<span id="L678"><span class="lineNum">     678</span>                 :             :    * @param categoryId The id of the category</span>
-<span id="L679"><span class="lineNum">     679</span>                 :             :    */</span>
-<span id="L680"><span class="lineNum">     680</span>                 :<span class="tlaGNC">          17 :   function validateSetUserEMode(</span></span>
-<span id="L681"><span class="lineNum">     681</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L682"><span class="lineNum">     682</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L683"><span class="lineNum">     683</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
-<span id="L684"><span class="lineNum">     684</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
-<span id="L685"><span class="lineNum">     685</span>                 :             :     uint256 reservesCount,</span>
-<span id="L686"><span class="lineNum">     686</span>                 :             :     uint8 categoryId</span>
-<span id="L687"><span class="lineNum">     687</span>                 :             :   ) internal view {</span>
-<span id="L688"><span class="lineNum">     688</span>                 :             :     // category is invalid if the liq threshold is not set</span>
-<span id="L689"><span class="lineNum">     689</span>                 :<span class="tlaGNC">          34 :     require(</span></span>
-<span id="L690"><span class="lineNum">     690</span>                 :             :       categoryId == 0 || eModeCategories[categoryId].liquidationThreshold != 0,</span>
-<span id="L691"><span class="lineNum">     691</span>                 :             :       Errors.INCONSISTENT_EMODE_CATEGORY</span>
-<span id="L692"><span class="lineNum">     692</span>                 :             :     );</span>
-<span id="L693"><span class="lineNum">     693</span>                 :             : </span>
-<span id="L694"><span class="lineNum">     694</span>                 :             :     // eMode can always be enabled if the user hasn't supplied anything</span>
-<span id="L695"><span class="lineNum">     695</span>                 :<span class="tlaGNC">          34 :     if (userConfig.isEmpty()) {</span></span>
-<span id="L696"><span class="lineNum">     696</span>                 :<span class="tlaGNC">          34 :       return;</span></span>
-<span id="L697"><span class="lineNum">     697</span>                 :             :     }</span>
-<span id="L698"><span class="lineNum">     698</span>                 :             : </span>
-<span id="L699"><span class="lineNum">     699</span>                 :             :     // if user is trying to set another category than default we require that</span>
-<span id="L700"><span class="lineNum">     700</span>                 :             :     // either the user is not borrowing, or it's borrowing assets of categoryId</span>
-<span id="L701"><span class="lineNum">     701</span>                 :<span class="tlaGNC">           8 :     if (categoryId != 0) {</span></span>
-<span id="L702"><span class="lineNum">     702</span>                 :             :       unchecked {</span>
-<span id="L703"><span class="lineNum">     703</span>                 :<span class="tlaGNC">          14 :         for (uint256 i = 0; i &lt; reservesCount; i++) {</span></span>
-<span id="L704"><span class="lineNum">     704</span>                 :<span class="tlaGNC">          12 :           if (userConfig.isBorrowing(i)) {</span></span>
-<span id="L705"><span class="lineNum">     705</span>                 :<span class="tlaGNC">           4 :             DataTypes.ReserveConfigurationMap memory configuration = reservesData[reservesList[i]]</span></span>
-<span id="L706"><span class="lineNum">     706</span>                 :             :               .configuration;</span>
-<span id="L707"><span class="lineNum">     707</span>                 :<span class="tlaGNC">           4 :             require(</span></span>
-<span id="L708"><span class="lineNum">     708</span>                 :             :               configuration.getEModeCategory() == categoryId,</span>
-<span id="L709"><span class="lineNum">     709</span>                 :             :               Errors.INCONSISTENT_EMODE_CATEGORY</span>
-<span id="L710"><span class="lineNum">     710</span>                 :             :             );</span>
-<span id="L711"><span class="lineNum">     711</span>                 :             :           }</span>
-<span id="L712"><span class="lineNum">     712</span>                 :             :         }</span>
-<span id="L713"><span class="lineNum">     713</span>                 :             :       }</span>
-<span id="L714"><span class="lineNum">     714</span>                 :             :     }</span>
-<span id="L715"><span class="lineNum">     715</span>                 :             :   }</span>
-<span id="L716"><span class="lineNum">     716</span>                 :             : </span>
-<span id="L717"><span class="lineNum">     717</span>                 :             :   /**</span>
-<span id="L718"><span class="lineNum">     718</span>                 :             :    * @notice Validates the action of activating the asset as collateral.</span>
-<span id="L719"><span class="lineNum">     719</span>                 :             :    * @dev Only possible if the asset has non-zero LTV and the user is not in isolation mode</span>
-<span id="L720"><span class="lineNum">     720</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L721"><span class="lineNum">     721</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L722"><span class="lineNum">     722</span>                 :             :    * @param userConfig the user configuration</span>
-<span id="L723"><span class="lineNum">     723</span>                 :             :    * @param reserveConfig The reserve configuration</span>
-<span id="L724"><span class="lineNum">     724</span>                 :             :    * @return True if the asset can be activated as collateral, false otherwise</span>
-<span id="L725"><span class="lineNum">     725</span>                 :             :    */</span>
-<span id="L726"><span class="lineNum">     726</span>                 :<span class="tlaGNC">       13338 :   function validateUseAsCollateral(</span></span>
-<span id="L727"><span class="lineNum">     727</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L728"><span class="lineNum">     728</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L729"><span class="lineNum">     729</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L730"><span class="lineNum">     730</span>                 :             :     DataTypes.ReserveConfigurationMap memory reserveConfig</span>
-<span id="L731"><span class="lineNum">     731</span>                 :             :   ) internal view returns (bool) {</span>
-<span id="L732"><span class="lineNum">     732</span>                 :<span class="tlaGNC">       40014 :     if (reserveConfig.getLtv() == 0) {</span></span>
-<span id="L733"><span class="lineNum">     733</span>                 :<span class="tlaGNC">           6 :       return false;</span></span>
-<span id="L734"><span class="lineNum">     734</span>                 :             :     }</span>
-<span id="L735"><span class="lineNum">     735</span>                 :<span class="tlaGNC">       26670 :     if (!userConfig.isUsingAsCollateralAny()) {</span></span>
-<span id="L736"><span class="lineNum">     736</span>                 :<span class="tlaGNC">       24510 :       return true;</span></span>
-<span id="L737"><span class="lineNum">     737</span>                 :             :     }</span>
-<span id="L738"><span class="lineNum">     738</span>                 :<span class="tlaGNC">        3240 :     (bool isolationModeActive, , ) = userConfig.getIsolationModeState(reservesData, reservesList);</span></span>
-<span id="L739"><span class="lineNum">     739</span>                 :             : </span>
-<span id="L740"><span class="lineNum">     740</span>                 :<span class="tlaGNC">        2160 :     return (!isolationModeActive &amp;&amp; reserveConfig.getDebtCeiling() == 0);</span></span>
-<span id="L741"><span class="lineNum">     741</span>                 :             :   }</span>
-<span id="L742"><span class="lineNum">     742</span>                 :             : </span>
-<span id="L743"><span class="lineNum">     743</span>                 :             :   /**</span>
-<span id="L744"><span class="lineNum">     744</span>                 :             :    * @notice Validates if an asset should be automatically activated as collateral in the following actions: supply,</span>
-<span id="L745"><span class="lineNum">     745</span>                 :             :    * transfer, mint unbacked, and liquidate</span>
-<span id="L746"><span class="lineNum">     746</span>                 :             :    * @dev This is used to ensure that isolated assets are not enabled as collateral automatically</span>
-<span id="L747"><span class="lineNum">     747</span>                 :             :    * @param reservesData The state of all the reserves</span>
-<span id="L748"><span class="lineNum">     748</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
-<span id="L749"><span class="lineNum">     749</span>                 :             :    * @param userConfig the user configuration</span>
-<span id="L750"><span class="lineNum">     750</span>                 :             :    * @param reserveConfig The reserve configuration</span>
-<span id="L751"><span class="lineNum">     751</span>                 :             :    * @return True if the asset can be activated as collateral, false otherwise</span>
-<span id="L752"><span class="lineNum">     752</span>                 :             :    */</span>
-<span id="L753"><span class="lineNum">     753</span>                 :<span class="tlaGNC">       13331 :   function validateAutomaticUseAsCollateral(</span></span>
-<span id="L754"><span class="lineNum">     754</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
-<span id="L755"><span class="lineNum">     755</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
-<span id="L756"><span class="lineNum">     756</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
-<span id="L757"><span class="lineNum">     757</span>                 :             :     DataTypes.ReserveConfigurationMap memory reserveConfig,</span>
-<span id="L758"><span class="lineNum">     758</span>                 :             :     address aTokenAddress</span>
-<span id="L759"><span class="lineNum">     759</span>                 :             :   ) internal view returns (bool) {</span>
-<span id="L760"><span class="lineNum">     760</span>                 :<span class="tlaGNC">       39993 :     if (reserveConfig.getDebtCeiling() != 0) {</span></span>
-<span id="L761"><span class="lineNum">     761</span>                 :             :       // ensures only the ISOLATED_COLLATERAL_SUPPLIER_ROLE can enable collateral as side-effect of an action</span>
-<span id="L762"><span class="lineNum">     762</span>                 :<span class="tlaGNC">          36 :       IPoolAddressesProvider addressesProvider = IncentivizedERC20(aTokenAddress)</span></span>
-<span id="L763"><span class="lineNum">     763</span>                 :             :         .POOL()</span>
-<span id="L764"><span class="lineNum">     764</span>                 :             :         .ADDRESSES_PROVIDER();</span>
-<span id="L765"><span class="lineNum">     765</span>                 :             :       if (</span>
-<span id="L766"><span class="lineNum">     766</span>                 :<span class="tlaGNC">          24 :         !IAccessControl(addressesProvider.getACLManager()).hasRole(</span></span>
-<span id="L767"><span class="lineNum">     767</span>                 :             :           ISOLATED_COLLATERAL_SUPPLIER_ROLE,</span>
-<span id="L768"><span class="lineNum">     768</span>                 :             :           msg.sender</span>
-<span id="L769"><span class="lineNum">     769</span>                 :             :         )</span>
-<span id="L770"><span class="lineNum">     770</span>                 :<span class="tlaGNC">          24 :       ) return false;</span></span>
-<span id="L771"><span class="lineNum">     771</span>                 :             :     }</span>
-<span id="L772"><span class="lineNum">     772</span>                 :<span class="tlaGNC">       39957 :     return validateUseAsCollateral(reservesData, reservesList, userConfig, reserveConfig);</span></span>
-<span id="L773"><span class="lineNum">     773</span>                 :             :   }</span>
-<span id="L774"><span class="lineNum">     774</span>                 :             : }</span>
+<span id="L389"><span class="lineNum">     389</span>                 :<span class="tlaGNC">       14501 :     (vars.collateralReserveActive, , , vars.collateralReservePaused) = collateralReserve</span></span>
+<span id="L390"><span class="lineNum">     390</span>                 :             :       .configuration</span>
+<span id="L391"><span class="lineNum">     391</span>                 :             :       .getFlags();</span>
+<span id="L392"><span class="lineNum">     392</span>                 :             : </span>
+<span id="L393"><span class="lineNum">     393</span>                 :<span class="tlaGNC">       14501 :     (vars.principalReserveActive, , , vars.principalReservePaused) = params</span></span>
+<span id="L394"><span class="lineNum">     394</span>                 :             :       .debtReserveCache</span>
+<span id="L395"><span class="lineNum">     395</span>                 :             :       .reserveConfiguration</span>
+<span id="L396"><span class="lineNum">     396</span>                 :             :       .getFlags();</span>
+<span id="L397"><span class="lineNum">     397</span>                 :             : </span>
+<span id="L398"><span class="lineNum">     398</span>                 :<span class="tlaGNC">       14501 :     require(vars.collateralReserveActive &amp;&amp; vars.principalReserveActive, Errors.RESERVE_INACTIVE);</span></span>
+<span id="L399"><span class="lineNum">     399</span>                 :<span class="tlaGNC">       14500 :     require(!vars.collateralReservePaused &amp;&amp; !vars.principalReservePaused, Errors.RESERVE_PAUSED);</span></span>
+<span id="L400"><span class="lineNum">     400</span>                 :             : </span>
+<span id="L401"><span class="lineNum">     401</span>                 :<span class="tlaGNC">       14499 :     require(</span></span>
+<span id="L402"><span class="lineNum">     402</span>                 :             :       params.priceOracleSentinel == address(0) ||</span>
+<span id="L403"><span class="lineNum">     403</span>                 :             :         params.healthFactor &lt; MINIMUM_HEALTH_FACTOR_LIQUIDATION_THRESHOLD ||</span>
+<span id="L404"><span class="lineNum">     404</span>                 :             :         IPriceOracleSentinel(params.priceOracleSentinel).isLiquidationAllowed(),</span>
+<span id="L405"><span class="lineNum">     405</span>                 :             :       Errors.PRICE_ORACLE_SENTINEL_CHECK_FAILED</span>
+<span id="L406"><span class="lineNum">     406</span>                 :             :     );</span>
+<span id="L407"><span class="lineNum">     407</span>                 :             : </span>
+<span id="L408"><span class="lineNum">     408</span>                 :<span class="tlaGNC">       14498 :     require(</span></span>
+<span id="L409"><span class="lineNum">     409</span>                 :             :       collateralReserve.liquidationGracePeriodUntil &lt; uint40(block.timestamp) &amp;&amp;</span>
+<span id="L410"><span class="lineNum">     410</span>                 :             :         debtReserve.liquidationGracePeriodUntil &lt; uint40(block.timestamp),</span>
+<span id="L411"><span class="lineNum">     411</span>                 :             :       Errors.LIQUIDATION_GRACE_SENTINEL_CHECK_FAILED</span>
+<span id="L412"><span class="lineNum">     412</span>                 :             :     );</span>
+<span id="L413"><span class="lineNum">     413</span>                 :             : </span>
+<span id="L414"><span class="lineNum">     414</span>                 :<span class="tlaGNC">        8014 :     require(</span></span>
+<span id="L415"><span class="lineNum">     415</span>                 :             :       params.healthFactor &lt; HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
+<span id="L416"><span class="lineNum">     416</span>                 :             :       Errors.HEALTH_FACTOR_NOT_BELOW_THRESHOLD</span>
+<span id="L417"><span class="lineNum">     417</span>                 :             :     );</span>
+<span id="L418"><span class="lineNum">     418</span>                 :             : </span>
+<span id="L419"><span class="lineNum">     419</span>                 :<span class="tlaGNC">        8013 :     vars.isCollateralEnabled =</span></span>
+<span id="L420"><span class="lineNum">     420</span>                 :             :       collateralReserve.configuration.getLiquidationThreshold() != 0 &amp;&amp;</span>
+<span id="L421"><span class="lineNum">     421</span>                 :             :       userConfig.isUsingAsCollateral(collateralReserve.id);</span>
+<span id="L422"><span class="lineNum">     422</span>                 :             : </span>
+<span id="L423"><span class="lineNum">     423</span>                 :             :     //if collateral isn't enabled as collateral by user, it cannot be liquidated</span>
+<span id="L424"><span class="lineNum">     424</span>                 :<span class="tlaGNC">        8013 :     require(vars.isCollateralEnabled, Errors.COLLATERAL_CANNOT_BE_LIQUIDATED);</span></span>
+<span id="L425"><span class="lineNum">     425</span>                 :<span class="tlaGNC">        8012 :     require(params.totalDebt != 0, Errors.SPECIFIED_CURRENCY_NOT_BORROWED_BY_USER);</span></span>
+<span id="L426"><span class="lineNum">     426</span>                 :             :   }</span>
+<span id="L427"><span class="lineNum">     427</span>                 :             : </span>
+<span id="L428"><span class="lineNum">     428</span>                 :             :   /**</span>
+<span id="L429"><span class="lineNum">     429</span>                 :             :    * @notice Validates the health factor of a user.</span>
+<span id="L430"><span class="lineNum">     430</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L431"><span class="lineNum">     431</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L432"><span class="lineNum">     432</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L433"><span class="lineNum">     433</span>                 :             :    * @param userConfig The state of the user for the specific reserve</span>
+<span id="L434"><span class="lineNum">     434</span>                 :             :    * @param user The user to validate health factor of</span>
+<span id="L435"><span class="lineNum">     435</span>                 :             :    * @param userEModeCategory The users active efficiency mode category</span>
+<span id="L436"><span class="lineNum">     436</span>                 :             :    * @param reservesCount The number of available reserves</span>
+<span id="L437"><span class="lineNum">     437</span>                 :             :    * @param oracle The price oracle</span>
+<span id="L438"><span class="lineNum">     438</span>                 :             :    */</span>
+<span id="L439"><span class="lineNum">     439</span>                 :             :   function validateHealthFactor(</span>
+<span id="L440"><span class="lineNum">     440</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L441"><span class="lineNum">     441</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L442"><span class="lineNum">     442</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L443"><span class="lineNum">     443</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
+<span id="L444"><span class="lineNum">     444</span>                 :             :     address user,</span>
+<span id="L445"><span class="lineNum">     445</span>                 :             :     uint8 userEModeCategory,</span>
+<span id="L446"><span class="lineNum">     446</span>                 :             :     uint256 reservesCount,</span>
+<span id="L447"><span class="lineNum">     447</span>                 :             :     address oracle</span>
+<span id="L448"><span class="lineNum">     448</span>                 :             :   ) internal view returns (uint256, bool) {</span>
+<span id="L449"><span class="lineNum">     449</span>                 :<span class="tlaGNC">        8637 :     (, , , , uint256 healthFactor, bool hasZeroLtvCollateral) = GenericLogic</span></span>
+<span id="L450"><span class="lineNum">     450</span>                 :             :       .calculateUserAccountData(</span>
+<span id="L451"><span class="lineNum">     451</span>                 :             :         reservesData,</span>
+<span id="L452"><span class="lineNum">     452</span>                 :             :         reservesList,</span>
+<span id="L453"><span class="lineNum">     453</span>                 :             :         eModeCategories,</span>
+<span id="L454"><span class="lineNum">     454</span>                 :             :         DataTypes.CalculateUserAccountDataParams({</span>
+<span id="L455"><span class="lineNum">     455</span>                 :             :           userConfig: userConfig,</span>
+<span id="L456"><span class="lineNum">     456</span>                 :             :           reservesCount: reservesCount,</span>
+<span id="L457"><span class="lineNum">     457</span>                 :             :           user: user,</span>
+<span id="L458"><span class="lineNum">     458</span>                 :             :           oracle: oracle,</span>
+<span id="L459"><span class="lineNum">     459</span>                 :             :           userEModeCategory: userEModeCategory</span>
+<span id="L460"><span class="lineNum">     460</span>                 :             :         })</span>
+<span id="L461"><span class="lineNum">     461</span>                 :             :       );</span>
+<span id="L462"><span class="lineNum">     462</span>                 :             : </span>
+<span id="L463"><span class="lineNum">     463</span>                 :<span class="tlaGNC">        8637 :     require(</span></span>
+<span id="L464"><span class="lineNum">     464</span>                 :             :       healthFactor &gt;= HEALTH_FACTOR_LIQUIDATION_THRESHOLD,</span>
+<span id="L465"><span class="lineNum">     465</span>                 :             :       Errors.HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD</span>
+<span id="L466"><span class="lineNum">     466</span>                 :             :     );</span>
+<span id="L467"><span class="lineNum">     467</span>                 :             : </span>
+<span id="L468"><span class="lineNum">     468</span>                 :<span class="tlaGNC">        7631 :     return (healthFactor, hasZeroLtvCollateral);</span></span>
+<span id="L469"><span class="lineNum">     469</span>                 :             :   }</span>
+<span id="L470"><span class="lineNum">     470</span>                 :             : </span>
+<span id="L471"><span class="lineNum">     471</span>                 :             :   /**</span>
+<span id="L472"><span class="lineNum">     472</span>                 :             :    * @notice Validates the health factor of a user and the ltv of the asset being withdrawn.</span>
+<span id="L473"><span class="lineNum">     473</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L474"><span class="lineNum">     474</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L475"><span class="lineNum">     475</span>                 :             :    * @param eModeCategories The configuration of all the efficiency mode categories</span>
+<span id="L476"><span class="lineNum">     476</span>                 :             :    * @param userConfig The state of the user for the specific reserve</span>
+<span id="L477"><span class="lineNum">     477</span>                 :             :    * @param asset The asset for which the ltv will be validated</span>
+<span id="L478"><span class="lineNum">     478</span>                 :             :    * @param from The user from which the aTokens are being transferred</span>
+<span id="L479"><span class="lineNum">     479</span>                 :             :    * @param reservesCount The number of available reserves</span>
+<span id="L480"><span class="lineNum">     480</span>                 :             :    * @param oracle The price oracle</span>
+<span id="L481"><span class="lineNum">     481</span>                 :             :    * @param userEModeCategory The users active efficiency mode category</span>
+<span id="L482"><span class="lineNum">     482</span>                 :             :    */</span>
+<span id="L483"><span class="lineNum">     483</span>                 :             :   function validateHFAndLtv(</span>
+<span id="L484"><span class="lineNum">     484</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L485"><span class="lineNum">     485</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L486"><span class="lineNum">     486</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L487"><span class="lineNum">     487</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
+<span id="L488"><span class="lineNum">     488</span>                 :             :     address asset,</span>
+<span id="L489"><span class="lineNum">     489</span>                 :             :     address from,</span>
+<span id="L490"><span class="lineNum">     490</span>                 :             :     uint256 reservesCount,</span>
+<span id="L491"><span class="lineNum">     491</span>                 :             :     address oracle,</span>
+<span id="L492"><span class="lineNum">     492</span>                 :             :     uint8 userEModeCategory</span>
+<span id="L493"><span class="lineNum">     493</span>                 :             :   ) internal view {</span>
+<span id="L494"><span class="lineNum">     494</span>                 :<span class="tlaGNC">          23 :     DataTypes.ReserveData memory reserve = reservesData[asset];</span></span>
+<span id="L495"><span class="lineNum">     495</span>                 :             : </span>
+<span id="L496"><span class="lineNum">     496</span>                 :<span class="tlaGNC">          23 :     (, bool hasZeroLtvCollateral) = validateHealthFactor(</span></span>
+<span id="L497"><span class="lineNum">     497</span>                 :             :       reservesData,</span>
+<span id="L498"><span class="lineNum">     498</span>                 :             :       reservesList,</span>
+<span id="L499"><span class="lineNum">     499</span>                 :             :       eModeCategories,</span>
+<span id="L500"><span class="lineNum">     500</span>                 :             :       userConfig,</span>
+<span id="L501"><span class="lineNum">     501</span>                 :             :       from,</span>
+<span id="L502"><span class="lineNum">     502</span>                 :             :       userEModeCategory,</span>
+<span id="L503"><span class="lineNum">     503</span>                 :             :       reservesCount,</span>
+<span id="L504"><span class="lineNum">     504</span>                 :             :       oracle</span>
+<span id="L505"><span class="lineNum">     505</span>                 :             :     );</span>
+<span id="L506"><span class="lineNum">     506</span>                 :             : </span>
+<span id="L507"><span class="lineNum">     507</span>                 :<span class="tlaGNC">          19 :     require(</span></span>
+<span id="L508"><span class="lineNum">     508</span>                 :             :       !hasZeroLtvCollateral || reserve.configuration.getLtv() == 0,</span>
+<span id="L509"><span class="lineNum">     509</span>                 :             :       Errors.LTV_VALIDATION_FAILED</span>
+<span id="L510"><span class="lineNum">     510</span>                 :             :     );</span>
+<span id="L511"><span class="lineNum">     511</span>                 :             :   }</span>
+<span id="L512"><span class="lineNum">     512</span>                 :             : </span>
+<span id="L513"><span class="lineNum">     513</span>                 :             :   /**</span>
+<span id="L514"><span class="lineNum">     514</span>                 :             :    * @notice Validates a transfer action.</span>
+<span id="L515"><span class="lineNum">     515</span>                 :             :    * @param reserve The reserve object</span>
+<span id="L516"><span class="lineNum">     516</span>                 :             :    */</span>
+<span id="L517"><span class="lineNum">     517</span>                 :             :   function validateTransfer(DataTypes.ReserveData storage reserve) internal view {</span>
+<span id="L518"><span class="lineNum">     518</span>                 :<span class="tlaGNC">       17042 :     require(!reserve.configuration.getPaused(), Errors.RESERVE_PAUSED);</span></span>
+<span id="L519"><span class="lineNum">     519</span>                 :             :   }</span>
+<span id="L520"><span class="lineNum">     520</span>                 :             : </span>
+<span id="L521"><span class="lineNum">     521</span>                 :             :   /**</span>
+<span id="L522"><span class="lineNum">     522</span>                 :             :    * @notice Validates a drop reserve action.</span>
+<span id="L523"><span class="lineNum">     523</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L524"><span class="lineNum">     524</span>                 :             :    * @param reserve The reserve object</span>
+<span id="L525"><span class="lineNum">     525</span>                 :             :    * @param asset The address of the reserve's underlying asset</span>
+<span id="L526"><span class="lineNum">     526</span>                 :             :    */</span>
+<span id="L527"><span class="lineNum">     527</span>                 :             :   function validateDropReserve(</span>
+<span id="L528"><span class="lineNum">     528</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L529"><span class="lineNum">     529</span>                 :             :     DataTypes.ReserveData storage reserve,</span>
+<span id="L530"><span class="lineNum">     530</span>                 :             :     address asset</span>
+<span id="L531"><span class="lineNum">     531</span>                 :             :   ) internal view {</span>
+<span id="L532"><span class="lineNum">     532</span>                 :<span class="tlaGNC">           9 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L533"><span class="lineNum">     533</span>                 :<span class="tlaGNC">           8 :     require(reserve.id != 0 || reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L534"><span class="lineNum">     534</span>                 :<span class="tlaGNC">           7 :     require(</span></span>
+<span id="L535"><span class="lineNum">     535</span>                 :             :       IERC20(reserve.variableDebtTokenAddress).totalSupply() == 0,</span>
+<span id="L536"><span class="lineNum">     536</span>                 :             :       Errors.VARIABLE_DEBT_SUPPLY_NOT_ZERO</span>
+<span id="L537"><span class="lineNum">     537</span>                 :             :     );</span>
+<span id="L538"><span class="lineNum">     538</span>                 :<span class="tlaGNC">           6 :     require(</span></span>
+<span id="L539"><span class="lineNum">     539</span>                 :             :       IERC20(reserve.aTokenAddress).totalSupply() == 0 &amp;&amp; reserve.accruedToTreasury == 0,</span>
+<span id="L540"><span class="lineNum">     540</span>                 :             :       Errors.UNDERLYING_CLAIMABLE_RIGHTS_NOT_ZERO</span>
+<span id="L541"><span class="lineNum">     541</span>                 :             :     );</span>
+<span id="L542"><span class="lineNum">     542</span>                 :             :   }</span>
+<span id="L543"><span class="lineNum">     543</span>                 :             : </span>
+<span id="L544"><span class="lineNum">     544</span>                 :             :   /**</span>
+<span id="L545"><span class="lineNum">     545</span>                 :             :    * @notice Validates the action of setting efficiency mode.</span>
+<span id="L546"><span class="lineNum">     546</span>                 :             :    * @param eModeCategories a mapping storing configurations for all efficiency mode categories</span>
+<span id="L547"><span class="lineNum">     547</span>                 :             :    * @param userConfig the user configuration</span>
+<span id="L548"><span class="lineNum">     548</span>                 :             :    * @param reservesCount The total number of valid reserves</span>
+<span id="L549"><span class="lineNum">     549</span>                 :             :    * @param categoryId The id of the category</span>
+<span id="L550"><span class="lineNum">     550</span>                 :             :    */</span>
+<span id="L551"><span class="lineNum">     551</span>                 :             :   function validateSetUserEMode(</span>
+<span id="L552"><span class="lineNum">     552</span>                 :             :     mapping(uint8 =&gt; DataTypes.EModeCategory) storage eModeCategories,</span>
+<span id="L553"><span class="lineNum">     553</span>                 :             :     DataTypes.UserConfigurationMap memory userConfig,</span>
+<span id="L554"><span class="lineNum">     554</span>                 :             :     uint256 reservesCount,</span>
+<span id="L555"><span class="lineNum">     555</span>                 :             :     uint8 categoryId</span>
+<span id="L556"><span class="lineNum">     556</span>                 :             :   ) internal view {</span>
+<span id="L557"><span class="lineNum">     557</span>                 :<span class="tlaGNC">        9617 :     DataTypes.EModeCategory storage eModeCategory = eModeCategories[categoryId];</span></span>
+<span id="L558"><span class="lineNum">     558</span>                 :             :     // category is invalid if the liq threshold is not set</span>
+<span id="L559"><span class="lineNum">     559</span>                 :<span class="tlaGNC">        9617 :     require(</span></span>
+<span id="L560"><span class="lineNum">     560</span>                 :             :       categoryId == 0 || eModeCategory.liquidationThreshold != 0,</span>
+<span id="L561"><span class="lineNum">     561</span>                 :             :       Errors.INCONSISTENT_EMODE_CATEGORY</span>
+<span id="L562"><span class="lineNum">     562</span>                 :             :     );</span>
+<span id="L563"><span class="lineNum">     563</span>                 :             : </span>
+<span id="L564"><span class="lineNum">     564</span>                 :             :     // eMode can always be enabled if the user hasn't supplied anything</span>
+<span id="L565"><span class="lineNum">     565</span>                 :<span class="tlaGNC">        9616 :     if (userConfig.isEmpty()) {</span></span>
+<span id="L566"><span class="lineNum">     566</span>                 :<span class="tlaGNC">        6611 :       return;</span></span>
+<span id="L567"><span class="lineNum">     567</span>                 :             :     }</span>
+<span id="L568"><span class="lineNum">     568</span>                 :             : </span>
+<span id="L569"><span class="lineNum">     569</span>                 :             :     // if user is trying to set another category than default we require that</span>
+<span id="L570"><span class="lineNum">     570</span>                 :             :     // either the user is not borrowing, or it's borrowing assets of categoryId</span>
+<span id="L571"><span class="lineNum">     571</span>                 :<span class="tlaGNC">        3005 :     if (categoryId != 0) {</span></span>
+<span id="L572"><span class="lineNum">     572</span>                 :             :       unchecked {</span>
+<span id="L573"><span class="lineNum">     573</span>                 :<span class="tlaGNC">        3002 :         for (uint256 i = 0; i &lt; reservesCount; i++) {</span></span>
+<span id="L574"><span class="lineNum">     574</span>                 :<span class="tlaGNC">        8006 :           if (userConfig.isBorrowing(i)) {</span></span>
+<span id="L575"><span class="lineNum">     575</span>                 :<span class="tlaGNC">        3002 :             require(</span></span>
+<span id="L576"><span class="lineNum">     576</span>                 :             :               EModeConfiguration.isReserveEnabledOnBitmap(eModeCategory.borrowableBitmap, i),</span>
+<span id="L577"><span class="lineNum">     577</span>                 :             :               Errors.NOT_BORROWABLE_IN_EMODE</span>
+<span id="L578"><span class="lineNum">     578</span>                 :             :             );</span>
+<span id="L579"><span class="lineNum">     579</span>                 :             :           }</span>
+<span id="L580"><span class="lineNum">     580</span>                 :             :         }</span>
+<span id="L581"><span class="lineNum">     581</span>                 :             :       }</span>
+<span id="L582"><span class="lineNum">     582</span>                 :             :     }</span>
+<span id="L583"><span class="lineNum">     583</span>                 :             :   }</span>
+<span id="L584"><span class="lineNum">     584</span>                 :             : </span>
+<span id="L585"><span class="lineNum">     585</span>                 :             :   /**</span>
+<span id="L586"><span class="lineNum">     586</span>                 :             :    * @notice Validates the action of activating the asset as collateral.</span>
+<span id="L587"><span class="lineNum">     587</span>                 :             :    * @dev Only possible if the asset has non-zero LTV and the user is not in isolation mode</span>
+<span id="L588"><span class="lineNum">     588</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L589"><span class="lineNum">     589</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L590"><span class="lineNum">     590</span>                 :             :    * @param userConfig the user configuration</span>
+<span id="L591"><span class="lineNum">     591</span>                 :             :    * @param reserveConfig The reserve configuration</span>
+<span id="L592"><span class="lineNum">     592</span>                 :             :    * @return True if the asset can be activated as collateral, false otherwise</span>
+<span id="L593"><span class="lineNum">     593</span>                 :             :    */</span>
+<span id="L594"><span class="lineNum">     594</span>                 :             :   function validateUseAsCollateral(</span>
+<span id="L595"><span class="lineNum">     595</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L596"><span class="lineNum">     596</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L597"><span class="lineNum">     597</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L598"><span class="lineNum">     598</span>                 :             :     DataTypes.ReserveConfigurationMap memory reserveConfig</span>
+<span id="L599"><span class="lineNum">     599</span>                 :             :   ) internal view returns (bool) {</span>
+<span id="L600"><span class="lineNum">     600</span>                 :<span class="tlaGNC">       59411 :     if (reserveConfig.getLtv() == 0) {</span></span>
+<span id="L601"><span class="lineNum">     601</span>                 :<span class="tlaGNC">           3 :       return false;</span></span>
+<span id="L602"><span class="lineNum">     602</span>                 :             :     }</span>
+<span id="L603"><span class="lineNum">     603</span>                 :<span class="tlaGNC">       59408 :     if (!userConfig.isUsingAsCollateralAny()) {</span></span>
+<span id="L604"><span class="lineNum">     604</span>                 :<span class="tlaGNC">       58324 :       return true;</span></span>
+<span id="L605"><span class="lineNum">     605</span>                 :             :     }</span>
+<span id="L606"><span class="lineNum">     606</span>                 :<span class="tlaGNC">        1084 :     (bool isolationModeActive, , ) = userConfig.getIsolationModeState(reservesData, reservesList);</span></span>
+<span id="L607"><span class="lineNum">     607</span>                 :             : </span>
+<span id="L608"><span class="lineNum">     608</span>                 :<span class="tlaGNC">        1084 :     return (!isolationModeActive &amp;&amp; reserveConfig.getDebtCeiling() == 0);</span></span>
+<span id="L609"><span class="lineNum">     609</span>                 :             :   }</span>
+<span id="L610"><span class="lineNum">     610</span>                 :             : </span>
+<span id="L611"><span class="lineNum">     611</span>                 :             :   /**</span>
+<span id="L612"><span class="lineNum">     612</span>                 :             :    * @notice Validates if an asset should be automatically activated as collateral in the following actions: supply,</span>
+<span id="L613"><span class="lineNum">     613</span>                 :             :    * transfer, mint unbacked, and liquidate</span>
+<span id="L614"><span class="lineNum">     614</span>                 :             :    * @dev This is used to ensure that isolated assets are not enabled as collateral automatically</span>
+<span id="L615"><span class="lineNum">     615</span>                 :             :    * @param reservesData The state of all the reserves</span>
+<span id="L616"><span class="lineNum">     616</span>                 :             :    * @param reservesList The addresses of all the active reserves</span>
+<span id="L617"><span class="lineNum">     617</span>                 :             :    * @param userConfig the user configuration</span>
+<span id="L618"><span class="lineNum">     618</span>                 :             :    * @param reserveConfig The reserve configuration</span>
+<span id="L619"><span class="lineNum">     619</span>                 :             :    * @return True if the asset can be activated as collateral, false otherwise</span>
+<span id="L620"><span class="lineNum">     620</span>                 :             :    */</span>
+<span id="L621"><span class="lineNum">     621</span>                 :             :   function validateAutomaticUseAsCollateral(</span>
+<span id="L622"><span class="lineNum">     622</span>                 :             :     mapping(address =&gt; DataTypes.ReserveData) storage reservesData,</span>
+<span id="L623"><span class="lineNum">     623</span>                 :             :     mapping(uint256 =&gt; address) storage reservesList,</span>
+<span id="L624"><span class="lineNum">     624</span>                 :             :     DataTypes.UserConfigurationMap storage userConfig,</span>
+<span id="L625"><span class="lineNum">     625</span>                 :             :     DataTypes.ReserveConfigurationMap memory reserveConfig,</span>
+<span id="L626"><span class="lineNum">     626</span>                 :             :     address aTokenAddress</span>
+<span id="L627"><span class="lineNum">     627</span>                 :             :   ) internal view returns (bool) {</span>
+<span id="L628"><span class="lineNum">     628</span>                 :<span class="tlaGNC">       59404 :     if (reserveConfig.getDebtCeiling() != 0) {</span></span>
+<span id="L629"><span class="lineNum">     629</span>                 :             :       // ensures only the ISOLATED_COLLATERAL_SUPPLIER_ROLE can enable collateral as side-effect of an action</span>
+<span id="L630"><span class="lineNum">     630</span>                 :<span class="tlaGNC">          12 :       IPoolAddressesProvider addressesProvider = IncentivizedERC20(aTokenAddress)</span></span>
+<span id="L631"><span class="lineNum">     631</span>                 :             :         .POOL()</span>
+<span id="L632"><span class="lineNum">     632</span>                 :             :         .ADDRESSES_PROVIDER();</span>
+<span id="L633"><span class="lineNum">     633</span>                 :             :       if (</span>
+<span id="L634"><span class="lineNum">     634</span>                 :<span class="tlaGNC">          12 :         !IAccessControl(addressesProvider.getACLManager()).hasRole(</span></span>
+<span id="L635"><span class="lineNum">     635</span>                 :             :           ISOLATED_COLLATERAL_SUPPLIER_ROLE,</span>
+<span id="L636"><span class="lineNum">     636</span>                 :             :           msg.sender</span>
+<span id="L637"><span class="lineNum">     637</span>                 :             :         )</span>
+<span id="L638"><span class="lineNum">     638</span>                 :<span class="tlaGNC">          12 :       ) return false;</span></span>
+<span id="L639"><span class="lineNum">     639</span>                 :             :     }</span>
+<span id="L640"><span class="lineNum">     640</span>                 :<span class="tlaGNC">       59392 :     return validateUseAsCollateral(reservesData, reservesList, userConfig, reserveConfig);</span></span>
+<span id="L641"><span class="lineNum">     641</span>                 :             :   }</span>
+<span id="L642"><span class="lineNum">     642</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -850,8 +718,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-b.html b/report/protocol/libraries/logic/index-sort-b.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-b.html
rename to report/protocol/libraries/logic/index-sort-b.html
index d508c1da..f602334f 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-b.html
+++ b/report/protocol/libraries/logic/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/logic</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.9&nbsp;%</td>
-            <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">564</td>
+            <td class="headerCovTableEntryHi">99.8&nbsp;%</td>
+            <td class="headerCovTableEntry">493</td>
+            <td class="headerCovTableEntry">492</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">64</td>
-            <td class="headerCovTableEntry">64</td>
+            <td class="headerCovTableEntry">54</td>
+            <td class="headerCovTableEntry">54</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html">BorrowLogic.sol</a></td>
+              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BorrowLogic.sol">BorrowLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../amber.png" width=88 height=10 alt="88.1%"><img src="../../../../../../../../../../../snow.png" width=12 height=10 alt="88.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.1&nbsp;%</td>
-              <td class="coverNumDflt">67</td>
-              <td class="coverNumDflt">59</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">41</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html">BridgeLogic.sol</a></td>
+              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BridgeLogic.sol">BridgeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">28</td>
@@ -126,54 +126,54 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html">CalldataLogic.sol</a></td>
+              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/CalldataLogic.sol">CalldataLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">72</td>
-              <td class="coverNumDflt">72</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">62</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html">ConfiguratorLogic.sol</a></td>
+              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol">ConfiguratorLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">33</td>
-              <td class="coverNumDflt">33</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EModeLogic.sol.gcov.html">EModeLogic.sol</a></td>
+              <td class="coverFile"><a href="EModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/EModeLogic.sol">EModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html">FlashLoanLogic.sol</a></td>
+              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol">FlashLoanLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">38</td>
@@ -186,9 +186,9 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html">IsolationModeLogic.sol</a></td>
+              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/IsolationModeLogic.sol">IsolationModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">9</td>
@@ -201,24 +201,24 @@
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html">LiquidationLogic.sol</a></td>
+              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/LiquidationLogic.sol">LiquidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=95 height=10 alt="95.5%"><img src="../../../../../../../../../../../snow.png" width=5 height=10 alt="95.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=99 height=10 alt="98.6%"><img src="../../../snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">95.5&nbsp;%</td>
-              <td class="coverNumDflt">88</td>
-              <td class="coverNumDflt">84</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">74</td>
+              <td class="coverNumDflt">73</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolLogic.sol.gcov.html">PoolLogic.sol</a></td>
+              <td class="coverFile"><a href="PoolLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/PoolLogic.sol">PoolLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">37</td>
@@ -231,9 +231,9 @@
               <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html">SupplyLogic.sol</a></td>
+              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/SupplyLogic.sol">SupplyLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">60</td>
@@ -246,27 +246,27 @@
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html">ValidationLogic.sol</a></td>
+              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ValidationLogic.sol">ValidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">132</td>
-              <td class="coverNumDflt">132</td>
+              <td class="coverNumDflt">110</td>
+              <td class="coverNumDflt">110</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">17</td>
-              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">15</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-f.html b/report/protocol/libraries/logic/index-sort-f.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-f.html
rename to report/protocol/libraries/logic/index-sort-f.html
index 6975312e..d083a5b9 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-f.html
+++ b/report/protocol/libraries/logic/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/logic</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.9&nbsp;%</td>
-            <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">564</td>
+            <td class="headerCovTableEntryHi">99.8&nbsp;%</td>
+            <td class="headerCovTableEntry">493</td>
+            <td class="headerCovTableEntry">492</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">64</td>
-            <td class="headerCovTableEntry">64</td>
+            <td class="headerCovTableEntry">54</td>
+            <td class="headerCovTableEntry">54</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,13 +96,13 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html">IsolationModeLogic.sol</a></td>
+              <td class="coverFile"><a href="EModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/EModeLogic.sol">EModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -111,69 +111,69 @@
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html">BridgeLogic.sol</a></td>
+              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/IsolationModeLogic.sol">IsolationModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">28</td>
-              <td class="coverNumDflt">28</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EModeLogic.sol.gcov.html">EModeLogic.sol</a></td>
+              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BorrowLogic.sol">BorrowLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">41</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html">FlashLoanLogic.sol</a></td>
+              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BridgeLogic.sol">BridgeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">38</td>
-              <td class="coverNumDflt">38</td>
+              <td class="coverNumDflt">28</td>
+              <td class="coverNumDflt">28</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html">BorrowLogic.sol</a></td>
+              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol">FlashLoanLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../amber.png" width=88 height=10 alt="88.1%"><img src="../../../../../../../../../../../snow.png" width=12 height=10 alt="88.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.1&nbsp;%</td>
-              <td class="coverNumDflt">67</td>
-              <td class="coverNumDflt">59</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">38</td>
+              <td class="coverNumDflt">38</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html">SupplyLogic.sol</a></td>
+              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/SupplyLogic.sol">SupplyLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">60</td>
@@ -186,39 +186,39 @@
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html">ConfiguratorLogic.sol</a></td>
+              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol">ConfiguratorLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">33</td>
-              <td class="coverNumDflt">33</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html">LiquidationLogic.sol</a></td>
+              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/LiquidationLogic.sol">LiquidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=95 height=10 alt="95.5%"><img src="../../../../../../../../../../../snow.png" width=5 height=10 alt="95.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=99 height=10 alt="98.6%"><img src="../../../snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">95.5&nbsp;%</td>
-              <td class="coverNumDflt">88</td>
-              <td class="coverNumDflt">84</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">74</td>
+              <td class="coverNumDflt">73</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolLogic.sol.gcov.html">PoolLogic.sol</a></td>
+              <td class="coverFile"><a href="PoolLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/PoolLogic.sol">PoolLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">37</td>
@@ -231,42 +231,42 @@
               <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html">CalldataLogic.sol</a></td>
+              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/CalldataLogic.sol">CalldataLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">72</td>
-              <td class="coverNumDflt">72</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">62</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html">ValidationLogic.sol</a></td>
+              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ValidationLogic.sol">ValidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">132</td>
-              <td class="coverNumDflt">132</td>
+              <td class="coverNumDflt">110</td>
+              <td class="coverNumDflt">110</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">17</td>
-              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">15</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-l.html b/report/protocol/libraries/logic/index-sort-l.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-l.html
rename to report/protocol/libraries/logic/index-sort-l.html
index fe96817d..408cb650 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index-sort-l.html
+++ b/report/protocol/libraries/logic/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/logic</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.9&nbsp;%</td>
-            <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">564</td>
+            <td class="headerCovTableEntryHi">99.8&nbsp;%</td>
+            <td class="headerCovTableEntry">493</td>
+            <td class="headerCovTableEntry">492</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">64</td>
-            <td class="headerCovTableEntry">64</td>
+            <td class="headerCovTableEntry">54</td>
+            <td class="headerCovTableEntry">54</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,39 +96,39 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html">BorrowLogic.sol</a></td>
+              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/LiquidationLogic.sol">LiquidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../amber.png" width=88 height=10 alt="88.1%"><img src="../../../../../../../../../../../snow.png" width=12 height=10 alt="88.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=99 height=10 alt="98.6%"><img src="../../../snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.1&nbsp;%</td>
-              <td class="coverNumDflt">67</td>
-              <td class="coverNumDflt">59</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">74</td>
+              <td class="coverNumDflt">73</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html">LiquidationLogic.sol</a></td>
+              <td class="coverFile"><a href="EModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/EModeLogic.sol">EModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=95 height=10 alt="95.5%"><img src="../../../../../../../../../../../snow.png" width=5 height=10 alt="95.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">95.5&nbsp;%</td>
-              <td class="coverNumDflt">88</td>
-              <td class="coverNumDflt">84</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html">IsolationModeLogic.sol</a></td>
+              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/IsolationModeLogic.sol">IsolationModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">9</td>
@@ -141,24 +141,9 @@
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EModeLogic.sol.gcov.html">EModeLogic.sol</a></td>
+              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BridgeLogic.sol">BridgeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverPerHi">-</td>
-              <td class="coverNumDflt"></td>
-              <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
-            </tr>
-            <tr>
-              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html">BridgeLogic.sol</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">28</td>
@@ -171,24 +156,24 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html">ConfiguratorLogic.sol</a></td>
+              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol">ConfiguratorLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">33</td>
-              <td class="coverNumDflt">33</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolLogic.sol.gcov.html">PoolLogic.sol</a></td>
+              <td class="coverFile"><a href="PoolLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/PoolLogic.sol">PoolLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">37</td>
@@ -201,9 +186,9 @@
               <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html">FlashLoanLogic.sol</a></td>
+              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol">FlashLoanLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">38</td>
@@ -216,9 +201,24 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html">SupplyLogic.sol</a></td>
+              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BorrowLogic.sol">BorrowLogic.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/SupplyLogic.sol">SupplyLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">60</td>
@@ -231,42 +231,42 @@
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html">CalldataLogic.sol</a></td>
+              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/CalldataLogic.sol">CalldataLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">72</td>
-              <td class="coverNumDflt">72</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">62</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html">ValidationLogic.sol</a></td>
+              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ValidationLogic.sol">ValidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">132</td>
-              <td class="coverNumDflt">132</td>
+              <td class="coverNumDflt">110</td>
+              <td class="coverNumDflt">110</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">17</td>
-              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">15</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html b/report/protocol/libraries/logic/index.html
similarity index 60%
rename from report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html
rename to report/protocol/libraries/logic/index.html
index 61e0232b..750492df 100644
--- a/report/core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic/index.html
+++ b/report/protocol/libraries/logic/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/logic</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/logic/src/core/contracts/protocol/libraries/logic</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/logic</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.9&nbsp;%</td>
-            <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">564</td>
+            <td class="headerCovTableEntryHi">99.8&nbsp;%</td>
+            <td class="headerCovTableEntry">493</td>
+            <td class="headerCovTableEntry">492</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">64</td>
-            <td class="headerCovTableEntry">64</td>
+            <td class="headerCovTableEntry">54</td>
+            <td class="headerCovTableEntry">54</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html">BorrowLogic.sol</a></td>
+              <td class="coverFile"><a href="BorrowLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BorrowLogic.sol">BorrowLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../amber.png" width=88 height=10 alt="88.1%"><img src="../../../../../../../../../../../snow.png" width=12 height=10 alt="88.1%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerMed">88.1&nbsp;%</td>
-              <td class="coverNumDflt">67</td>
-              <td class="coverNumDflt">59</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">41</td>
+              <td class="coverNumDflt">41</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html">BridgeLogic.sol</a></td>
+              <td class="coverFile"><a href="BridgeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/BridgeLogic.sol">BridgeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">28</td>
@@ -126,54 +126,54 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html">CalldataLogic.sol</a></td>
+              <td class="coverFile"><a href="CalldataLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/CalldataLogic.sol">CalldataLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">72</td>
-              <td class="coverNumDflt">72</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">62</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html">ConfiguratorLogic.sol</a></td>
+              <td class="coverFile"><a href="ConfiguratorLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol">ConfiguratorLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">33</td>
-              <td class="coverNumDflt">33</td>
+              <td class="coverNumDflt">29</td>
+              <td class="coverNumDflt">29</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EModeLogic.sol.gcov.html">EModeLogic.sol</a></td>
+              <td class="coverFile"><a href="EModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/EModeLogic.sol">EModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">12</td>
-              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">5</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html">FlashLoanLogic.sol</a></td>
+              <td class="coverFile"><a href="FlashLoanLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol">FlashLoanLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">38</td>
@@ -186,9 +186,9 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html">IsolationModeLogic.sol</a></td>
+              <td class="coverFile"><a href="IsolationModeLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/IsolationModeLogic.sol">IsolationModeLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">9</td>
@@ -201,24 +201,24 @@
               <td class="coverNumDflt">1</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html">LiquidationLogic.sol</a></td>
+              <td class="coverFile"><a href="LiquidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/LiquidationLogic.sol">LiquidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=95 height=10 alt="95.5%"><img src="../../../../../../../../../../../snow.png" width=5 height=10 alt="95.5%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=99 height=10 alt="98.6%"><img src="../../../snow.png" width=1 height=10 alt="98.6%"></td></tr></table>
               </td>
-              <td class="coverPerHi">95.5&nbsp;%</td>
-              <td class="coverNumDflt">88</td>
-              <td class="coverNumDflt">84</td>
+              <td class="coverPerHi">98.6&nbsp;%</td>
+              <td class="coverNumDflt">74</td>
+              <td class="coverNumDflt">73</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PoolLogic.sol.gcov.html">PoolLogic.sol</a></td>
+              <td class="coverFile"><a href="PoolLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/PoolLogic.sol">PoolLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">37</td>
@@ -231,9 +231,9 @@
               <td class="coverNumDflt">7</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html">SupplyLogic.sol</a></td>
+              <td class="coverFile"><a href="SupplyLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/SupplyLogic.sol">SupplyLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">60</td>
@@ -246,27 +246,27 @@
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html">ValidationLogic.sol</a></td>
+              <td class="coverFile"><a href="ValidationLogic.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/logic/ValidationLogic.sol">ValidationLogic.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">132</td>
-              <td class="coverNumDflt">132</td>
+              <td class="coverNumDflt">110</td>
+              <td class="coverNumDflt">110</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">17</td>
-              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">15</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func-c.html b/report/protocol/libraries/math/MathUtils.sol.func-c.html
similarity index 66%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func-c.html
rename to report/protocol/libraries/math/MathUtils.sol.func-c.html
index 64f7e490..4000a122 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func-c.html
+++ b/report/protocol/libraries/math/MathUtils.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/MathUtils.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (<a href="MathUtils.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (<a href="MathUtils.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="MathUtils.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="MathUtils.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MathUtils.sol.gcov.html#L21">MathUtils.calculateLinearInterest</a></td>
               
-              <td class="coverFnHi">19762</td>
+              <td class="coverFnHi">21122</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MathUtils.sol.gcov.html#L48">MathUtils.calculateCompoundedInterest</a></td>
               
-              <td class="coverFnHi">39477</td>
+              <td class="coverFnHi">27028</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func.html b/report/protocol/libraries/math/MathUtils.sol.func.html
similarity index 66%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func.html
rename to report/protocol/libraries/math/MathUtils.sol.func.html
index 2618d9a6..07920843 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.func.html
+++ b/report/protocol/libraries/math/MathUtils.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/MathUtils.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (<a href="MathUtils.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (<a href="MathUtils.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="MathUtils.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="MathUtils.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MathUtils.sol.gcov.html#L48">MathUtils.calculateCompoundedInterest</a></td>
               
-              <td class="coverFnHi">39477</td>
+              <td class="coverFnHi">27028</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MathUtils.sol.gcov.html#L21">MathUtils.calculateLinearInterest</a></td>
               
-              <td class="coverFnHi">19762</td>
+              <td class="coverFnHi">21122</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.gcov.html b/report/protocol/libraries/math/MathUtils.sol.gcov.html
similarity index 84%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.gcov.html
rename to report/protocol/libraries/math/MathUtils.sol.gcov.html
index 0bd46234..998460ce 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol.gcov.html
+++ b/report/protocol/libraries/math/MathUtils.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/MathUtils.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/MathUtils.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (source / <a href="MathUtils.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - MathUtils.sol<span style="font-size: 80%;"> (source / <a href="MathUtils.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -91,17 +91,17 @@
 <span id="L20"><span class="lineNum">      20</span>                 :             :    * @param lastUpdateTimestamp The timestamp of the last update of the interest</span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :    * @return The interest rate linearly accumulated during the timeDelta, in ray</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             :    */</span>
-<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC tlaBgGNC">       19762 :   function calculateLinearInterest(</span></span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :   function calculateLinearInterest(</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :     uint256 rate,</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :     uint40 lastUpdateTimestamp</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :   ) internal view returns (uint256) {</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :     //solium-disable-next-line</span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">       59286 :     uint256 result = rate * (block.timestamp - uint256(lastUpdateTimestamp));</span></span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC tlaBgGNC">       21122 :     uint256 result = rate * (block.timestamp - uint256(lastUpdateTimestamp));</span></span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :     unchecked {</span>
-<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC">       39524 :       result = result / SECONDS_PER_YEAR;</span></span>
+<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC">       21122 :       result = result / SECONDS_PER_YEAR;</span></span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :     }</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             : </span>
-<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">       59286 :     return WadRayMath.RAY + result;</span></span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">       21122 :     return WadRayMath.RAY + result;</span></span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   }</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   /**</span>
@@ -118,41 +118,41 @@
 <span id="L47"><span class="lineNum">      47</span>                 :             :    * @param lastUpdateTimestamp The timestamp of the last update of the interest</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :    * @return The interest rate compounded during the timeDelta, in ray</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :    */</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">       39477 :   function calculateCompoundedInterest(</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   function calculateCompoundedInterest(</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :     uint256 rate,</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :     uint40 lastUpdateTimestamp,</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     uint256 currentTimestamp</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) internal pure returns (uint256) {</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :     //solium-disable-next-line</span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">      104820 :     uint256 exp = currentTimestamp - uint256(lastUpdateTimestamp);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">       13515 :     uint256 exp = currentTimestamp - uint256(lastUpdateTimestamp);</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       52410 :     if (exp == 0) {</span></span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           2 :       return WadRayMath.RAY;</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       13515 :     if (exp == 0) {</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           1 :       return WadRayMath.RAY;</span></span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :     }</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             : </span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">       52408 :     uint256 expMinusOne;</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       52408 :     uint256 expMinusTwo;</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">       52408 :     uint256 basePowerTwo;</span></span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">       52408 :     uint256 basePowerThree;</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">       13514 :     uint256 expMinusOne;</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       13514 :     uint256 expMinusTwo;</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">       13514 :     uint256 basePowerTwo;</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">       13514 :     uint256 basePowerThree;</span></span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     unchecked {</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">       52408 :       expMinusOne = exp - 1;</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">       13514 :       expMinusOne = exp - 1;</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">       52408 :       expMinusTwo = exp &gt; 2 ? exp - 2 : 0;</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">       13514 :       expMinusTwo = exp &gt; 2 ? exp - 2 : 0;</span></span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">       52408 :       basePowerTwo = rate.rayMul(rate) / (SECONDS_PER_YEAR * SECONDS_PER_YEAR);</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       52408 :       basePowerThree = basePowerTwo.rayMul(rate) / SECONDS_PER_YEAR;</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">       13514 :       basePowerTwo = rate.rayMul(rate) / (SECONDS_PER_YEAR * SECONDS_PER_YEAR);</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       13514 :       basePowerThree = basePowerTwo.rayMul(rate) / SECONDS_PER_YEAR;</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     }</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">      104816 :     uint256 secondTerm = exp * expMinusOne * basePowerTwo;</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       13514 :     uint256 secondTerm = exp * expMinusOne * basePowerTwo;</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :     unchecked {</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       52408 :       secondTerm /= 2;</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       13514 :       secondTerm /= 2;</span></span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :     }</span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">      131020 :     uint256 thirdTerm = exp * expMinusOne * expMinusTwo * basePowerThree;</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       13514 :     uint256 thirdTerm = exp * expMinusOne * expMinusTwo * basePowerThree;</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :     unchecked {</span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       52408 :       thirdTerm /= 6;</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       13514 :       thirdTerm /= 6;</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :     }</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">      157224 :     return WadRayMath.RAY + (rate * exp) / SECONDS_PER_YEAR + secondTerm + thirdTerm;</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">       13514 :     return WadRayMath.RAY + (rate * exp) / SECONDS_PER_YEAR + secondTerm + thirdTerm;</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :   }</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             : </span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   /**</span>
@@ -165,7 +165,7 @@
 <span id="L94"><span class="lineNum">      94</span>                 :             :     uint256 rate,</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :     uint40 lastUpdateTimestamp</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   ) internal view returns (uint256) {</span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">       39816 :     return calculateCompoundedInterest(rate, lastUpdateTimestamp, block.timestamp);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">       13513 :     return calculateCompoundedInterest(rate, lastUpdateTimestamp, block.timestamp);</span></span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : }</span>
         </pre>
@@ -175,8 +175,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func-c.html b/report/protocol/libraries/math/PercentageMath.sol.func-c.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func-c.html
rename to report/protocol/libraries/math/PercentageMath.sol.func-c.html
index 5361ea87..c249258b 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func-c.html
+++ b/report/protocol/libraries/math/PercentageMath.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/PercentageMath.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (<a href="PercentageMath.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (<a href="PercentageMath.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PercentageMath.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PercentageMath.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PercentageMath.sol.gcov.html#L46">PercentageMath.percentDiv</a></td>
               
-              <td class="coverFnHi">19136</td>
+              <td class="coverFnHi">30126</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PercentageMath.sol.gcov.html#L23">PercentageMath.percentMul</a></td>
               
-              <td class="coverFnHi">100989</td>
+              <td class="coverFnHi">158440</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func.html b/report/protocol/libraries/math/PercentageMath.sol.func.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func.html
rename to report/protocol/libraries/math/PercentageMath.sol.func.html
index ab030e28..1695ad80 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.func.html
+++ b/report/protocol/libraries/math/PercentageMath.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/PercentageMath.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (<a href="PercentageMath.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (<a href="PercentageMath.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PercentageMath.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PercentageMath.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PercentageMath.sol.gcov.html#L46">PercentageMath.percentDiv</a></td>
               
-              <td class="coverFnHi">19136</td>
+              <td class="coverFnHi">30126</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="PercentageMath.sol.gcov.html#L23">PercentageMath.percentMul</a></td>
               
-              <td class="coverFnHi">100989</td>
+              <td class="coverFnHi">158440</td>
               
               
             </tr>
@@ -89,8 +89,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.gcov.html b/report/protocol/libraries/math/PercentageMath.sol.gcov.html
similarity index 84%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.gcov.html
rename to report/protocol/libraries/math/PercentageMath.sol.gcov.html
index f7058a46..65415a84 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol.gcov.html
+++ b/report/protocol/libraries/math/PercentageMath.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/PercentageMath.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/PercentageMath.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (source / <a href="PercentageMath.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - PercentageMath.sol<span style="font-size: 80%;"> (source / <a href="PercentageMath.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,12 +32,12 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -93,19 +93,19 @@
 <span id="L22"><span class="lineNum">      22</span>                 :             :    * @param percentage The percentage of the value to be calculated</span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :    * @return result value percentmul percentage</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :    */</span>
-<span id="L25"><span class="lineNum">      25</span>                 :<span class="tlaGNC tlaBgGNC">      100989 :   function percentMul(uint256 value, uint256 percentage) internal pure returns (uint256 result) {</span></span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :   function percentMul(uint256 value, uint256 percentage) internal pure returns (uint256 result) {</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :     // to avoid overflow, value &lt;= (type(uint256).max - HALF_PERCENTAGE_FACTOR) / percentage</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :     assembly {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">      100989 :       if iszero(</span></span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC tlaBgGNC">      158440 :       if iszero(</span></span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :         or(</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :           iszero(percentage),</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :           iszero(gt(value, div(sub(not(0), HALF_PERCENTAGE_FACTOR), percentage)))</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :         )</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :       ) {</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :         revert(0, 0)</span>
+<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">         303 :         revert(0, 0)</span></span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :       }</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">      201340 :       result := div(add(mul(value, percentage), HALF_PERCENTAGE_FACTOR), PERCENTAGE_FACTOR)</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">      158137 :       result := div(add(mul(value, percentage), HALF_PERCENTAGE_FACTOR), PERCENTAGE_FACTOR)</span></span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     }</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
@@ -116,17 +116,17 @@
 <span id="L45"><span class="lineNum">      45</span>                 :             :    * @param percentage The percentage of the value to be calculated</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :    * @return result value percentdiv percentage</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :    */</span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">       19136 :   function percentDiv(uint256 value, uint256 percentage) internal pure returns (uint256 result) {</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   function percentDiv(uint256 value, uint256 percentage) internal pure returns (uint256 result) {</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :     // to avoid overflow, value &lt;= (type(uint256).max - halfPercentage) / PERCENTAGE_FACTOR</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :     assembly {</span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">       19136 :       if or(</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">       30126 :       if or(</span></span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :         iszero(percentage),</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :         iszero(iszero(gt(value, div(sub(not(0), div(percentage, 2)), PERCENTAGE_FACTOR))))</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :       ) {</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :         revert(0, 0)</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">          74 :         revert(0, 0)</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :       }</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       37888 :       result := div(add(mul(value, PERCENTAGE_FACTOR), div(percentage, 2)), percentage)</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       30052 :       result := div(add(mul(value, PERCENTAGE_FACTOR), div(percentage, 2)), percentage)</span></span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :     }</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   }</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             : }</span>
@@ -137,8 +137,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func-c.html b/report/protocol/libraries/math/WadRayMath.sol.func-c.html
similarity index 67%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func-c.html
rename to report/protocol/libraries/math/WadRayMath.sol.func-c.html
index a02ca863..aa6c47cb 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func-c.html
+++ b/report/protocol/libraries/math/WadRayMath.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/WadRayMath.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (<a href="WadRayMath.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (<a href="WadRayMath.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="WadRayMath.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="WadRayMath.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -79,37 +79,37 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L98">WadRayMath.rayToWad</a></td>
+              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L114">WadRayMath.wadToRay</a></td>
               
-              <td class="coverFnHi">2003</td>
+              <td class="coverFnHi">1945</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L45">WadRayMath.wadDiv</a></td>
+              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L98">WadRayMath.rayToWad</a></td>
               
-              <td class="coverFnHi">15325</td>
+              <td class="coverFnHi">2003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L114">WadRayMath.wadToRay</a></td>
+              <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L45">WadRayMath.wadDiv</a></td>
               
-              <td class="coverFnHi">77131</td>
+              <td class="coverFnHi">23533</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L81">WadRayMath.rayDiv</a></td>
               
-              <td class="coverFnHi">173648</td>
+              <td class="coverFnHi">280644</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L63">WadRayMath.rayMul</a></td>
               
-              <td class="coverFnHi">479205</td>
+              <td class="coverFnHi">719133</td>
               
               
             </tr>
@@ -117,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func.html b/report/protocol/libraries/math/WadRayMath.sol.func.html
similarity index 67%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func.html
rename to report/protocol/libraries/math/WadRayMath.sol.func.html
index 820bd34b..88a84a37 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.func.html
+++ b/report/protocol/libraries/math/WadRayMath.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/WadRayMath.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (<a href="WadRayMath.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (<a href="WadRayMath.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,35 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="WadRayMath.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="WadRayMath.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L81">WadRayMath.rayDiv</a></td>
               
-              <td class="coverFnHi">173648</td>
+              <td class="coverFnHi">280644</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L63">WadRayMath.rayMul</a></td>
               
-              <td class="coverFnHi">479205</td>
+              <td class="coverFnHi">719133</td>
               
               
             </tr>
@@ -95,7 +95,7 @@
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L45">WadRayMath.wadDiv</a></td>
               
-              <td class="coverFnHi">15325</td>
+              <td class="coverFnHi">23533</td>
               
               
             </tr>
@@ -109,7 +109,7 @@
             <tr>
               <td class="coverFn"><a href="WadRayMath.sol.gcov.html#L114">WadRayMath.wadToRay</a></td>
               
-              <td class="coverFnHi">77131</td>
+              <td class="coverFnHi">1945</td>
               
               
             </tr>
@@ -117,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.gcov.html b/report/protocol/libraries/math/WadRayMath.sol.gcov.html
similarity index 83%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.gcov.html
rename to report/protocol/libraries/math/WadRayMath.sol.gcov.html
index 78bbe0d7..1aab3e38 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol.gcov.html
+++ b/report/protocol/libraries/math/WadRayMath.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/WadRayMath.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math/WadRayMath.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (source / <a href="WadRayMath.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/libraries/math">protocol/libraries/math</a> - WadRayMath.sol<span style="font-size: 80%;"> (source / <a href="WadRayMath.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">13</td>
-            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntryMed">89.5&nbsp;%</td>
+            <td class="headerCovTableEntry">19</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -97,14 +97,14 @@
 <span id="L26"><span class="lineNum">      26</span>                 :             :    * @param b Wad</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :    * @return c = a*b, in wad</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :    */</span>
-<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC tlaBgGNC">        1006 :   function wadMul(uint256 a, uint256 b) internal pure returns (uint256 c) {</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :             :   function wadMul(uint256 a, uint256 b) internal pure returns (uint256 c) {</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :     // to avoid overflow, a &lt;= (type(uint256).max - HALF_WAD) / b</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :     assembly {</span>
-<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC">        1006 :       if iszero(or(iszero(b), iszero(gt(a, div(sub(not(0), HALF_WAD), b))))) {</span></span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :         revert(0, 0)</span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC tlaBgGNC">        1006 :       if iszero(or(iszero(b), iszero(gt(a, div(sub(not(0), HALF_WAD), b))))) {</span></span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">         314 :         revert(0, 0)</span></span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :       }</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">        1382 :       c := div(add(mul(a, b), HALF_WAD), WAD)</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">         692 :       c := div(add(mul(a, b), HALF_WAD), WAD)</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :     }</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :   }</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             : </span>
@@ -115,14 +115,14 @@
 <span id="L44"><span class="lineNum">      44</span>                 :             :    * @param b Wad</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :    * @return c = a/b, in wad</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :    */</span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">       15325 :   function wadDiv(uint256 a, uint256 b) internal pure returns (uint256 c) {</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   function wadDiv(uint256 a, uint256 b) internal pure returns (uint256 c) {</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :     // to avoid overflow, a &lt;= (type(uint256).max - halfB) / WAD</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :     assembly {</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">       15325 :       if or(iszero(b), iszero(iszero(gt(a, div(sub(not(0), div(b, 2)), WAD))))) {</span></span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :         revert(0, 0)</span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">       23533 :       if or(iszero(b), iszero(iszero(gt(a, div(sub(not(0), div(b, 2)), WAD))))) {</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">         169 :         revert(0, 0)</span></span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :       }</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             : </span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       30170 :       c := div(add(mul(a, WAD), div(b, 2)), b)</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       23364 :       c := div(add(mul(a, WAD), div(b, 2)), b)</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :     }</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   }</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
@@ -133,14 +133,14 @@
 <span id="L62"><span class="lineNum">      62</span>                 :             :    * @param b Ray</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :    * @return c = a raymul b</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :    */</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">      479205 :   function rayMul(uint256 a, uint256 b) internal pure returns (uint256 c) {</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :   function rayMul(uint256 a, uint256 b) internal pure returns (uint256 c) {</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     // to avoid overflow, a &lt;= (type(uint256).max - HALF_RAY) / b</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :     assembly {</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">      479205 :       if iszero(or(iszero(b), iszero(gt(a, div(sub(not(0), HALF_RAY), b))))) {</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :         revert(0, 0)</span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">      719133 :       if iszero(or(iszero(b), iszero(gt(a, div(sub(not(0), HALF_RAY), b))))) {</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         revert(0, 0)</span></span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :       }</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             : </span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">      958410 :       c := div(add(mul(a, b), HALF_RAY), RAY)</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC tlaBgGNC">      719133 :       c := div(add(mul(a, b), HALF_RAY), RAY)</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     }</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   }</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             : </span>
@@ -151,14 +151,14 @@
 <span id="L80"><span class="lineNum">      80</span>                 :             :    * @param b Ray</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :    * @return c = a raydiv b</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :    */</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">      173648 :   function rayDiv(uint256 a, uint256 b) internal pure returns (uint256 c) {</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function rayDiv(uint256 a, uint256 b) internal pure returns (uint256 c) {</span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :     // to avoid overflow, a &lt;= (type(uint256).max - halfB) / RAY</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :     assembly {</span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">      173648 :       if or(iszero(b), iszero(iszero(gt(a, div(sub(not(0), div(b, 2)), RAY))))) {</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :         revert(0, 0)</span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">      280644 :       if or(iszero(b), iszero(iszero(gt(a, div(sub(not(0), div(b, 2)), RAY))))) {</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaUNC tlaBgUNC">           0 :         revert(0, 0)</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :       }</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             : </span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">      347296 :       c := div(add(mul(a, RAY), div(b, 2)), b)</span></span>
+<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC tlaBgGNC">      280644 :       c := div(add(mul(a, RAY), div(b, 2)), b)</span></span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :     }</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   }</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             : </span>
@@ -168,12 +168,12 @@
 <span id="L97"><span class="lineNum">      97</span>                 :             :    * @param a Ray</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :    * @return b = a converted to wad, rounded half up to the nearest wad</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :    */</span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">        2003 :   function rayToWad(uint256 a) internal pure returns (uint256 b) {</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   function rayToWad(uint256 a) internal pure returns (uint256 b) {</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :     assembly {</span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">        4006 :       b := div(a, WAD_RAY_RATIO)</span></span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :       let remainder := mod(a, WAD_RAY_RATIO)</span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">        2003 :       b := div(a, WAD_RAY_RATIO)</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">        2003 :       let remainder := mod(a, WAD_RAY_RATIO)</span></span>
 <span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">        2003 :       if iszero(lt(remainder, div(WAD_RAY_RATIO, 2))) {</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">         576 :         b := add(b, 1)</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">         558 :         b := add(b, 1)</span></span>
 <span id="L106"><span class="lineNum">     106</span>                 :             :       }</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             :     }</span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
@@ -184,13 +184,13 @@
 <span id="L113"><span class="lineNum">     113</span>                 :             :    * @param a Wad</span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :    * @return b = a converted in ray</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :    */</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">       77131 :   function wadToRay(uint256 a) internal pure returns (uint256 b) {</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function wadToRay(uint256 a) internal pure returns (uint256 b) {</span>
 <span id="L117"><span class="lineNum">     117</span>                 :             :     // to avoid overflow, b/WAD_RAY_RATIO == a</span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :     assembly {</span>
-<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">      154262 :       b := mul(a, WAD_RAY_RATIO)</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">        1945 :       b := mul(a, WAD_RAY_RATIO)</span></span>
 <span id="L120"><span class="lineNum">     120</span>                 :             : </span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">       77131 :       if iszero(eq(div(b, WAD_RAY_RATIO), a)) {</span></span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :         revert(0, 0)</span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">        1945 :       if iszero(eq(div(b, WAD_RAY_RATIO), a)) {</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">         112 :         revert(0, 0)</span></span>
 <span id="L123"><span class="lineNum">     123</span>                 :             :       }</span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :     }</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             :   }</span>
@@ -202,8 +202,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-b.html b/report/protocol/libraries/math/index-sort-b.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-b.html
rename to report/protocol/libraries/math/index-sort-b.html
index 71bac976..5eaa5eb6 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-b.html
+++ b/report/protocol/libraries/math/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/math</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">37</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">95.6&nbsp;%</td>
+            <td class="headerCovTableEntry">45</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MathUtils.sol.gcov.html">MathUtils.sol</a></td>
+              <td class="coverFile"><a href="MathUtils.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/MathUtils.sol">MathUtils.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">20</td>
@@ -111,13 +111,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PercentageMath.sol.gcov.html">PercentageMath.sol</a></td>
+              <td class="coverFile"><a href="PercentageMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/PercentageMath.sol">PercentageMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -126,13 +126,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="WadRayMath.sol.gcov.html">WadRayMath.sol</a></td>
+              <td class="coverFile"><a href="WadRayMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/WadRayMath.sol">WadRayMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../amber.png" width=89 height=10 alt="89.5%"><img src="../../../snow.png" width=11 height=10 alt="89.5%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -145,8 +145,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-f.html b/report/protocol/libraries/math/index-sort-f.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-f.html
rename to report/protocol/libraries/math/index-sort-f.html
index cb969e10..196574ae 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-f.html
+++ b/report/protocol/libraries/math/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/math</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">37</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">95.6&nbsp;%</td>
+            <td class="headerCovTableEntry">45</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MathUtils.sol.gcov.html">MathUtils.sol</a></td>
+              <td class="coverFile"><a href="MathUtils.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/MathUtils.sol">MathUtils.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">20</td>
@@ -111,13 +111,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PercentageMath.sol.gcov.html">PercentageMath.sol</a></td>
+              <td class="coverFile"><a href="PercentageMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/PercentageMath.sol">PercentageMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -126,13 +126,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="WadRayMath.sol.gcov.html">WadRayMath.sol</a></td>
+              <td class="coverFile"><a href="WadRayMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/WadRayMath.sol">WadRayMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../amber.png" width=89 height=10 alt="89.5%"><img src="../../../snow.png" width=11 height=10 alt="89.5%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -145,8 +145,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-l.html b/report/protocol/libraries/math/index-sort-l.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-l.html
rename to report/protocol/libraries/math/index-sort-l.html
index 5a3881c2..3b7d6d76 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index-sort-l.html
+++ b/report/protocol/libraries/math/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/math</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">37</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">95.6&nbsp;%</td>
+            <td class="headerCovTableEntry">45</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,39 +96,39 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PercentageMath.sol.gcov.html">PercentageMath.sol</a></td>
+              <td class="coverFile"><a href="WadRayMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/WadRayMath.sol">WadRayMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../amber.png" width=89 height=10 alt="89.5%"><img src="../../../snow.png" width=11 height=10 alt="89.5%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="WadRayMath.sol.gcov.html">WadRayMath.sol</a></td>
+              <td class="coverFile"><a href="PercentageMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/PercentageMath.sol">PercentageMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MathUtils.sol.gcov.html">MathUtils.sol</a></td>
+              <td class="coverFile"><a href="MathUtils.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/MathUtils.sol">MathUtils.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">20</td>
@@ -145,8 +145,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html b/report/protocol/libraries/math/index.html
similarity index 64%
rename from report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html
rename to report/protocol/libraries/math/index.html
index fb38af2f..fb57a734 100644
--- a/report/core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math/index.html
+++ b/report/protocol/libraries/math/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/libraries/math</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/libraries/math/src/core/contracts/protocol/libraries/math</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/libraries/math</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">37</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">95.6&nbsp;%</td>
+            <td class="headerCovTableEntry">45</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MathUtils.sol.gcov.html">MathUtils.sol</a></td>
+              <td class="coverFile"><a href="MathUtils.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/MathUtils.sol">MathUtils.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">20</td>
@@ -111,13 +111,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PercentageMath.sol.gcov.html">PercentageMath.sol</a></td>
+              <td class="coverFile"><a href="PercentageMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/PercentageMath.sol">PercentageMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -126,13 +126,13 @@
               <td class="coverNumDflt">2</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="WadRayMath.sol.gcov.html">WadRayMath.sol</a></td>
+              <td class="coverFile"><a href="WadRayMath.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/libraries/math/WadRayMath.sol">WadRayMath.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../amber.png" width=89 height=10 alt="89.5%"><img src="../../../snow.png" width=11 height=10 alt="89.5%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">13</td>
-              <td class="coverNumDflt">13</td>
+              <td class="coverPerMed">89.5&nbsp;%</td>
+              <td class="coverNumDflt">19</td>
+              <td class="coverNumDflt">17</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -145,8 +145,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func-c.html b/report/protocol/pool/L2Pool.sol.func-c.html
similarity index 66%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func-c.html
rename to report/protocol/pool/L2Pool.sol.func-c.html
index bd46015b..fdaff8d1 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func-c.html
+++ b/report/protocol/pool/L2Pool.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/L2Pool.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (<a href="L2Pool.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (<a href="L2Pool.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
-            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,33 +53,26 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="L2Pool.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="L2Pool.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L108">L2Pool.liquidationCall</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L90">L2Pool.rebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L90">L2Pool.liquidationCall</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -100,14 +93,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L99">L2Pool.setUserUseReserveAsCollateral</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L81">L2Pool.swapBorrowRateMode</a></td>
+              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L81">L2Pool.setUserUseReserveAsCollateral</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -152,8 +138,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func.html b/report/protocol/pool/L2Pool.sol.func.html
similarity index 66%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func.html
rename to report/protocol/pool/L2Pool.sol.func.html
index 5cb0e702..5d8dfdfa 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.func.html
+++ b/report/protocol/pool/L2Pool.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/L2Pool.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (<a href="L2Pool.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (<a href="L2Pool.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
-            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="L2Pool.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="L2Pool.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
@@ -79,14 +79,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L108">L2Pool.liquidationCall</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L90">L2Pool.rebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L90">L2Pool.liquidationCall</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -114,7 +107,7 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L99">L2Pool.setUserUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L81">L2Pool.setUserUseReserveAsCollateral</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -133,13 +126,6 @@
               <td class="coverFnHi">1000</td>
               
               
-            </tr>
-            <tr>
-              <td class="coverFn"><a href="L2Pool.sol.gcov.html#L81">L2Pool.swapBorrowRateMode</a></td>
-              
-              <td class="coverFnHi">1</td>
-              
-              
             </tr>
             <tr>
               <td class="coverFn"><a href="L2Pool.sol.gcov.html#L33">L2Pool.withdraw</a></td>
@@ -152,8 +138,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.gcov.html b/report/protocol/pool/L2Pool.sol.gcov.html
similarity index 66%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.gcov.html
rename to report/protocol/pool/L2Pool.sol.gcov.html
index 5ba63d60..6ce0cf48 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol.gcov.html
+++ b/report/protocol/pool/L2Pool.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/L2Pool.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/L2Pool.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (source / <a href="L2Pool.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - L2Pool.sol<span style="font-size: 80%;"> (source / <a href="L2Pool.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">24</td>
-            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">11</td>
-            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -85,110 +85,92 @@
 <span id="L14"><span class="lineNum">      14</span>                 :             :  */</span>
 <span id="L15"><span class="lineNum">      15</span>                 :             : abstract contract L2Pool is Pool, IL2Pool {</span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L17"><span class="lineNum">      17</span>                 :<span class="tlaGNC tlaBgGNC">           7 :   function supply(bytes32 args) external override {</span></span>
-<span id="L18"><span class="lineNum">      18</span>                 :<span class="tlaGNC">          21 :     (address asset, uint256 amount, uint16 referralCode) = CalldataLogic.decodeSupplyParams(</span></span>
+<span id="L17"><span class="lineNum">      17</span>                 :             :   function supply(bytes32 args) external override {</span>
+<span id="L18"><span class="lineNum">      18</span>                 :<span class="tlaGNC tlaBgGNC">           7 :     (address asset, uint256 amount, uint16 referralCode) = CalldataLogic.decodeSupplyParams(</span></span>
 <span id="L19"><span class="lineNum">      19</span>                 :             :       _reservesList,</span>
 <span id="L20"><span class="lineNum">      20</span>                 :             :       args</span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :     );</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             : </span>
-<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">          14 :     supply(asset, amount, msg.sender, referralCode);</span></span>
+<span id="L23"><span class="lineNum">      23</span>                 :<span class="tlaGNC">           7 :     supply(asset, amount, msg.sender, referralCode);</span></span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :   }</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             : </span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        1000 :   function supplyWithPermit(bytes32 args, bytes32 r, bytes32 s) external override {</span></span>
-<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        3000 :     (address asset, uint256 amount, uint16 referralCode, uint256 deadline, uint8 v) = CalldataLogic</span></span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   function supplyWithPermit(bytes32 args, bytes32 r, bytes32 s) external override {</span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC">        1000 :     (address asset, uint256 amount, uint16 referralCode, uint256 deadline, uint8 v) = CalldataLogic</span></span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :       .decodeSupplyWithPermitParams(_reservesList, args);</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        2000 :     supplyWithPermit(asset, amount, msg.sender, referralCode, deadline, v, r, s);</span></span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaGNC">        1000 :     supplyWithPermit(asset, amount, msg.sender, referralCode, deadline, v, r, s);</span></span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :   }</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             : </span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC">           2 :   function withdraw(bytes32 args) external override returns (uint256) {</span></span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">           6 :     (address asset, uint256 amount) = CalldataLogic.decodeWithdrawParams(_reservesList, args);</span></span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   function withdraw(bytes32 args) external override returns (uint256) {</span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">           2 :     (address asset, uint256 amount) = CalldataLogic.decodeWithdrawParams(_reservesList, args);</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             : </span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">           6 :     return withdraw(asset, amount, msg.sender);</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">           2 :     return withdraw(asset, amount, msg.sender);</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">           3 :   function borrow(bytes32 args) external override {</span></span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">           9 :     (address asset, uint256 amount, uint256 interestRateMode, uint16 referralCode) = CalldataLogic</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   function borrow(bytes32 args) external override {</span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">           3 :     (address asset, uint256 amount, uint256 interestRateMode, uint16 referralCode) = CalldataLogic</span></span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :       .decodeBorrowParams(_reservesList, args);</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             : </span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           6 :     borrow(asset, amount, interestRateMode, referralCode, msg.sender);</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           3 :     borrow(asset, amount, interestRateMode, referralCode, msg.sender);</span></span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :   }</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             : </span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">           1 :   function repay(bytes32 args) external override returns (uint256) {</span></span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           3 :     (address asset, uint256 amount, uint256 interestRateMode) = CalldataLogic.decodeRepayParams(</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   function repay(bytes32 args) external override returns (uint256) {</span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           1 :     (address asset, uint256 amount, uint256 interestRateMode) = CalldataLogic.decodeRepayParams(</span></span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :       _reservesList,</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :       args</span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :     );</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           3 :     return repay(asset, amount, interestRateMode, msg.sender);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           1 :     return repay(asset, amount, interestRateMode, msg.sender);</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             : </span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">        1000 :   function repayWithPermit(bytes32 args, bytes32 r, bytes32 s) external override returns (uint256) {</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">        2000 :     (</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   function repayWithPermit(bytes32 args, bytes32 r, bytes32 s) external override returns (uint256) {</span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">        1000 :     (</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :       address asset,</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :       uint256 amount,</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :       uint256 interestRateMode,</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :       uint256 deadline,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :       uint8 v</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">        2000 :     ) = CalldataLogic.decodeRepayWithPermitParams(_reservesList, args);</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">        1000 :     ) = CalldataLogic.decodeRepayWithPermitParams(_reservesList, args);</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">        3000 :     return repayWithPermit(asset, amount, interestRateMode, msg.sender, deadline, v, r, s);</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">        1000 :     return repayWithPermit(asset, amount, interestRateMode, msg.sender, deadline, v, r, s);</span></span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :   }</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             : </span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">           1 :   function repayWithATokens(bytes32 args) external override returns (uint256) {</span></span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           3 :     (address asset, uint256 amount, uint256 interestRateMode) = CalldataLogic.decodeRepayParams(</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :             :   function repayWithATokens(bytes32 args) external override returns (uint256) {</span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">           1 :     (address asset, uint256 amount, uint256 interestRateMode) = CalldataLogic.decodeRepayParams(</span></span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :       _reservesList,</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :       args</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :     );</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           3 :     return repayWithATokens(asset, amount, interestRateMode);</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">           1 :     return repayWithATokens(asset, amount, interestRateMode);</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             : </span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">           1 :   function swapBorrowRateMode(bytes32 args) external override {</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           3 :     (address asset, uint256 interestRateMode) = CalldataLogic.decodeSwapBorrowRateModeParams(</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :   function setUserUseReserveAsCollateral(bytes32 args) external override {</span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           1 :     (address asset, bool useAsCollateral) = CalldataLogic.decodeSetUserUseReserveAsCollateralParams(</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :       _reservesList,</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :       args</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :     );</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">           2 :     swapBorrowRateMode(asset, interestRateMode);</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">           1 :     setUserUseReserveAsCollateral(asset, useAsCollateral);</span></span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   }</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">           1 :   function rebalanceStableBorrowRate(bytes32 args) external override {</span></span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">           3 :     (address asset, address user) = CalldataLogic.decodeRebalanceStableBorrowRateParams(</span></span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :       _reservesList,</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :       args</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             :     );</span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           2 :     rebalanceStableBorrowRate(asset, user);</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           1 :   function setUserUseReserveAsCollateral(bytes32 args) external override {</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           3 :     (address asset, bool useAsCollateral) = CalldataLogic.decodeSetUserUseReserveAsCollateralParams(</span></span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :       _reservesList,</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :       args</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             :     );</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           2 :     setUserUseReserveAsCollateral(asset, useAsCollateral);</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :   }</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             : </span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :   /// @inheritdoc IL2Pool</span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           1 :   function liquidationCall(bytes32 args1, bytes32 args2) external override {</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           2 :     (</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :       address collateralAsset,</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :       address debtAsset,</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :       address user,</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :       uint256 debtToCover,</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :       bool receiveAToken</span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           2 :     ) = CalldataLogic.decodeLiquidationCallParams(_reservesList, args1, args2);</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           2 :     liquidationCall(collateralAsset, debtAsset, user, debtToCover, receiveAToken);</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :   }</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             : }</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function liquidationCall(bytes32 args1, bytes32 args2) external override {</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">           1 :     (</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :       address collateralAsset,</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :       address debtAsset,</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :       address user,</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :       uint256 debtToCover,</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :       bool receiveAToken</span>
+<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">           1 :     ) = CalldataLogic.decodeLiquidationCallParams(_reservesList, args1, args2);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           1 :     liquidationCall(collateralAsset, debtAsset, user, debtToCover, receiveAToken);</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :   }</span>
+<span id="L102"><span class="lineNum">     102</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -196,8 +178,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func-c.html b/report/protocol/pool/Pool.sol.func-c.html
similarity index 62%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func-c.html
rename to report/protocol/pool/Pool.sol.func-c.html
index 25ce9a96..8a0cf110 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func-c.html
+++ b/report/protocol/pool/Pool.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/Pool.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (<a href="Pool.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (<a href="Pool.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">108</td>
-            <td class="headerCovTableEntry">107</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
+            <td class="headerCovTableEntry">119</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.4&nbsp;%</td>
-            <td class="headerCovTableEntry">61</td>
-            <td class="headerCovTableEntry">60</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntry">67</td>
           </tr>
           <tr>
             <td></td>
@@ -53,448 +53,490 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="Pool.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="Pool.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L330">Pool.swapToVariable</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L548">Pool.getReserveAddressById</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L580">Pool.getReserveAddressById</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L837">Pool.getBorrowLogic</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L575">Pool.getReservesCount</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L842">Pool.getBridgeLogic</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L818">Pool.getBorrowLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L847">Pool.getEModeLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L823">Pool.getBridgeLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L832">Pool.getFlashLoanLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L828">Pool.getEModeLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L852">Pool.getLiquidationLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L813">Pool.getFlashLoanLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L857">Pool.getPoolLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L833">Pool.getLiquidationLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L543">Pool.getReservesCount</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L838">Pool.getPoolLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L862">Pool.getSupplyLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L843">Pool.getSupplyLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L718">Pool.getEModeCategoryData</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L605">Pool.MAX_NUMBER_RESERVES</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L420">Pool.mintToTreasury</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L585">Pool.MAX_STABLE_RATE_BORROW_SIZE_PERCENT</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L122">Pool.backUnbacked</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L450">Pool.mintToTreasury</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L400">Pool.flashLoanSimple</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L341">Pool.rebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L104">Pool.mintUnbacked</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">17</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L455">Pool.getReserveDataExtended</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L60">Pool.onlyBridge</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">17</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L319">Pool.swapBorrowRateMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L239">Pool.repay</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L123">Pool.backUnbacked</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L553">Pool.BRIDGE_PROTOCOL_FEE</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">25</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L391">Pool.flashLoan</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L745">Pool.getEModeCategoryLabel</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">25</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L430">Pool.flashLoanSimple</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L79">Pool._onlyBridge</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">26</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L793">Pool.deposit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L317">Pool.setUserUseReserveAsCollateral</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">42</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L105">Pool.mintUnbacked</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L90">Pool.</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">44</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L741">Pool.setUserEMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L733">Pool.getEModeCategoryCollateralConfig</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">110</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L241">Pool.repay</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L296">Pool.repayWithATokens</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L590">Pool.BRIDGE_PROTOCOL_FEE</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L362">Pool.flashLoan</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L80">Pool._onlyBridge</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L563">Pool.FLASHLOAN_PREMIUM_TO_PROTOCOL</a></td>
               
-              <td class="coverFnHi">26</td>
+              <td class="coverFnHi">1365</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L346">Pool.setUserUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L558">Pool.FLASHLOAN_PREMIUM_TOTAL</a></td>
               
-              <td class="coverFnHi">42</td>
+              <td class="coverFnHi">1368</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L188">Pool.withdraw</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L643">Pool.syncIndexesState</a></td>
               
-              <td class="coverFnHi">43</td>
+              <td class="coverFnHi">1994</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L734">Pool.getEModeCategoryData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L651">Pool.syncRatesState</a></td>
               
-              <td class="coverFnHi">46</td>
+              <td class="coverFnHi">1994</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L298">Pool.repayWithATokens</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L72">Pool._onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">1005</td>
+              <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L610">Pool.finalizeTransfer</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L52">Pool.onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L600">Pool.FLASHLOAN_PREMIUM_TO_PROTOCOL</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L802">Pool.rescueTokens</a></td>
               
-              <td class="coverFnHi">1215</td>
+              <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L595">Pool.FLASHLOAN_PREMIUM_TOTAL</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L568">Pool.MAX_NUMBER_RESERVES</a></td>
               
-              <td class="coverFnHi">1218</td>
+              <td class="coverFnHi">2002</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L682">Pool.syncIndexesState</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L627">Pool.dropReserve</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">2007</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L690">Pool.syncRatesState</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L669">Pool.updateBridgeProtocolFee</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">2013</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L73">Pool._onlyPoolAdmin</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L187">Pool.withdraw</a></td>
               
-              <td class="coverFnHi">2000</td>
+              <td class="coverFnHi">2043</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L783">Pool.rescueTokens</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L261">Pool.repayWithPermit</a></td>
               
-              <td class="coverFnHi">2000</td>
+              <td class="coverFnHi">3000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L666">Pool.dropReserve</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L152">Pool.supplyWithPermit</a></td>
               
-              <td class="coverFnHi">2007</td>
+              <td class="coverFnHi">3000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L708">Pool.updateBridgeProtocolFee</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L676">Pool.updateFlashloanPremiums</a></td>
               
-              <td class="coverFnHi">2013</td>
+              <td class="coverFnHi">3362</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L724">Pool.configureEModeCategory</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L781">Pool.resetIsolationModeTotalDebt</a></td>
               
-              <td class="coverFnHi">2027</td>
+              <td class="coverFnHi">3951</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L263">Pool.repayWithPermit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L776">Pool.getUserEMode</a></td>
               
-              <td class="coverFnHi">3000</td>
+              <td class="coverFnHi">5016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L153">Pool.supplyWithPermit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L425">Pool.getReserveDataExtended</a></td>
               
-              <td class="coverFnHi">3000</td>
+              <td class="coverFnHi">6011</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L44">Pool.onlyPoolConfigurator</a></td>
+              
+              <td class="coverFnHi">6046</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L632">Pool.setReserveInterestRateStrategyAddress</a></td>
+              
+              <td class="coverFnHi">6046</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L708">Pool.configureEModeCategoryBorrowableBitmap</a></td>
+              
+              <td class="coverFnHi">7010</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L501">Pool.getUserConfiguration</a></td>
+              
+              <td class="coverFnHi">7029</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L755">Pool.getEModeCategoryBorrowableBitmap</a></td>
+              
+              <td class="coverFnHi">7035</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L455">Pool.getVirtualUnderlyingBalance</a></td>
+              
+              <td class="coverFnHi">8111</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L757">Pool.getUserEMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L788">Pool.getLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">3012</td>
+              <td class="coverFnHi">8756</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L494">Pool.getUserAccountData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L462">Pool.getUserAccountData</a></td>
               
-              <td class="coverFnHi">3013</td>
+              <td class="coverFnHi">10015</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L715">Pool.updateFlashloanPremiums</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L760">Pool.setUserEMode</a></td>
               
-              <td class="coverFnHi">3212</td>
+              <td class="coverFnHi">10023</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L762">Pool.resetIsolationModeTotalDebt</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L698">Pool.configureEModeCategoryCollateralBitmap</a></td>
               
-              <td class="coverFnHi">3751</td>
+              <td class="coverFnHi">10039</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L769">Pool.getLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L750">Pool.getEModeCategoryCollateralBitmap</a></td>
               
-              <td class="coverFnHi">5512</td>
+              <td class="coverFnHi">10064</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L671">Pool.setReserveInterestRateStrategyAddress</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L685">Pool.configureEModeCategory</a></td>
               
-              <td class="coverFnHi">6006</td>
+              <td class="coverFnHi">12029</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L533">Pool.getUserConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L335">Pool.liquidationCall</a></td>
               
-              <td class="coverFnHi">6030</td>
+              <td class="coverFnHi">14500</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L487">Pool.getVirtualUnderlyingBalance</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L522">Pool.getReservesList</a></td>
               
-              <td class="coverFnHi">6030</td>
+              <td class="coverFnHi">16076</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L554">Pool.getReservesList</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L210">Pool.borrow</a></td>
               
-              <td class="coverFnHi">6043</td>
+              <td class="coverFnHi">16105</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L639">Pool.initReserve</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L793">Pool.setLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">6882</td>
+              <td class="coverFnHi">16412</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L211">Pool.borrow</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L573">Pool.finalizeTransfer</a></td>
               
-              <td class="coverFnHi">9113</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L133">Pool.supply</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L812">Pool.deposit</a></td>
               
-              <td class="coverFnHi">9558</td>
+              <td class="coverFnHi">20025</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L364">Pool.liquidationCall</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L132">Pool.supply</a></td>
               
-              <td class="coverFnHi">11291</td>
+              <td class="coverFnHi">20483</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L774">Pool.setLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L515">Pool.getReserveNormalizedVariableDebt</a></td>
               
-              <td class="coverFnHi">13028</td>
+              <td class="coverFnHi">29583</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L462">Pool.getReserveData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L432">Pool.getReserveData</a></td>
               
-              <td class="coverFnHi">22204</td>
+              <td class="coverFnHi">83030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L547">Pool.getReserveNormalizedVariableDebt</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L508">Pool.getReserveNormalizedIncome</a></td>
               
-              <td class="coverFnHi">25218</td>
+              <td class="coverFnHi">115423</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L540">Pool.getReserveNormalizedIncome</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L494">Pool.getConfiguration</a></td>
               
-              <td class="coverFnHi">31404</td>
+              <td class="coverFnHi">162047</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L698">Pool.setConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L602">Pool.initReserve</a></td>
               
-              <td class="coverFnHi">38058</td>
+              <td class="coverFnHi">170016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L526">Pool.getConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L659">Pool.setConfiguration</a></td>
               
-              <td class="coverFnHi">41450</td>
+              <td class="coverFnHi">210599</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L66">Pool._onlyPoolConfigurator</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L65">Pool._onlyPoolConfigurator</a></td>
               
-              <td class="coverFnHi">80486</td>
+              <td class="coverFnHi">447472</td>
               
               
             </tr>
@@ -502,8 +544,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func.html b/report/protocol/pool/Pool.sol.func.html
similarity index 62%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func.html
rename to report/protocol/pool/Pool.sol.func.html
index ca1ea3f4..7757b8f3 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.func.html
+++ b/report/protocol/pool/Pool.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/Pool.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (<a href="Pool.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (<a href="Pool.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">108</td>
-            <td class="headerCovTableEntry">107</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
+            <td class="headerCovTableEntry">119</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.4&nbsp;%</td>
-            <td class="headerCovTableEntry">61</td>
-            <td class="headerCovTableEntry">60</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntry">67</td>
           </tr>
           <tr>
             <td></td>
@@ -53,448 +53,490 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="Pool.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="Pool.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L590">Pool.BRIDGE_PROTOCOL_FEE</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L90">Pool.</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">44</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L595">Pool.FLASHLOAN_PREMIUM_TOTAL</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L553">Pool.BRIDGE_PROTOCOL_FEE</a></td>
               
-              <td class="coverFnHi">1218</td>
+              <td class="coverFnHi">25</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L600">Pool.FLASHLOAN_PREMIUM_TO_PROTOCOL</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L558">Pool.FLASHLOAN_PREMIUM_TOTAL</a></td>
               
-              <td class="coverFnHi">1215</td>
+              <td class="coverFnHi">1368</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L605">Pool.MAX_NUMBER_RESERVES</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L563">Pool.FLASHLOAN_PREMIUM_TO_PROTOCOL</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">1365</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L585">Pool.MAX_STABLE_RATE_BORROW_SIZE_PERCENT</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L568">Pool.MAX_NUMBER_RESERVES</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">2002</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L80">Pool._onlyBridge</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L79">Pool._onlyBridge</a></td>
               
               <td class="coverFnHi">26</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L73">Pool._onlyPoolAdmin</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L72">Pool._onlyPoolAdmin</a></td>
               
               <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L66">Pool._onlyPoolConfigurator</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L65">Pool._onlyPoolConfigurator</a></td>
               
-              <td class="coverFnHi">80486</td>
+              <td class="coverFnHi">447472</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L123">Pool.backUnbacked</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L122">Pool.backUnbacked</a></td>
               
               <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L211">Pool.borrow</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L210">Pool.borrow</a></td>
               
-              <td class="coverFnHi">9113</td>
+              <td class="coverFnHi">16105</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L724">Pool.configureEModeCategory</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L685">Pool.configureEModeCategory</a></td>
               
-              <td class="coverFnHi">2027</td>
+              <td class="coverFnHi">12029</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L793">Pool.deposit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L708">Pool.configureEModeCategoryBorrowableBitmap</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">7010</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L698">Pool.configureEModeCategoryCollateralBitmap</a></td>
+              
+              <td class="coverFnHi">10039</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L666">Pool.dropReserve</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L812">Pool.deposit</a></td>
+              
+              <td class="coverFnHi">20025</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L627">Pool.dropReserve</a></td>
               
               <td class="coverFnHi">2007</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L610">Pool.finalizeTransfer</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L573">Pool.finalizeTransfer</a></td>
               
-              <td class="coverFnHi">1036</td>
+              <td class="coverFnHi">17042</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L391">Pool.flashLoan</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L362">Pool.flashLoan</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L430">Pool.flashLoanSimple</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L400">Pool.flashLoanSimple</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L818">Pool.getBorrowLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L837">Pool.getBorrowLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L823">Pool.getBridgeLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L842">Pool.getBridgeLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L526">Pool.getConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L494">Pool.getConfiguration</a></td>
               
-              <td class="coverFnHi">41450</td>
+              <td class="coverFnHi">162047</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L734">Pool.getEModeCategoryData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L755">Pool.getEModeCategoryBorrowableBitmap</a></td>
               
-              <td class="coverFnHi">46</td>
+              <td class="coverFnHi">7035</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L828">Pool.getEModeLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L750">Pool.getEModeCategoryCollateralBitmap</a></td>
+              
+              <td class="coverFnHi">10064</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L733">Pool.getEModeCategoryCollateralConfig</a></td>
+              
+              <td class="coverFnHi">110</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L718">Pool.getEModeCategoryData</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L745">Pool.getEModeCategoryLabel</a></td>
+              
+              <td class="coverFnHi">25</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L847">Pool.getEModeLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L813">Pool.getFlashLoanLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L832">Pool.getFlashLoanLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L769">Pool.getLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L788">Pool.getLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">5512</td>
+              <td class="coverFnHi">8756</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L833">Pool.getLiquidationLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L852">Pool.getLiquidationLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L838">Pool.getPoolLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L857">Pool.getPoolLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L580">Pool.getReserveAddressById</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L548">Pool.getReserveAddressById</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L462">Pool.getReserveData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L432">Pool.getReserveData</a></td>
               
-              <td class="coverFnHi">22204</td>
+              <td class="coverFnHi">83030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L455">Pool.getReserveDataExtended</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L425">Pool.getReserveDataExtended</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">6011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L540">Pool.getReserveNormalizedIncome</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L508">Pool.getReserveNormalizedIncome</a></td>
               
-              <td class="coverFnHi">31404</td>
+              <td class="coverFnHi">115423</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L547">Pool.getReserveNormalizedVariableDebt</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L515">Pool.getReserveNormalizedVariableDebt</a></td>
               
-              <td class="coverFnHi">25218</td>
+              <td class="coverFnHi">29583</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L575">Pool.getReservesCount</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L543">Pool.getReservesCount</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L554">Pool.getReservesList</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L522">Pool.getReservesList</a></td>
               
-              <td class="coverFnHi">6043</td>
+              <td class="coverFnHi">16076</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L843">Pool.getSupplyLogic</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L862">Pool.getSupplyLogic</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L494">Pool.getUserAccountData</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L462">Pool.getUserAccountData</a></td>
               
-              <td class="coverFnHi">3013</td>
+              <td class="coverFnHi">10015</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L533">Pool.getUserConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L501">Pool.getUserConfiguration</a></td>
               
-              <td class="coverFnHi">6030</td>
+              <td class="coverFnHi">7029</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L757">Pool.getUserEMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L776">Pool.getUserEMode</a></td>
               
-              <td class="coverFnHi">3012</td>
+              <td class="coverFnHi">5016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L487">Pool.getVirtualUnderlyingBalance</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L455">Pool.getVirtualUnderlyingBalance</a></td>
               
-              <td class="coverFnHi">6030</td>
+              <td class="coverFnHi">8111</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L639">Pool.initReserve</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L602">Pool.initReserve</a></td>
               
-              <td class="coverFnHi">6882</td>
+              <td class="coverFnHi">170016</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L364">Pool.liquidationCall</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L335">Pool.liquidationCall</a></td>
               
-              <td class="coverFnHi">11291</td>
+              <td class="coverFnHi">14500</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L450">Pool.mintToTreasury</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L420">Pool.mintToTreasury</a></td>
               
               <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L105">Pool.mintUnbacked</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L104">Pool.mintUnbacked</a></td>
               
               <td class="coverFnHi">17</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L341">Pool.rebalanceStableBorrowRate</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L60">Pool.onlyBridge</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">17</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L241">Pool.repay</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L52">Pool.onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L298">Pool.repayWithATokens</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L44">Pool.onlyPoolConfigurator</a></td>
               
-              <td class="coverFnHi">1005</td>
+              <td class="coverFnHi">6046</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L263">Pool.repayWithPermit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L239">Pool.repay</a></td>
               
-              <td class="coverFnHi">3000</td>
+              <td class="coverFnHi">23</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L783">Pool.rescueTokens</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L296">Pool.repayWithATokens</a></td>
               
-              <td class="coverFnHi">2000</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L762">Pool.resetIsolationModeTotalDebt</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L261">Pool.repayWithPermit</a></td>
               
-              <td class="coverFnHi">3751</td>
+              <td class="coverFnHi">3000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L698">Pool.setConfiguration</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L802">Pool.rescueTokens</a></td>
               
-              <td class="coverFnHi">38058</td>
+              <td class="coverFnHi">2000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L774">Pool.setLiquidationGracePeriod</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L781">Pool.resetIsolationModeTotalDebt</a></td>
               
-              <td class="coverFnHi">13028</td>
+              <td class="coverFnHi">3951</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L671">Pool.setReserveInterestRateStrategyAddress</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L659">Pool.setConfiguration</a></td>
               
-              <td class="coverFnHi">6006</td>
+              <td class="coverFnHi">210599</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L741">Pool.setUserEMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L793">Pool.setLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">16412</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L346">Pool.setUserUseReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L632">Pool.setReserveInterestRateStrategyAddress</a></td>
               
-              <td class="coverFnHi">42</td>
+              <td class="coverFnHi">6046</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L133">Pool.supply</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L760">Pool.setUserEMode</a></td>
               
-              <td class="coverFnHi">9558</td>
+              <td class="coverFnHi">10023</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L153">Pool.supplyWithPermit</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L317">Pool.setUserUseReserveAsCollateral</a></td>
               
-              <td class="coverFnHi">3000</td>
+              <td class="coverFnHi">42</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L319">Pool.swapBorrowRateMode</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L132">Pool.supply</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">20483</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L330">Pool.swapToVariable</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L152">Pool.supplyWithPermit</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">3000</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L682">Pool.syncIndexesState</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L643">Pool.syncIndexesState</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">1994</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L690">Pool.syncRatesState</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L651">Pool.syncRatesState</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">1994</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L708">Pool.updateBridgeProtocolFee</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L669">Pool.updateBridgeProtocolFee</a></td>
               
               <td class="coverFnHi">2013</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L715">Pool.updateFlashloanPremiums</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L676">Pool.updateFlashloanPremiums</a></td>
               
-              <td class="coverFnHi">3212</td>
+              <td class="coverFnHi">3362</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Pool.sol.gcov.html#L188">Pool.withdraw</a></td>
+              <td class="coverFn"><a href="Pool.sol.gcov.html#L187">Pool.withdraw</a></td>
               
-              <td class="coverFnHi">43</td>
+              <td class="coverFnHi">2043</td>
               
               
             </tr>
@@ -502,8 +544,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.gcov.html b/report/protocol/pool/Pool.sol.gcov.html
similarity index 83%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.gcov.html
rename to report/protocol/pool/Pool.sol.gcov.html
index c53efd0f..af32c91e 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol.gcov.html
+++ b/report/protocol/pool/Pool.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/Pool.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/Pool.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (source / <a href="Pool.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - Pool.sol<span style="font-size: 80%;"> (source / <a href="Pool.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">108</td>
-            <td class="headerCovTableEntry">107</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
+            <td class="headerCovTableEntry">119</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">98.4&nbsp;%</td>
-            <td class="headerCovTableEntry">61</td>
-            <td class="headerCovTableEntry">60</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">67</td>
+            <td class="headerCovTableEntry">67</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,7 +72,7 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {PoolLogic} from '../libraries/logic/PoolLogic.sol';</span>
@@ -99,824 +99,843 @@
 <span id="L28"><span class="lineNum">      28</span>                 :             :  *   # Withdraw</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :  *   # Borrow</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :  *   # Repay</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :  *   # Swap their loans between variable and stable rate</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :  *   # Enable/disable their supplied assets as collateral rebalance stable rate borrow positions</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :  *   # Liquidate positions</span>
-<span id="L34"><span class="lineNum">      34</span>                 :             :  *   # Execute Flash Loans</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :  * @dev To be covered by a proxy contract, owned by the PoolAddressesProvider of the specific market</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :  * @dev All admin functions are callable by the PoolConfigurator contract defined also in the</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :  *   PoolAddressesProvider</span>
-<span id="L38"><span class="lineNum">      38</span>                 :             :  */</span>
-<span id="L39"><span class="lineNum">      39</span>                 :             : abstract contract Pool is VersionedInitializable, PoolStorage, IPool {</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             : </span>
-<span id="L42"><span class="lineNum">      42</span>                 :             :   IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;</span>
-<span id="L43"><span class="lineNum">      43</span>                 :             : </span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :   /**</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :    * @dev Only pool configurator can call functions marked by this modifier.</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :    */</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   modifier onlyPoolConfigurator() {</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :     _onlyPoolConfigurator();</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     _;</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :   }</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             : </span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :   /**</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             :    * @dev Only pool admin can call functions marked by this modifier.</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :    */</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :   modifier onlyPoolAdmin() {</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :     _onlyPoolAdmin();</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :     _;</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :   }</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :   /**</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :    * @dev Only bridge can call functions marked by this modifier.</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :    */</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :   modifier onlyBridge() {</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :     _onlyBridge();</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :     _;</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :   }</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             : </span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC tlaBgGNC">       80486 :   function _onlyPoolConfigurator() internal view virtual {</span></span>
-<span id="L69"><span class="lineNum">      69</span>                 :<span class="tlaGNC">      160972 :     require(</span></span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :       ADDRESSES_PROVIDER.getPoolConfigurator() == msg.sender,</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :       Errors.CALLER_NOT_POOL_CONFIGURATOR</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :     );</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :   }</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             : </span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        2000 :   function _onlyPoolAdmin() internal view virtual {</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">        4000 :     require(</span></span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :       IACLManager(ADDRESSES_PROVIDER.getACLManager()).isPoolAdmin(msg.sender),</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :       Errors.CALLER_NOT_POOL_ADMIN</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :     );</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :   }</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             : </span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          26 :   function _onlyBridge() internal view virtual {</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">          52 :     require(</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :             :       IACLManager(ADDRESSES_PROVIDER.getACLManager()).isBridge(msg.sender),</span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :       Errors.CALLER_NOT_BRIDGE</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             :     );</span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
-<span id="L88"><span class="lineNum">      88</span>                 :             : </span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :   /**</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :    * @dev Constructor.</span>
-<span id="L91"><span class="lineNum">      91</span>                 :             :    * @param provider The address of the PoolAddressesProvider contract</span>
-<span id="L92"><span class="lineNum">      92</span>                 :             :    */</span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :   constructor(IPoolAddressesProvider provider) {</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             :     ADDRESSES_PROVIDER = provider;</span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :   }</span>
-<span id="L96"><span class="lineNum">      96</span>                 :             : </span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :   /**</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :    * @notice Initializes the Pool.</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :    * @dev Function is invoked by the proxy contract when the Pool contract is added to the</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :    * PoolAddressesProvider of the market.</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :    * @dev Caching the address of the PoolAddressesProvider in order to reduce gas consumption on subsequent operations</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :    */</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :   function initialize(IPoolAddressesProvider provider) external virtual;</span>
-<span id="L105"><span class="lineNum">     105</span>                 :             : </span>
-<span id="L106"><span class="lineNum">     106</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">          17 :   function mintUnbacked(</span></span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :     address asset,</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             :     uint256 amount,</span>
-<span id="L110"><span class="lineNum">     110</span>                 :             :     address onBehalfOf,</span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :     uint16 referralCode</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :   ) external virtual override onlyBridge {</span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">          32 :     BridgeLogic.executeMintUnbacked(</span></span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :       _reserves,</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :       _reservesList,</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :       asset,</span>
-<span id="L118"><span class="lineNum">     118</span>                 :             :       amount,</span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :       onBehalfOf,</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :       referralCode</span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :     );</span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             : </span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           9 :   function backUnbacked(</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :     address asset,</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :     uint256 amount,</span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :     uint256 fee</span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :   ) external virtual override onlyBridge returns (uint256) {</span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">          18 :     return</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">          18 :       BridgeLogic.executeBackUnbacked(_reserves[asset], asset, amount, fee, _bridgeProtocolFee);</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :   }</span>
-<span id="L133"><span class="lineNum">     133</span>                 :             : </span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">        9558 :   function supply(</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :     address asset,</span>
-<span id="L137"><span class="lineNum">     137</span>                 :             :     uint256 amount,</span>
-<span id="L138"><span class="lineNum">     138</span>                 :             :     address onBehalfOf,</span>
-<span id="L139"><span class="lineNum">     139</span>                 :             :     uint16 referralCode</span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   ) public virtual override {</span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">       19130 :     SupplyLogic.executeSupply(</span></span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :       _reserves,</span>
-<span id="L143"><span class="lineNum">     143</span>                 :             :       _reservesList,</span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :         asset: asset,</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :         amount: amount,</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :         onBehalfOf: onBehalfOf,</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :         referralCode: referralCode</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :       })</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :     );</span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :   }</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             : </span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">        3000 :   function supplyWithPermit(</span></span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :     address asset,</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :     uint256 amount,</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :     address onBehalfOf,</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :     uint16 referralCode,</span>
-<span id="L160"><span class="lineNum">     160</span>                 :             :     uint256 deadline,</span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :     uint8 permitV,</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :     bytes32 permitR,</span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :     bytes32 permitS</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :   ) public virtual override {</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :     try</span>
-<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">        8000 :       IERC20WithPermit(asset).permit(</span></span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :         msg.sender,</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :         address(this),</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :         amount,</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :         deadline,</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :         permitV,</span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :         permitR,</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :         permitS</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :       )</span>
-<span id="L175"><span class="lineNum">     175</span>                 :             :     {} catch {}</span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">        8000 :     SupplyLogic.executeSupply(</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :       _reserves,</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             :       _reservesList,</span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :         asset: asset,</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :         amount: amount,</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :         onBehalfOf: onBehalfOf,</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :         referralCode: referralCode</span>
-<span id="L185"><span class="lineNum">     185</span>                 :             :       })</span>
-<span id="L186"><span class="lineNum">     186</span>                 :             :     );</span>
-<span id="L187"><span class="lineNum">     187</span>                 :             :   }</span>
-<span id="L188"><span class="lineNum">     188</span>                 :             : </span>
-<span id="L189"><span class="lineNum">     189</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">          43 :   function withdraw(</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :             :     address asset,</span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :     uint256 amount,</span>
-<span id="L193"><span class="lineNum">     193</span>                 :             :     address to</span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :   ) public virtual override returns (uint256) {</span>
-<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">          90 :     return</span></span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">          90 :       SupplyLogic.executeWithdraw(</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :         _reserves,</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :         _reservesList,</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :         _eModeCategories,</span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :         _usersConfig[msg.sender],</span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :         DataTypes.ExecuteWithdrawParams({</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :           asset: asset,</span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :           amount: amount,</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :           to: to,</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :           reservesCount: _reservesCount,</span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :           oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L207"><span class="lineNum">     207</span>                 :             :           userEModeCategory: _usersEModeCategory[msg.sender]</span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :         })</span>
-<span id="L209"><span class="lineNum">     209</span>                 :             :       );</span>
-<span id="L210"><span class="lineNum">     210</span>                 :             :   }</span>
-<span id="L211"><span class="lineNum">     211</span>                 :             : </span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">        9113 :   function borrow(</span></span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :     address asset,</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :     uint256 amount,</span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :     uint256 interestRateMode,</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             :     uint16 referralCode,</span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :     address onBehalfOf</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             :   ) public virtual override {</span>
-<span id="L220"><span class="lineNum">     220</span>                 :<span class="tlaGNC">       18232 :     BorrowLogic.executeBorrow(</span></span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :       _reserves,</span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :       _reservesList,</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :       _eModeCategories,</span>
-<span id="L224"><span class="lineNum">     224</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :       DataTypes.ExecuteBorrowParams({</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :         asset: asset,</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             :         user: msg.sender,</span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :         onBehalfOf: onBehalfOf,</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :         amount: amount,</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :         interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :         referralCode: referralCode,</span>
-<span id="L232"><span class="lineNum">     232</span>                 :             :         releaseUnderlying: true,</span>
-<span id="L233"><span class="lineNum">     233</span>                 :             :         maxStableRateBorrowSizePercent: _maxStableRateBorrowSizePercent,</span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :         reservesCount: _reservesCount,</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L236"><span class="lineNum">     236</span>                 :             :         userEModeCategory: _usersEModeCategory[onBehalfOf],</span>
-<span id="L237"><span class="lineNum">     237</span>                 :             :         priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel()</span>
-<span id="L238"><span class="lineNum">     238</span>                 :             :       })</span>
-<span id="L239"><span class="lineNum">     239</span>                 :             :     );</span>
-<span id="L240"><span class="lineNum">     240</span>                 :             :   }</span>
-<span id="L241"><span class="lineNum">     241</span>                 :             : </span>
-<span id="L242"><span class="lineNum">     242</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">          22 :   function repay(</span></span>
-<span id="L244"><span class="lineNum">     244</span>                 :             :     address asset,</span>
-<span id="L245"><span class="lineNum">     245</span>                 :             :     uint256 amount,</span>
-<span id="L246"><span class="lineNum">     246</span>                 :             :     uint256 interestRateMode,</span>
-<span id="L247"><span class="lineNum">     247</span>                 :             :     address onBehalfOf</span>
-<span id="L248"><span class="lineNum">     248</span>                 :             :   ) public virtual override returns (uint256) {</span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">          46 :     return</span></span>
-<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">          46 :       BorrowLogic.executeRepay(</span></span>
-<span id="L251"><span class="lineNum">     251</span>                 :             :         _reserves,</span>
-<span id="L252"><span class="lineNum">     252</span>                 :             :         _reservesList,</span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :         _usersConfig[onBehalfOf],</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             :         DataTypes.ExecuteRepayParams({</span>
-<span id="L255"><span class="lineNum">     255</span>                 :             :           asset: asset,</span>
-<span id="L256"><span class="lineNum">     256</span>                 :             :           amount: amount,</span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :           interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :           onBehalfOf: onBehalfOf,</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :           useATokens: false</span>
-<span id="L260"><span class="lineNum">     260</span>                 :             :         })</span>
-<span id="L261"><span class="lineNum">     261</span>                 :             :       );</span>
-<span id="L262"><span class="lineNum">     262</span>                 :             :   }</span>
-<span id="L263"><span class="lineNum">     263</span>                 :             : </span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L265"><span class="lineNum">     265</span>                 :<span class="tlaGNC">        3000 :   function repayWithPermit(</span></span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :     address asset,</span>
-<span id="L267"><span class="lineNum">     267</span>                 :             :     uint256 amount,</span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :     uint256 interestRateMode,</span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :     address onBehalfOf,</span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :     uint256 deadline,</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :     uint8 permitV,</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :     bytes32 permitR,</span>
-<span id="L273"><span class="lineNum">     273</span>                 :             :     bytes32 permitS</span>
-<span id="L274"><span class="lineNum">     274</span>                 :             :   ) public virtual override returns (uint256) {</span>
-<span id="L275"><span class="lineNum">     275</span>                 :             :     try</span>
-<span id="L276"><span class="lineNum">     276</span>                 :<span class="tlaGNC">        8000 :       IERC20WithPermit(asset).permit(</span></span>
-<span id="L277"><span class="lineNum">     277</span>                 :             :         msg.sender,</span>
-<span id="L278"><span class="lineNum">     278</span>                 :             :         address(this),</span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :         amount,</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             :         deadline,</span>
-<span id="L281"><span class="lineNum">     281</span>                 :             :         permitV,</span>
-<span id="L282"><span class="lineNum">     282</span>                 :             :         permitR,</span>
-<span id="L283"><span class="lineNum">     283</span>                 :             :         permitS</span>
-<span id="L284"><span class="lineNum">     284</span>                 :             :       )</span>
-<span id="L285"><span class="lineNum">     285</span>                 :             :     {} catch {}</span>
-<span id="L286"><span class="lineNum">     286</span>                 :             : </span>
-<span id="L287"><span class="lineNum">     287</span>                 :             :     {</span>
-<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">       12000 :       DataTypes.ExecuteRepayParams memory params = DataTypes.ExecuteRepayParams({</span></span>
-<span id="L289"><span class="lineNum">     289</span>                 :             :         asset: asset,</span>
-<span id="L290"><span class="lineNum">     290</span>                 :             :         amount: amount,</span>
-<span id="L291"><span class="lineNum">     291</span>                 :             :         interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
-<span id="L292"><span class="lineNum">     292</span>                 :             :         onBehalfOf: onBehalfOf,</span>
-<span id="L293"><span class="lineNum">     293</span>                 :             :         useATokens: false</span>
-<span id="L294"><span class="lineNum">     294</span>                 :             :       });</span>
-<span id="L295"><span class="lineNum">     295</span>                 :<span class="tlaGNC">       12000 :       return BorrowLogic.executeRepay(_reserves, _reservesList, _usersConfig[onBehalfOf], params);</span></span>
-<span id="L296"><span class="lineNum">     296</span>                 :             :     }</span>
-<span id="L297"><span class="lineNum">     297</span>                 :             :   }</span>
-<span id="L298"><span class="lineNum">     298</span>                 :             : </span>
-<span id="L299"><span class="lineNum">     299</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L300"><span class="lineNum">     300</span>                 :<span class="tlaGNC">        1005 :   function repayWithATokens(</span></span>
-<span id="L301"><span class="lineNum">     301</span>                 :             :     address asset,</span>
-<span id="L302"><span class="lineNum">     302</span>                 :             :     uint256 amount,</span>
-<span id="L303"><span class="lineNum">     303</span>                 :             :     uint256 interestRateMode</span>
-<span id="L304"><span class="lineNum">     304</span>                 :             :   ) public virtual override returns (uint256) {</span>
-<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">        2012 :     return</span></span>
-<span id="L306"><span class="lineNum">     306</span>                 :<span class="tlaGNC">        2012 :       BorrowLogic.executeRepay(</span></span>
-<span id="L307"><span class="lineNum">     307</span>                 :             :         _reserves,</span>
-<span id="L308"><span class="lineNum">     308</span>                 :             :         _reservesList,</span>
-<span id="L309"><span class="lineNum">     309</span>                 :             :         _usersConfig[msg.sender],</span>
-<span id="L310"><span class="lineNum">     310</span>                 :             :         DataTypes.ExecuteRepayParams({</span>
-<span id="L311"><span class="lineNum">     311</span>                 :             :           asset: asset,</span>
-<span id="L312"><span class="lineNum">     312</span>                 :             :           amount: amount,</span>
-<span id="L313"><span class="lineNum">     313</span>                 :             :           interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :           onBehalfOf: msg.sender,</span>
-<span id="L315"><span class="lineNum">     315</span>                 :             :           useATokens: true</span>
-<span id="L316"><span class="lineNum">     316</span>                 :             :         })</span>
-<span id="L317"><span class="lineNum">     317</span>                 :             :       );</span>
-<span id="L318"><span class="lineNum">     318</span>                 :             :   }</span>
-<span id="L319"><span class="lineNum">     319</span>                 :             : </span>
-<span id="L320"><span class="lineNum">     320</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">           7 :   function swapBorrowRateMode(address asset, uint256 interestRateMode) public virtual override {</span></span>
-<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">          16 :     BorrowLogic.executeSwapBorrowRateMode(</span></span>
-<span id="L323"><span class="lineNum">     323</span>                 :             :       _reserves[asset],</span>
-<span id="L324"><span class="lineNum">     324</span>                 :             :       _usersConfig[msg.sender],</span>
-<span id="L325"><span class="lineNum">     325</span>                 :             :       asset,</span>
-<span id="L326"><span class="lineNum">     326</span>                 :             :       msg.sender,</span>
-<span id="L327"><span class="lineNum">     327</span>                 :             :       DataTypes.InterestRateMode(interestRateMode)</span>
-<span id="L328"><span class="lineNum">     328</span>                 :             :     );</span>
-<span id="L329"><span class="lineNum">     329</span>                 :             :   }</span>
-<span id="L330"><span class="lineNum">     330</span>                 :             : </span>
-<span id="L331"><span class="lineNum">     331</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L332"><span class="lineNum">     332</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function swapToVariable(address asset, address user) public virtual override {</span></span>
-<span id="L333"><span class="lineNum">     333</span>                 :<span class="tlaUNC">           0 :     BorrowLogic.executeSwapBorrowRateMode(</span></span>
-<span id="L334"><span class="lineNum">     334</span>                 :             :       _reserves[asset],</span>
-<span id="L335"><span class="lineNum">     335</span>                 :             :       _usersConfig[user],</span>
-<span id="L336"><span class="lineNum">     336</span>                 :             :       asset,</span>
-<span id="L337"><span class="lineNum">     337</span>                 :             :       user,</span>
-<span id="L338"><span class="lineNum">     338</span>                 :             :       DataTypes.InterestRateMode.STABLE</span>
-<span id="L339"><span class="lineNum">     339</span>                 :             :     );</span>
-<span id="L340"><span class="lineNum">     340</span>                 :             :   }</span>
-<span id="L341"><span class="lineNum">     341</span>                 :             : </span>
-<span id="L342"><span class="lineNum">     342</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC tlaBgGNC">           4 :   function rebalanceStableBorrowRate(address asset, address user) public virtual override {</span></span>
-<span id="L344"><span class="lineNum">     344</span>                 :<span class="tlaGNC">          10 :     BorrowLogic.executeRebalanceStableBorrowRate(_reserves[asset], asset, user);</span></span>
-<span id="L345"><span class="lineNum">     345</span>                 :             :   }</span>
-<span id="L346"><span class="lineNum">     346</span>                 :             : </span>
-<span id="L347"><span class="lineNum">     347</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L348"><span class="lineNum">     348</span>                 :<span class="tlaGNC">          42 :   function setUserUseReserveAsCollateral(</span></span>
-<span id="L349"><span class="lineNum">     349</span>                 :             :     address asset,</span>
-<span id="L350"><span class="lineNum">     350</span>                 :             :     bool useAsCollateral</span>
-<span id="L351"><span class="lineNum">     351</span>                 :             :   ) public virtual override {</span>
-<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">          86 :     SupplyLogic.executeUseReserveAsCollateral(</span></span>
-<span id="L353"><span class="lineNum">     353</span>                 :             :       _reserves,</span>
-<span id="L354"><span class="lineNum">     354</span>                 :             :       _reservesList,</span>
-<span id="L355"><span class="lineNum">     355</span>                 :             :       _eModeCategories,</span>
-<span id="L356"><span class="lineNum">     356</span>                 :             :       _usersConfig[msg.sender],</span>
-<span id="L357"><span class="lineNum">     357</span>                 :             :       asset,</span>
-<span id="L358"><span class="lineNum">     358</span>                 :             :       useAsCollateral,</span>
-<span id="L359"><span class="lineNum">     359</span>                 :             :       _reservesCount,</span>
-<span id="L360"><span class="lineNum">     360</span>                 :             :       ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L361"><span class="lineNum">     361</span>                 :             :       _usersEModeCategory[msg.sender]</span>
-<span id="L362"><span class="lineNum">     362</span>                 :             :     );</span>
-<span id="L363"><span class="lineNum">     363</span>                 :             :   }</span>
-<span id="L364"><span class="lineNum">     364</span>                 :             : </span>
-<span id="L365"><span class="lineNum">     365</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L366"><span class="lineNum">     366</span>                 :<span class="tlaGNC">       11291 :   function liquidationCall(</span></span>
-<span id="L367"><span class="lineNum">     367</span>                 :             :     address collateralAsset,</span>
-<span id="L368"><span class="lineNum">     368</span>                 :             :     address debtAsset,</span>
-<span id="L369"><span class="lineNum">     369</span>                 :             :     address user,</span>
-<span id="L370"><span class="lineNum">     370</span>                 :             :     uint256 debtToCover,</span>
-<span id="L371"><span class="lineNum">     371</span>                 :             :     bool receiveAToken</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :  *   # Enable/disable their supplied assets as collateral</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :  *   # Liquidate positions</span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :  *   # Execute Flash Loans</span>
+<span id="L34"><span class="lineNum">      34</span>                 :             :  * @dev To be covered by a proxy contract, owned by the PoolAddressesProvider of the specific market</span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :  * @dev All admin functions are callable by the PoolConfigurator contract defined also in the</span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :  *   PoolAddressesProvider</span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :  */</span>
+<span id="L38"><span class="lineNum">      38</span>                 :             : abstract contract Pool is VersionedInitializable, PoolStorage, IPool {</span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   using ReserveLogic for DataTypes.ReserveData;</span>
+<span id="L40"><span class="lineNum">      40</span>                 :             : </span>
+<span id="L41"><span class="lineNum">      41</span>                 :             :   IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;</span>
+<span id="L42"><span class="lineNum">      42</span>                 :             : </span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :   /**</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :    * @dev Only pool configurator can call functions marked by this modifier.</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :    */</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   modifier onlyPoolConfigurator() {</span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC tlaBgGNC">        6046 :     _onlyPoolConfigurator();</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :     _;</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             : </span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :   /**</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :    * @dev Only pool admin can call functions marked by this modifier.</span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :    */</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   modifier onlyPoolAdmin() {</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">        2000 :     _onlyPoolAdmin();</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :     _;</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             : </span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :   /**</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :    * @dev Only bridge can call functions marked by this modifier.</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :    */</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :   modifier onlyBridge() {</span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">          17 :     _onlyBridge();</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :     _;</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             : </span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   function _onlyPoolConfigurator() internal view virtual {</span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">      447472 :     require(</span></span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :       ADDRESSES_PROVIDER.getPoolConfigurator() == msg.sender,</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :       Errors.CALLER_NOT_POOL_CONFIGURATOR</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :     );</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
+<span id="L73"><span class="lineNum">      73</span>                 :             : </span>
+<span id="L74"><span class="lineNum">      74</span>                 :             :   function _onlyPoolAdmin() internal view virtual {</span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        2000 :     require(</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :       IACLManager(ADDRESSES_PROVIDER.getACLManager()).isPoolAdmin(msg.sender),</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :       Errors.CALLER_NOT_POOL_ADMIN</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             :     );</span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :   }</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             : </span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :   function _onlyBridge() internal view virtual {</span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          26 :     require(</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :             :       IACLManager(ADDRESSES_PROVIDER.getACLManager()).isBridge(msg.sender),</span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :       Errors.CALLER_NOT_BRIDGE</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :     );</span>
+<span id="L86"><span class="lineNum">      86</span>                 :             :   }</span>
+<span id="L87"><span class="lineNum">      87</span>                 :             : </span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   /**</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :    * @dev Constructor.</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :    * @param provider The address of the PoolAddressesProvider contract</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :    */</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   constructor(IPoolAddressesProvider provider) {</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">          44 :     ADDRESSES_PROVIDER = provider;</span></span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :   }</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             : </span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   /**</span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :    * @notice Initializes the Pool.</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             :    * @dev Function is invoked by the proxy contract when the Pool contract is added to the</span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :    * PoolAddressesProvider of the market.</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :    * @dev Caching the address of the PoolAddressesProvider in order to reduce gas consumption on subsequent operations</span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :    * @param provider The address of the PoolAddressesProvider</span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :    */</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :   function initialize(IPoolAddressesProvider provider) external virtual;</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   function mintUnbacked(</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :     address asset,</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :     uint256 amount,</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :     address onBehalfOf,</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :     uint16 referralCode</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :   ) external virtual override onlyBridge {</span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">          16 :     BridgeLogic.executeMintUnbacked(</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :       _reserves,</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :       _reservesList,</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :       asset,</span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :       amount,</span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :       onBehalfOf,</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             :       referralCode</span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :     );</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   }</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             : </span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :   function backUnbacked(</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :     address asset,</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     uint256 amount,</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :     uint256 fee</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :   ) external virtual override onlyBridge returns (uint256) {</span>
+<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">           9 :     return</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">           9 :       BridgeLogic.executeBackUnbacked(_reserves[asset], asset, amount, fee, _bridgeProtocolFee);</span></span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :   }</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             : </span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             :   function supply(</span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :     address asset,</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :     uint256 amount,</span>
+<span id="L137"><span class="lineNum">     137</span>                 :             :     address onBehalfOf,</span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :     uint16 referralCode</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :   ) public virtual override {</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">       20490 :     SupplyLogic.executeSupply(</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :       _reserves,</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :       _reservesList,</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :         asset: asset,</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :         amount: amount,</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :         onBehalfOf: onBehalfOf,</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :         referralCode: referralCode</span>
+<span id="L149"><span class="lineNum">     149</span>                 :             :       })</span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :     );</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :   }</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             : </span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :   function supplyWithPermit(</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :     address asset,</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :     uint256 amount,</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :     address onBehalfOf,</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :     uint16 referralCode,</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :     uint256 deadline,</span>
+<span id="L160"><span class="lineNum">     160</span>                 :             :     uint8 permitV,</span>
+<span id="L161"><span class="lineNum">     161</span>                 :             :     bytes32 permitR,</span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :     bytes32 permitS</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :   ) public virtual override {</span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :     try</span>
+<span id="L165"><span class="lineNum">     165</span>                 :<span class="tlaGNC">        4000 :       IERC20WithPermit(asset).permit(</span></span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :         msg.sender,</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :         address(this),</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :         amount,</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :         deadline,</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :         permitV,</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :         permitR,</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :         permitS</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :       )</span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     {} catch {}</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC tlaBgGNC">        4000 :     SupplyLogic.executeSupply(</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :       _reserves,</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :       _reservesList,</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :         asset: asset,</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :         amount: amount,</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :         onBehalfOf: onBehalfOf,</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :         referralCode: referralCode</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :       })</span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :     );</span>
+<span id="L186"><span class="lineNum">     186</span>                 :             :   }</span>
+<span id="L187"><span class="lineNum">     187</span>                 :             : </span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L189"><span class="lineNum">     189</span>                 :             :   function withdraw(</span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :     address asset,</span>
+<span id="L191"><span class="lineNum">     191</span>                 :             :     uint256 amount,</span>
+<span id="L192"><span class="lineNum">     192</span>                 :             :     address to</span>
+<span id="L193"><span class="lineNum">     193</span>                 :             :   ) public virtual override returns (uint256) {</span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">        2045 :     return</span></span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">        2045 :       SupplyLogic.executeWithdraw(</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :         _reserves,</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :         _reservesList,</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :         _eModeCategories,</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :         _usersConfig[msg.sender],</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :         DataTypes.ExecuteWithdrawParams({</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :           asset: asset,</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :           amount: amount,</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :           to: to,</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :           reservesCount: _reservesCount,</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :           oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :           userEModeCategory: _usersEModeCategory[msg.sender]</span>
+<span id="L207"><span class="lineNum">     207</span>                 :             :         })</span>
+<span id="L208"><span class="lineNum">     208</span>                 :             :       );</span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :   }</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             : </span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :   function borrow(</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :     address asset,</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :     uint256 amount,</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :     uint256 interestRateMode,</span>
+<span id="L216"><span class="lineNum">     216</span>                 :             :     uint16 referralCode,</span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :     address onBehalfOf</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :   ) public virtual override {</span>
+<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">       16108 :     BorrowLogic.executeBorrow(</span></span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :       _reserves,</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :       _reservesList,</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :       _eModeCategories,</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :       DataTypes.ExecuteBorrowParams({</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :         asset: asset,</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :         user: msg.sender,</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :         onBehalfOf: onBehalfOf,</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :         amount: amount,</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :         interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :         referralCode: referralCode,</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :         releaseUnderlying: true,</span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :         reservesCount: _reservesCount,</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :         userEModeCategory: _usersEModeCategory[onBehalfOf],</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :         priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel()</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :       })</span>
+<span id="L237"><span class="lineNum">     237</span>                 :             :     );</span>
+<span id="L238"><span class="lineNum">     238</span>                 :             :   }</span>
+<span id="L239"><span class="lineNum">     239</span>                 :             : </span>
+<span id="L240"><span class="lineNum">     240</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :   function repay(</span>
+<span id="L242"><span class="lineNum">     242</span>                 :             :     address asset,</span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :     uint256 amount,</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :     uint256 interestRateMode,</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :     address onBehalfOf</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             :   ) public virtual override returns (uint256) {</span>
+<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">          24 :     return</span></span>
+<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">          24 :       BorrowLogic.executeRepay(</span></span>
+<span id="L249"><span class="lineNum">     249</span>                 :             :         _reserves,</span>
+<span id="L250"><span class="lineNum">     250</span>                 :             :         _reservesList,</span>
+<span id="L251"><span class="lineNum">     251</span>                 :             :         _usersConfig[onBehalfOf],</span>
+<span id="L252"><span class="lineNum">     252</span>                 :             :         DataTypes.ExecuteRepayParams({</span>
+<span id="L253"><span class="lineNum">     253</span>                 :             :           asset: asset,</span>
+<span id="L254"><span class="lineNum">     254</span>                 :             :           amount: amount,</span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :           interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
+<span id="L256"><span class="lineNum">     256</span>                 :             :           onBehalfOf: onBehalfOf,</span>
+<span id="L257"><span class="lineNum">     257</span>                 :             :           useATokens: false</span>
+<span id="L258"><span class="lineNum">     258</span>                 :             :         })</span>
+<span id="L259"><span class="lineNum">     259</span>                 :             :       );</span>
+<span id="L260"><span class="lineNum">     260</span>                 :             :   }</span>
+<span id="L261"><span class="lineNum">     261</span>                 :             : </span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L263"><span class="lineNum">     263</span>                 :             :   function repayWithPermit(</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :     address asset,</span>
+<span id="L265"><span class="lineNum">     265</span>                 :             :     uint256 amount,</span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :     uint256 interestRateMode,</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             :     address onBehalfOf,</span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :     uint256 deadline,</span>
+<span id="L269"><span class="lineNum">     269</span>                 :             :     uint8 permitV,</span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :     bytes32 permitR,</span>
+<span id="L271"><span class="lineNum">     271</span>                 :             :     bytes32 permitS</span>
+<span id="L272"><span class="lineNum">     272</span>                 :             :   ) public virtual override returns (uint256) {</span>
+<span id="L273"><span class="lineNum">     273</span>                 :             :     try</span>
+<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">        4000 :       IERC20WithPermit(asset).permit(</span></span>
+<span id="L275"><span class="lineNum">     275</span>                 :             :         msg.sender,</span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :         address(this),</span>
+<span id="L277"><span class="lineNum">     277</span>                 :             :         amount,</span>
+<span id="L278"><span class="lineNum">     278</span>                 :             :         deadline,</span>
+<span id="L279"><span class="lineNum">     279</span>                 :             :         permitV,</span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :         permitR,</span>
+<span id="L281"><span class="lineNum">     281</span>                 :             :         permitS</span>
+<span id="L282"><span class="lineNum">     282</span>                 :             :       )</span>
+<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     {} catch {}</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :             : </span>
+<span id="L285"><span class="lineNum">     285</span>                 :             :     {</span>
+<span id="L286"><span class="lineNum">     286</span>                 :<span class="tlaGNC tlaBgGNC">        4000 :       DataTypes.ExecuteRepayParams memory params = DataTypes.ExecuteRepayParams({</span></span>
+<span id="L287"><span class="lineNum">     287</span>                 :             :         asset: asset,</span>
+<span id="L288"><span class="lineNum">     288</span>                 :             :         amount: amount,</span>
+<span id="L289"><span class="lineNum">     289</span>                 :             :         interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
+<span id="L290"><span class="lineNum">     290</span>                 :             :         onBehalfOf: onBehalfOf,</span>
+<span id="L291"><span class="lineNum">     291</span>                 :             :         useATokens: false</span>
+<span id="L292"><span class="lineNum">     292</span>                 :             :       });</span>
+<span id="L293"><span class="lineNum">     293</span>                 :<span class="tlaGNC">        4000 :       return BorrowLogic.executeRepay(_reserves, _reservesList, _usersConfig[onBehalfOf], params);</span></span>
+<span id="L294"><span class="lineNum">     294</span>                 :             :     }</span>
+<span id="L295"><span class="lineNum">     295</span>                 :             :   }</span>
+<span id="L296"><span class="lineNum">     296</span>                 :             : </span>
+<span id="L297"><span class="lineNum">     297</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L298"><span class="lineNum">     298</span>                 :             :   function repayWithATokens(</span>
+<span id="L299"><span class="lineNum">     299</span>                 :             :     address asset,</span>
+<span id="L300"><span class="lineNum">     300</span>                 :             :     uint256 amount,</span>
+<span id="L301"><span class="lineNum">     301</span>                 :             :     uint256 interestRateMode</span>
+<span id="L302"><span class="lineNum">     302</span>                 :             :   ) public virtual override returns (uint256) {</span>
+<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">        1006 :     return</span></span>
+<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">        1006 :       BorrowLogic.executeRepay(</span></span>
+<span id="L305"><span class="lineNum">     305</span>                 :             :         _reserves,</span>
+<span id="L306"><span class="lineNum">     306</span>                 :             :         _reservesList,</span>
+<span id="L307"><span class="lineNum">     307</span>                 :             :         _usersConfig[msg.sender],</span>
+<span id="L308"><span class="lineNum">     308</span>                 :             :         DataTypes.ExecuteRepayParams({</span>
+<span id="L309"><span class="lineNum">     309</span>                 :             :           asset: asset,</span>
+<span id="L310"><span class="lineNum">     310</span>                 :             :           amount: amount,</span>
+<span id="L311"><span class="lineNum">     311</span>                 :             :           interestRateMode: DataTypes.InterestRateMode(interestRateMode),</span>
+<span id="L312"><span class="lineNum">     312</span>                 :             :           onBehalfOf: msg.sender,</span>
+<span id="L313"><span class="lineNum">     313</span>                 :             :           useATokens: true</span>
+<span id="L314"><span class="lineNum">     314</span>                 :             :         })</span>
+<span id="L315"><span class="lineNum">     315</span>                 :             :       );</span>
+<span id="L316"><span class="lineNum">     316</span>                 :             :   }</span>
+<span id="L317"><span class="lineNum">     317</span>                 :             : </span>
+<span id="L318"><span class="lineNum">     318</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L319"><span class="lineNum">     319</span>                 :             :   function setUserUseReserveAsCollateral(</span>
+<span id="L320"><span class="lineNum">     320</span>                 :             :     address asset,</span>
+<span id="L321"><span class="lineNum">     321</span>                 :             :     bool useAsCollateral</span>
+<span id="L322"><span class="lineNum">     322</span>                 :             :   ) public virtual override {</span>
+<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">          43 :     SupplyLogic.executeUseReserveAsCollateral(</span></span>
+<span id="L324"><span class="lineNum">     324</span>                 :             :       _reserves,</span>
+<span id="L325"><span class="lineNum">     325</span>                 :             :       _reservesList,</span>
+<span id="L326"><span class="lineNum">     326</span>                 :             :       _eModeCategories,</span>
+<span id="L327"><span class="lineNum">     327</span>                 :             :       _usersConfig[msg.sender],</span>
+<span id="L328"><span class="lineNum">     328</span>                 :             :       asset,</span>
+<span id="L329"><span class="lineNum">     329</span>                 :             :       useAsCollateral,</span>
+<span id="L330"><span class="lineNum">     330</span>                 :             :       _reservesCount,</span>
+<span id="L331"><span class="lineNum">     331</span>                 :             :       ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L332"><span class="lineNum">     332</span>                 :             :       _usersEModeCategory[msg.sender]</span>
+<span id="L333"><span class="lineNum">     333</span>                 :             :     );</span>
+<span id="L334"><span class="lineNum">     334</span>                 :             :   }</span>
+<span id="L335"><span class="lineNum">     335</span>                 :             : </span>
+<span id="L336"><span class="lineNum">     336</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L337"><span class="lineNum">     337</span>                 :             :   function liquidationCall(</span>
+<span id="L338"><span class="lineNum">     338</span>                 :             :     address collateralAsset,</span>
+<span id="L339"><span class="lineNum">     339</span>                 :             :     address debtAsset,</span>
+<span id="L340"><span class="lineNum">     340</span>                 :             :     address user,</span>
+<span id="L341"><span class="lineNum">     341</span>                 :             :     uint256 debtToCover,</span>
+<span id="L342"><span class="lineNum">     342</span>                 :             :     bool receiveAToken</span>
+<span id="L343"><span class="lineNum">     343</span>                 :             :   ) public virtual override {</span>
+<span id="L344"><span class="lineNum">     344</span>                 :<span class="tlaGNC">       14501 :     LiquidationLogic.executeLiquidationCall(</span></span>
+<span id="L345"><span class="lineNum">     345</span>                 :             :       _reserves,</span>
+<span id="L346"><span class="lineNum">     346</span>                 :             :       _reservesList,</span>
+<span id="L347"><span class="lineNum">     347</span>                 :             :       _usersConfig,</span>
+<span id="L348"><span class="lineNum">     348</span>                 :             :       _eModeCategories,</span>
+<span id="L349"><span class="lineNum">     349</span>                 :             :       DataTypes.ExecuteLiquidationCallParams({</span>
+<span id="L350"><span class="lineNum">     350</span>                 :             :         reservesCount: _reservesCount,</span>
+<span id="L351"><span class="lineNum">     351</span>                 :             :         debtToCover: debtToCover,</span>
+<span id="L352"><span class="lineNum">     352</span>                 :             :         collateralAsset: collateralAsset,</span>
+<span id="L353"><span class="lineNum">     353</span>                 :             :         debtAsset: debtAsset,</span>
+<span id="L354"><span class="lineNum">     354</span>                 :             :         user: user,</span>
+<span id="L355"><span class="lineNum">     355</span>                 :             :         receiveAToken: receiveAToken,</span>
+<span id="L356"><span class="lineNum">     356</span>                 :             :         priceOracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L357"><span class="lineNum">     357</span>                 :             :         userEModeCategory: _usersEModeCategory[user],</span>
+<span id="L358"><span class="lineNum">     358</span>                 :             :         priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel()</span>
+<span id="L359"><span class="lineNum">     359</span>                 :             :       })</span>
+<span id="L360"><span class="lineNum">     360</span>                 :             :     );</span>
+<span id="L361"><span class="lineNum">     361</span>                 :             :   }</span>
+<span id="L362"><span class="lineNum">     362</span>                 :             : </span>
+<span id="L363"><span class="lineNum">     363</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L364"><span class="lineNum">     364</span>                 :             :   function flashLoan(</span>
+<span id="L365"><span class="lineNum">     365</span>                 :             :     address receiverAddress,</span>
+<span id="L366"><span class="lineNum">     366</span>                 :             :     address[] calldata assets,</span>
+<span id="L367"><span class="lineNum">     367</span>                 :             :     uint256[] calldata amounts,</span>
+<span id="L368"><span class="lineNum">     368</span>                 :             :     uint256[] calldata interestRateModes,</span>
+<span id="L369"><span class="lineNum">     369</span>                 :             :     address onBehalfOf,</span>
+<span id="L370"><span class="lineNum">     370</span>                 :             :     bytes calldata params,</span>
+<span id="L371"><span class="lineNum">     371</span>                 :             :     uint16 referralCode</span>
 <span id="L372"><span class="lineNum">     372</span>                 :             :   ) public virtual override {</span>
-<span id="L373"><span class="lineNum">     373</span>                 :<span class="tlaGNC">       22584 :     LiquidationLogic.executeLiquidationCall(</span></span>
-<span id="L374"><span class="lineNum">     374</span>                 :             :       _reserves,</span>
-<span id="L375"><span class="lineNum">     375</span>                 :             :       _reservesList,</span>
-<span id="L376"><span class="lineNum">     376</span>                 :             :       _usersConfig,</span>
-<span id="L377"><span class="lineNum">     377</span>                 :             :       _eModeCategories,</span>
-<span id="L378"><span class="lineNum">     378</span>                 :             :       DataTypes.ExecuteLiquidationCallParams({</span>
-<span id="L379"><span class="lineNum">     379</span>                 :             :         reservesCount: _reservesCount,</span>
-<span id="L380"><span class="lineNum">     380</span>                 :             :         debtToCover: debtToCover,</span>
-<span id="L381"><span class="lineNum">     381</span>                 :             :         collateralAsset: collateralAsset,</span>
-<span id="L382"><span class="lineNum">     382</span>                 :             :         debtAsset: debtAsset,</span>
-<span id="L383"><span class="lineNum">     383</span>                 :             :         user: user,</span>
-<span id="L384"><span class="lineNum">     384</span>                 :             :         receiveAToken: receiveAToken,</span>
-<span id="L385"><span class="lineNum">     385</span>                 :             :         priceOracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L386"><span class="lineNum">     386</span>                 :             :         userEModeCategory: _usersEModeCategory[user],</span>
-<span id="L387"><span class="lineNum">     387</span>                 :             :         priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel()</span>
-<span id="L388"><span class="lineNum">     388</span>                 :             :       })</span>
-<span id="L389"><span class="lineNum">     389</span>                 :             :     );</span>
-<span id="L390"><span class="lineNum">     390</span>                 :             :   }</span>
+<span id="L373"><span class="lineNum">     373</span>                 :<span class="tlaGNC">        1011 :     DataTypes.FlashloanParams memory flashParams = DataTypes.FlashloanParams({</span></span>
+<span id="L374"><span class="lineNum">     374</span>                 :             :       receiverAddress: receiverAddress,</span>
+<span id="L375"><span class="lineNum">     375</span>                 :             :       assets: assets,</span>
+<span id="L376"><span class="lineNum">     376</span>                 :             :       amounts: amounts,</span>
+<span id="L377"><span class="lineNum">     377</span>                 :             :       interestRateModes: interestRateModes,</span>
+<span id="L378"><span class="lineNum">     378</span>                 :             :       onBehalfOf: onBehalfOf,</span>
+<span id="L379"><span class="lineNum">     379</span>                 :             :       params: params,</span>
+<span id="L380"><span class="lineNum">     380</span>                 :             :       referralCode: referralCode,</span>
+<span id="L381"><span class="lineNum">     381</span>                 :             :       flashLoanPremiumToProtocol: _flashLoanPremiumToProtocol,</span>
+<span id="L382"><span class="lineNum">     382</span>                 :             :       flashLoanPremiumTotal: _flashLoanPremiumTotal,</span>
+<span id="L383"><span class="lineNum">     383</span>                 :             :       reservesCount: _reservesCount,</span>
+<span id="L384"><span class="lineNum">     384</span>                 :             :       addressesProvider: address(ADDRESSES_PROVIDER),</span>
+<span id="L385"><span class="lineNum">     385</span>                 :             :       pool: address(this),</span>
+<span id="L386"><span class="lineNum">     386</span>                 :             :       userEModeCategory: _usersEModeCategory[onBehalfOf],</span>
+<span id="L387"><span class="lineNum">     387</span>                 :             :       isAuthorizedFlashBorrower: IACLManager(ADDRESSES_PROVIDER.getACLManager()).isFlashBorrower(</span>
+<span id="L388"><span class="lineNum">     388</span>                 :             :         msg.sender</span>
+<span id="L389"><span class="lineNum">     389</span>                 :             :       )</span>
+<span id="L390"><span class="lineNum">     390</span>                 :             :     });</span>
 <span id="L391"><span class="lineNum">     391</span>                 :             : </span>
-<span id="L392"><span class="lineNum">     392</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L393"><span class="lineNum">     393</span>                 :<span class="tlaGNC">          10 :   function flashLoan(</span></span>
-<span id="L394"><span class="lineNum">     394</span>                 :             :     address receiverAddress,</span>
-<span id="L395"><span class="lineNum">     395</span>                 :             :     address[] calldata assets,</span>
-<span id="L396"><span class="lineNum">     396</span>                 :             :     uint256[] calldata amounts,</span>
-<span id="L397"><span class="lineNum">     397</span>                 :             :     uint256[] calldata interestRateModes,</span>
-<span id="L398"><span class="lineNum">     398</span>                 :             :     address onBehalfOf,</span>
-<span id="L399"><span class="lineNum">     399</span>                 :             :     bytes calldata params,</span>
-<span id="L400"><span class="lineNum">     400</span>                 :             :     uint16 referralCode</span>
-<span id="L401"><span class="lineNum">     401</span>                 :             :   ) public virtual override {</span>
-<span id="L402"><span class="lineNum">     402</span>                 :<span class="tlaGNC">          30 :     DataTypes.FlashloanParams memory flashParams = DataTypes.FlashloanParams({</span></span>
-<span id="L403"><span class="lineNum">     403</span>                 :             :       receiverAddress: receiverAddress,</span>
-<span id="L404"><span class="lineNum">     404</span>                 :             :       assets: assets,</span>
-<span id="L405"><span class="lineNum">     405</span>                 :             :       amounts: amounts,</span>
-<span id="L406"><span class="lineNum">     406</span>                 :             :       interestRateModes: interestRateModes,</span>
-<span id="L407"><span class="lineNum">     407</span>                 :             :       onBehalfOf: onBehalfOf,</span>
-<span id="L408"><span class="lineNum">     408</span>                 :             :       params: params,</span>
-<span id="L409"><span class="lineNum">     409</span>                 :             :       referralCode: referralCode,</span>
-<span id="L410"><span class="lineNum">     410</span>                 :             :       flashLoanPremiumToProtocol: _flashLoanPremiumToProtocol,</span>
-<span id="L411"><span class="lineNum">     411</span>                 :             :       flashLoanPremiumTotal: _flashLoanPremiumTotal,</span>
-<span id="L412"><span class="lineNum">     412</span>                 :             :       maxStableRateBorrowSizePercent: _maxStableRateBorrowSizePercent,</span>
-<span id="L413"><span class="lineNum">     413</span>                 :             :       reservesCount: _reservesCount,</span>
-<span id="L414"><span class="lineNum">     414</span>                 :             :       addressesProvider: address(ADDRESSES_PROVIDER),</span>
-<span id="L415"><span class="lineNum">     415</span>                 :             :       pool: address(this),</span>
-<span id="L416"><span class="lineNum">     416</span>                 :             :       userEModeCategory: _usersEModeCategory[onBehalfOf],</span>
-<span id="L417"><span class="lineNum">     417</span>                 :             :       isAuthorizedFlashBorrower: IACLManager(ADDRESSES_PROVIDER.getACLManager()).isFlashBorrower(</span>
-<span id="L418"><span class="lineNum">     418</span>                 :             :         msg.sender</span>
-<span id="L419"><span class="lineNum">     419</span>                 :             :       )</span>
-<span id="L420"><span class="lineNum">     420</span>                 :             :     });</span>
-<span id="L421"><span class="lineNum">     421</span>                 :             : </span>
-<span id="L422"><span class="lineNum">     422</span>                 :<span class="tlaGNC">          20 :     FlashLoanLogic.executeFlashLoan(</span></span>
-<span id="L423"><span class="lineNum">     423</span>                 :             :       _reserves,</span>
-<span id="L424"><span class="lineNum">     424</span>                 :             :       _reservesList,</span>
-<span id="L425"><span class="lineNum">     425</span>                 :             :       _eModeCategories,</span>
-<span id="L426"><span class="lineNum">     426</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L427"><span class="lineNum">     427</span>                 :             :       flashParams</span>
-<span id="L428"><span class="lineNum">     428</span>                 :             :     );</span>
-<span id="L429"><span class="lineNum">     429</span>                 :             :   }</span>
-<span id="L430"><span class="lineNum">     430</span>                 :             : </span>
-<span id="L431"><span class="lineNum">     431</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L432"><span class="lineNum">     432</span>                 :<span class="tlaGNC">          10 :   function flashLoanSimple(</span></span>
-<span id="L433"><span class="lineNum">     433</span>                 :             :     address receiverAddress,</span>
-<span id="L434"><span class="lineNum">     434</span>                 :             :     address asset,</span>
-<span id="L435"><span class="lineNum">     435</span>                 :             :     uint256 amount,</span>
-<span id="L436"><span class="lineNum">     436</span>                 :             :     bytes calldata params,</span>
-<span id="L437"><span class="lineNum">     437</span>                 :             :     uint16 referralCode</span>
-<span id="L438"><span class="lineNum">     438</span>                 :             :   ) public virtual override {</span>
-<span id="L439"><span class="lineNum">     439</span>                 :<span class="tlaGNC">          30 :     DataTypes.FlashloanSimpleParams memory flashParams = DataTypes.FlashloanSimpleParams({</span></span>
-<span id="L440"><span class="lineNum">     440</span>                 :             :       receiverAddress: receiverAddress,</span>
-<span id="L441"><span class="lineNum">     441</span>                 :             :       asset: asset,</span>
-<span id="L442"><span class="lineNum">     442</span>                 :             :       amount: amount,</span>
-<span id="L443"><span class="lineNum">     443</span>                 :             :       params: params,</span>
-<span id="L444"><span class="lineNum">     444</span>                 :             :       referralCode: referralCode,</span>
-<span id="L445"><span class="lineNum">     445</span>                 :             :       flashLoanPremiumToProtocol: _flashLoanPremiumToProtocol,</span>
-<span id="L446"><span class="lineNum">     446</span>                 :             :       flashLoanPremiumTotal: _flashLoanPremiumTotal</span>
-<span id="L447"><span class="lineNum">     447</span>                 :             :     });</span>
-<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">          20 :     FlashLoanLogic.executeFlashLoanSimple(_reserves[asset], flashParams);</span></span>
-<span id="L449"><span class="lineNum">     449</span>                 :             :   }</span>
-<span id="L450"><span class="lineNum">     450</span>                 :             : </span>
-<span id="L451"><span class="lineNum">     451</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L452"><span class="lineNum">     452</span>                 :<span class="tlaGNC">           4 :   function mintToTreasury(address[] calldata assets) external virtual override {</span></span>
-<span id="L453"><span class="lineNum">     453</span>                 :<span class="tlaGNC">           8 :     PoolLogic.executeMintToTreasury(_reserves, assets);</span></span>
+<span id="L392"><span class="lineNum">     392</span>                 :<span class="tlaGNC">        1011 :     FlashLoanLogic.executeFlashLoan(</span></span>
+<span id="L393"><span class="lineNum">     393</span>                 :             :       _reserves,</span>
+<span id="L394"><span class="lineNum">     394</span>                 :             :       _reservesList,</span>
+<span id="L395"><span class="lineNum">     395</span>                 :             :       _eModeCategories,</span>
+<span id="L396"><span class="lineNum">     396</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L397"><span class="lineNum">     397</span>                 :             :       flashParams</span>
+<span id="L398"><span class="lineNum">     398</span>                 :             :     );</span>
+<span id="L399"><span class="lineNum">     399</span>                 :             :   }</span>
+<span id="L400"><span class="lineNum">     400</span>                 :             : </span>
+<span id="L401"><span class="lineNum">     401</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L402"><span class="lineNum">     402</span>                 :             :   function flashLoanSimple(</span>
+<span id="L403"><span class="lineNum">     403</span>                 :             :     address receiverAddress,</span>
+<span id="L404"><span class="lineNum">     404</span>                 :             :     address asset,</span>
+<span id="L405"><span class="lineNum">     405</span>                 :             :     uint256 amount,</span>
+<span id="L406"><span class="lineNum">     406</span>                 :             :     bytes calldata params,</span>
+<span id="L407"><span class="lineNum">     407</span>                 :             :     uint16 referralCode</span>
+<span id="L408"><span class="lineNum">     408</span>                 :             :   ) public virtual override {</span>
+<span id="L409"><span class="lineNum">     409</span>                 :<span class="tlaGNC">          11 :     DataTypes.FlashloanSimpleParams memory flashParams = DataTypes.FlashloanSimpleParams({</span></span>
+<span id="L410"><span class="lineNum">     410</span>                 :             :       receiverAddress: receiverAddress,</span>
+<span id="L411"><span class="lineNum">     411</span>                 :             :       asset: asset,</span>
+<span id="L412"><span class="lineNum">     412</span>                 :             :       amount: amount,</span>
+<span id="L413"><span class="lineNum">     413</span>                 :             :       params: params,</span>
+<span id="L414"><span class="lineNum">     414</span>                 :             :       referralCode: referralCode,</span>
+<span id="L415"><span class="lineNum">     415</span>                 :             :       flashLoanPremiumToProtocol: _flashLoanPremiumToProtocol,</span>
+<span id="L416"><span class="lineNum">     416</span>                 :             :       flashLoanPremiumTotal: _flashLoanPremiumTotal</span>
+<span id="L417"><span class="lineNum">     417</span>                 :             :     });</span>
+<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">          11 :     FlashLoanLogic.executeFlashLoanSimple(_reserves[asset], flashParams);</span></span>
+<span id="L419"><span class="lineNum">     419</span>                 :             :   }</span>
+<span id="L420"><span class="lineNum">     420</span>                 :             : </span>
+<span id="L421"><span class="lineNum">     421</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L422"><span class="lineNum">     422</span>                 :             :   function mintToTreasury(address[] calldata assets) external virtual override {</span>
+<span id="L423"><span class="lineNum">     423</span>                 :<span class="tlaGNC">           4 :     PoolLogic.executeMintToTreasury(_reserves, assets);</span></span>
+<span id="L424"><span class="lineNum">     424</span>                 :             :   }</span>
+<span id="L425"><span class="lineNum">     425</span>                 :             : </span>
+<span id="L426"><span class="lineNum">     426</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L427"><span class="lineNum">     427</span>                 :             :   function getReserveDataExtended(</span>
+<span id="L428"><span class="lineNum">     428</span>                 :             :     address asset</span>
+<span id="L429"><span class="lineNum">     429</span>                 :             :   ) external view returns (DataTypes.ReserveData memory) {</span>
+<span id="L430"><span class="lineNum">     430</span>                 :<span class="tlaGNC">        6011 :     return _reserves[asset];</span></span>
+<span id="L431"><span class="lineNum">     431</span>                 :             :   }</span>
+<span id="L432"><span class="lineNum">     432</span>                 :             : </span>
+<span id="L433"><span class="lineNum">     433</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L434"><span class="lineNum">     434</span>                 :             :   function getReserveData(</span>
+<span id="L435"><span class="lineNum">     435</span>                 :             :     address asset</span>
+<span id="L436"><span class="lineNum">     436</span>                 :             :   ) external view virtual override returns (DataTypes.ReserveDataLegacy memory) {</span>
+<span id="L437"><span class="lineNum">     437</span>                 :<span class="tlaGNC">       83030 :     DataTypes.ReserveData memory reserve = _reserves[asset];</span></span>
+<span id="L438"><span class="lineNum">     438</span>                 :<span class="tlaGNC">       83030 :     DataTypes.ReserveDataLegacy memory res;</span></span>
+<span id="L439"><span class="lineNum">     439</span>                 :             : </span>
+<span id="L440"><span class="lineNum">     440</span>                 :<span class="tlaGNC">       83030 :     res.configuration = reserve.configuration;</span></span>
+<span id="L441"><span class="lineNum">     441</span>                 :<span class="tlaGNC">       83030 :     res.liquidityIndex = reserve.liquidityIndex;</span></span>
+<span id="L442"><span class="lineNum">     442</span>                 :<span class="tlaGNC">       83030 :     res.currentLiquidityRate = reserve.currentLiquidityRate;</span></span>
+<span id="L443"><span class="lineNum">     443</span>                 :<span class="tlaGNC">       83030 :     res.variableBorrowIndex = reserve.variableBorrowIndex;</span></span>
+<span id="L444"><span class="lineNum">     444</span>                 :<span class="tlaGNC">       83030 :     res.currentVariableBorrowRate = reserve.currentVariableBorrowRate;</span></span>
+<span id="L445"><span class="lineNum">     445</span>                 :<span class="tlaGNC">       83030 :     res.lastUpdateTimestamp = reserve.lastUpdateTimestamp;</span></span>
+<span id="L446"><span class="lineNum">     446</span>                 :<span class="tlaGNC">       83030 :     res.id = reserve.id;</span></span>
+<span id="L447"><span class="lineNum">     447</span>                 :<span class="tlaGNC">       83030 :     res.aTokenAddress = reserve.aTokenAddress;</span></span>
+<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">       83030 :     res.variableDebtTokenAddress = reserve.variableDebtTokenAddress;</span></span>
+<span id="L449"><span class="lineNum">     449</span>                 :<span class="tlaGNC">       83030 :     res.interestRateStrategyAddress = reserve.interestRateStrategyAddress;</span></span>
+<span id="L450"><span class="lineNum">     450</span>                 :<span class="tlaGNC">       83030 :     res.accruedToTreasury = reserve.accruedToTreasury;</span></span>
+<span id="L451"><span class="lineNum">     451</span>                 :<span class="tlaGNC">       83030 :     res.unbacked = reserve.unbacked;</span></span>
+<span id="L452"><span class="lineNum">     452</span>                 :<span class="tlaGNC">       83030 :     res.isolationModeTotalDebt = reserve.isolationModeTotalDebt;</span></span>
+<span id="L453"><span class="lineNum">     453</span>                 :<span class="tlaGNC">       83030 :     return res;</span></span>
 <span id="L454"><span class="lineNum">     454</span>                 :             :   }</span>
 <span id="L455"><span class="lineNum">     455</span>                 :             : </span>
 <span id="L456"><span class="lineNum">     456</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L457"><span class="lineNum">     457</span>                 :<span class="tlaGNC">           6 :   function getReserveDataExtended(</span></span>
+<span id="L457"><span class="lineNum">     457</span>                 :             :   function getVirtualUnderlyingBalance(</span>
 <span id="L458"><span class="lineNum">     458</span>                 :             :     address asset</span>
-<span id="L459"><span class="lineNum">     459</span>                 :             :   ) external view returns (DataTypes.ReserveData memory) {</span>
-<span id="L460"><span class="lineNum">     460</span>                 :<span class="tlaGNC">          12 :     return _reserves[asset];</span></span>
+<span id="L459"><span class="lineNum">     459</span>                 :             :   ) external view virtual override returns (uint128) {</span>
+<span id="L460"><span class="lineNum">     460</span>                 :<span class="tlaGNC">        8111 :     return _reserves[asset].virtualUnderlyingBalance;</span></span>
 <span id="L461"><span class="lineNum">     461</span>                 :             :   }</span>
 <span id="L462"><span class="lineNum">     462</span>                 :             : </span>
 <span id="L463"><span class="lineNum">     463</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L464"><span class="lineNum">     464</span>                 :<span class="tlaGNC">       22204 :   function getReserveData(</span></span>
-<span id="L465"><span class="lineNum">     465</span>                 :             :     address asset</span>
-<span id="L466"><span class="lineNum">     466</span>                 :             :   ) external view virtual override returns (DataTypes.ReserveDataLegacy memory) {</span>
-<span id="L467"><span class="lineNum">     467</span>                 :<span class="tlaGNC">       44408 :     DataTypes.ReserveData memory reserve = _reserves[asset];</span></span>
-<span id="L468"><span class="lineNum">     468</span>                 :<span class="tlaGNC">       44408 :     DataTypes.ReserveDataLegacy memory res;</span></span>
-<span id="L469"><span class="lineNum">     469</span>                 :             : </span>
-<span id="L470"><span class="lineNum">     470</span>                 :<span class="tlaGNC">       44408 :     res.configuration = reserve.configuration;</span></span>
-<span id="L471"><span class="lineNum">     471</span>                 :<span class="tlaGNC">       44408 :     res.liquidityIndex = reserve.liquidityIndex;</span></span>
-<span id="L472"><span class="lineNum">     472</span>                 :<span class="tlaGNC">       44408 :     res.currentLiquidityRate = reserve.currentLiquidityRate;</span></span>
-<span id="L473"><span class="lineNum">     473</span>                 :<span class="tlaGNC">       44408 :     res.variableBorrowIndex = reserve.variableBorrowIndex;</span></span>
-<span id="L474"><span class="lineNum">     474</span>                 :<span class="tlaGNC">       44408 :     res.currentVariableBorrowRate = reserve.currentVariableBorrowRate;</span></span>
-<span id="L475"><span class="lineNum">     475</span>                 :<span class="tlaGNC">       44408 :     res.currentStableBorrowRate = reserve.currentStableBorrowRate;</span></span>
-<span id="L476"><span class="lineNum">     476</span>                 :<span class="tlaGNC">       44408 :     res.lastUpdateTimestamp = reserve.lastUpdateTimestamp;</span></span>
-<span id="L477"><span class="lineNum">     477</span>                 :<span class="tlaGNC">       44408 :     res.id = reserve.id;</span></span>
-<span id="L478"><span class="lineNum">     478</span>                 :<span class="tlaGNC">       44408 :     res.aTokenAddress = reserve.aTokenAddress;</span></span>
-<span id="L479"><span class="lineNum">     479</span>                 :<span class="tlaGNC">       44408 :     res.stableDebtTokenAddress = reserve.stableDebtTokenAddress;</span></span>
-<span id="L480"><span class="lineNum">     480</span>                 :<span class="tlaGNC">       44408 :     res.variableDebtTokenAddress = reserve.variableDebtTokenAddress;</span></span>
-<span id="L481"><span class="lineNum">     481</span>                 :<span class="tlaGNC">       44408 :     res.interestRateStrategyAddress = reserve.interestRateStrategyAddress;</span></span>
-<span id="L482"><span class="lineNum">     482</span>                 :<span class="tlaGNC">       44408 :     res.accruedToTreasury = reserve.accruedToTreasury;</span></span>
-<span id="L483"><span class="lineNum">     483</span>                 :<span class="tlaGNC">       44408 :     res.unbacked = reserve.unbacked;</span></span>
-<span id="L484"><span class="lineNum">     484</span>                 :<span class="tlaGNC">       44408 :     res.isolationModeTotalDebt = reserve.isolationModeTotalDebt;</span></span>
-<span id="L485"><span class="lineNum">     485</span>                 :<span class="tlaGNC">       44408 :     return res;</span></span>
-<span id="L486"><span class="lineNum">     486</span>                 :             :   }</span>
-<span id="L487"><span class="lineNum">     487</span>                 :             : </span>
-<span id="L488"><span class="lineNum">     488</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L489"><span class="lineNum">     489</span>                 :<span class="tlaGNC">        6030 :   function getVirtualUnderlyingBalance(</span></span>
-<span id="L490"><span class="lineNum">     490</span>                 :             :     address asset</span>
-<span id="L491"><span class="lineNum">     491</span>                 :             :   ) external view virtual override returns (uint128) {</span>
-<span id="L492"><span class="lineNum">     492</span>                 :<span class="tlaGNC">       12060 :     return _reserves[asset].virtualUnderlyingBalance;</span></span>
+<span id="L464"><span class="lineNum">     464</span>                 :             :   function getUserAccountData(</span>
+<span id="L465"><span class="lineNum">     465</span>                 :             :     address user</span>
+<span id="L466"><span class="lineNum">     466</span>                 :             :   )</span>
+<span id="L467"><span class="lineNum">     467</span>                 :             :     external</span>
+<span id="L468"><span class="lineNum">     468</span>                 :             :     view</span>
+<span id="L469"><span class="lineNum">     469</span>                 :             :     virtual</span>
+<span id="L470"><span class="lineNum">     470</span>                 :             :     override</span>
+<span id="L471"><span class="lineNum">     471</span>                 :             :     returns (</span>
+<span id="L472"><span class="lineNum">     472</span>                 :             :       uint256 totalCollateralBase,</span>
+<span id="L473"><span class="lineNum">     473</span>                 :             :       uint256 totalDebtBase,</span>
+<span id="L474"><span class="lineNum">     474</span>                 :             :       uint256 availableBorrowsBase,</span>
+<span id="L475"><span class="lineNum">     475</span>                 :             :       uint256 currentLiquidationThreshold,</span>
+<span id="L476"><span class="lineNum">     476</span>                 :             :       uint256 ltv,</span>
+<span id="L477"><span class="lineNum">     477</span>                 :             :       uint256 healthFactor</span>
+<span id="L478"><span class="lineNum">     478</span>                 :             :     )</span>
+<span id="L479"><span class="lineNum">     479</span>                 :             :   {</span>
+<span id="L480"><span class="lineNum">     480</span>                 :<span class="tlaGNC">       10015 :     return</span></span>
+<span id="L481"><span class="lineNum">     481</span>                 :<span class="tlaGNC">       10015 :       PoolLogic.executeGetUserAccountData(</span></span>
+<span id="L482"><span class="lineNum">     482</span>                 :             :         _reserves,</span>
+<span id="L483"><span class="lineNum">     483</span>                 :             :         _reservesList,</span>
+<span id="L484"><span class="lineNum">     484</span>                 :             :         _eModeCategories,</span>
+<span id="L485"><span class="lineNum">     485</span>                 :             :         DataTypes.CalculateUserAccountDataParams({</span>
+<span id="L486"><span class="lineNum">     486</span>                 :             :           userConfig: _usersConfig[user],</span>
+<span id="L487"><span class="lineNum">     487</span>                 :             :           reservesCount: _reservesCount,</span>
+<span id="L488"><span class="lineNum">     488</span>                 :             :           user: user,</span>
+<span id="L489"><span class="lineNum">     489</span>                 :             :           oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L490"><span class="lineNum">     490</span>                 :             :           userEModeCategory: _usersEModeCategory[user]</span>
+<span id="L491"><span class="lineNum">     491</span>                 :             :         })</span>
+<span id="L492"><span class="lineNum">     492</span>                 :             :       );</span>
 <span id="L493"><span class="lineNum">     493</span>                 :             :   }</span>
 <span id="L494"><span class="lineNum">     494</span>                 :             : </span>
 <span id="L495"><span class="lineNum">     495</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L496"><span class="lineNum">     496</span>                 :<span class="tlaGNC">        3013 :   function getUserAccountData(</span></span>
-<span id="L497"><span class="lineNum">     497</span>                 :             :     address user</span>
-<span id="L498"><span class="lineNum">     498</span>                 :             :   )</span>
-<span id="L499"><span class="lineNum">     499</span>                 :             :     external</span>
-<span id="L500"><span class="lineNum">     500</span>                 :             :     view</span>
-<span id="L501"><span class="lineNum">     501</span>                 :             :     virtual</span>
-<span id="L502"><span class="lineNum">     502</span>                 :             :     override</span>
-<span id="L503"><span class="lineNum">     503</span>                 :             :     returns (</span>
-<span id="L504"><span class="lineNum">     504</span>                 :             :       uint256 totalCollateralBase,</span>
-<span id="L505"><span class="lineNum">     505</span>                 :             :       uint256 totalDebtBase,</span>
-<span id="L506"><span class="lineNum">     506</span>                 :             :       uint256 availableBorrowsBase,</span>
-<span id="L507"><span class="lineNum">     507</span>                 :             :       uint256 currentLiquidationThreshold,</span>
-<span id="L508"><span class="lineNum">     508</span>                 :             :       uint256 ltv,</span>
-<span id="L509"><span class="lineNum">     509</span>                 :             :       uint256 healthFactor</span>
-<span id="L510"><span class="lineNum">     510</span>                 :             :     )</span>
-<span id="L511"><span class="lineNum">     511</span>                 :             :   {</span>
-<span id="L512"><span class="lineNum">     512</span>                 :<span class="tlaGNC">        6026 :     return</span></span>
-<span id="L513"><span class="lineNum">     513</span>                 :<span class="tlaGNC">        6026 :       PoolLogic.executeGetUserAccountData(</span></span>
-<span id="L514"><span class="lineNum">     514</span>                 :             :         _reserves,</span>
-<span id="L515"><span class="lineNum">     515</span>                 :             :         _reservesList,</span>
-<span id="L516"><span class="lineNum">     516</span>                 :             :         _eModeCategories,</span>
-<span id="L517"><span class="lineNum">     517</span>                 :             :         DataTypes.CalculateUserAccountDataParams({</span>
-<span id="L518"><span class="lineNum">     518</span>                 :             :           userConfig: _usersConfig[user],</span>
-<span id="L519"><span class="lineNum">     519</span>                 :             :           reservesCount: _reservesCount,</span>
-<span id="L520"><span class="lineNum">     520</span>                 :             :           user: user,</span>
-<span id="L521"><span class="lineNum">     521</span>                 :             :           oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L522"><span class="lineNum">     522</span>                 :             :           userEModeCategory: _usersEModeCategory[user]</span>
-<span id="L523"><span class="lineNum">     523</span>                 :             :         })</span>
-<span id="L524"><span class="lineNum">     524</span>                 :             :       );</span>
-<span id="L525"><span class="lineNum">     525</span>                 :             :   }</span>
-<span id="L526"><span class="lineNum">     526</span>                 :             : </span>
-<span id="L527"><span class="lineNum">     527</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L528"><span class="lineNum">     528</span>                 :<span class="tlaGNC">       41450 :   function getConfiguration(</span></span>
-<span id="L529"><span class="lineNum">     529</span>                 :             :     address asset</span>
-<span id="L530"><span class="lineNum">     530</span>                 :             :   ) external view virtual override returns (DataTypes.ReserveConfigurationMap memory) {</span>
-<span id="L531"><span class="lineNum">     531</span>                 :<span class="tlaGNC">       82900 :     return _reserves[asset].configuration;</span></span>
-<span id="L532"><span class="lineNum">     532</span>                 :             :   }</span>
-<span id="L533"><span class="lineNum">     533</span>                 :             : </span>
-<span id="L534"><span class="lineNum">     534</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L535"><span class="lineNum">     535</span>                 :<span class="tlaGNC">        6030 :   function getUserConfiguration(</span></span>
-<span id="L536"><span class="lineNum">     536</span>                 :             :     address user</span>
-<span id="L537"><span class="lineNum">     537</span>                 :             :   ) external view virtual override returns (DataTypes.UserConfigurationMap memory) {</span>
-<span id="L538"><span class="lineNum">     538</span>                 :<span class="tlaGNC">       12060 :     return _usersConfig[user];</span></span>
-<span id="L539"><span class="lineNum">     539</span>                 :             :   }</span>
-<span id="L540"><span class="lineNum">     540</span>                 :             : </span>
-<span id="L541"><span class="lineNum">     541</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L542"><span class="lineNum">     542</span>                 :<span class="tlaGNC">       31404 :   function getReserveNormalizedIncome(</span></span>
-<span id="L543"><span class="lineNum">     543</span>                 :             :     address asset</span>
-<span id="L544"><span class="lineNum">     544</span>                 :             :   ) external view virtual override returns (uint256) {</span>
-<span id="L545"><span class="lineNum">     545</span>                 :<span class="tlaGNC">       94212 :     return _reserves[asset].getNormalizedIncome();</span></span>
-<span id="L546"><span class="lineNum">     546</span>                 :             :   }</span>
-<span id="L547"><span class="lineNum">     547</span>                 :             : </span>
-<span id="L548"><span class="lineNum">     548</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L549"><span class="lineNum">     549</span>                 :<span class="tlaGNC">       25218 :   function getReserveNormalizedVariableDebt(</span></span>
-<span id="L550"><span class="lineNum">     550</span>                 :             :     address asset</span>
-<span id="L551"><span class="lineNum">     551</span>                 :             :   ) external view virtual override returns (uint256) {</span>
-<span id="L552"><span class="lineNum">     552</span>                 :<span class="tlaGNC">       75654 :     return _reserves[asset].getNormalizedDebt();</span></span>
-<span id="L553"><span class="lineNum">     553</span>                 :             :   }</span>
-<span id="L554"><span class="lineNum">     554</span>                 :             : </span>
-<span id="L555"><span class="lineNum">     555</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L556"><span class="lineNum">     556</span>                 :<span class="tlaGNC">        6043 :   function getReservesList() external view virtual override returns (address[] memory) {</span></span>
-<span id="L557"><span class="lineNum">     557</span>                 :<span class="tlaGNC">       12086 :     uint256 reservesListCount = _reservesCount;</span></span>
-<span id="L558"><span class="lineNum">     558</span>                 :<span class="tlaGNC">       12086 :     uint256 droppedReservesCount = 0;</span></span>
-<span id="L559"><span class="lineNum">     559</span>                 :<span class="tlaGNC">       18129 :     address[] memory reservesList = new address[](reservesListCount);</span></span>
-<span id="L560"><span class="lineNum">     560</span>                 :             : </span>
-<span id="L561"><span class="lineNum">     561</span>                 :<span class="tlaGNC">       56395 :     for (uint256 i = 0; i &lt; reservesListCount; i++) {</span></span>
-<span id="L562"><span class="lineNum">     562</span>                 :<span class="tlaGNC">       57399 :       if (_reservesList[i] != address(0)) {</span></span>
-<span id="L563"><span class="lineNum">     563</span>                 :<span class="tlaGNC">       38264 :         reservesList[i - droppedReservesCount] = _reservesList[i];</span></span>
-<span id="L564"><span class="lineNum">     564</span>                 :             :       } else {</span>
-<span id="L565"><span class="lineNum">     565</span>                 :<span class="tlaGNC">           2 :         droppedReservesCount++;</span></span>
-<span id="L566"><span class="lineNum">     566</span>                 :             :       }</span>
-<span id="L567"><span class="lineNum">     567</span>                 :             :     }</span>
+<span id="L496"><span class="lineNum">     496</span>                 :             :   function getConfiguration(</span>
+<span id="L497"><span class="lineNum">     497</span>                 :             :     address asset</span>
+<span id="L498"><span class="lineNum">     498</span>                 :             :   ) external view virtual override returns (DataTypes.ReserveConfigurationMap memory) {</span>
+<span id="L499"><span class="lineNum">     499</span>                 :<span class="tlaGNC">      162047 :     return _reserves[asset].configuration;</span></span>
+<span id="L500"><span class="lineNum">     500</span>                 :             :   }</span>
+<span id="L501"><span class="lineNum">     501</span>                 :             : </span>
+<span id="L502"><span class="lineNum">     502</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L503"><span class="lineNum">     503</span>                 :             :   function getUserConfiguration(</span>
+<span id="L504"><span class="lineNum">     504</span>                 :             :     address user</span>
+<span id="L505"><span class="lineNum">     505</span>                 :             :   ) external view virtual override returns (DataTypes.UserConfigurationMap memory) {</span>
+<span id="L506"><span class="lineNum">     506</span>                 :<span class="tlaGNC">        7029 :     return _usersConfig[user];</span></span>
+<span id="L507"><span class="lineNum">     507</span>                 :             :   }</span>
+<span id="L508"><span class="lineNum">     508</span>                 :             : </span>
+<span id="L509"><span class="lineNum">     509</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L510"><span class="lineNum">     510</span>                 :             :   function getReserveNormalizedIncome(</span>
+<span id="L511"><span class="lineNum">     511</span>                 :             :     address asset</span>
+<span id="L512"><span class="lineNum">     512</span>                 :             :   ) external view virtual override returns (uint256) {</span>
+<span id="L513"><span class="lineNum">     513</span>                 :<span class="tlaGNC">      115423 :     return _reserves[asset].getNormalizedIncome();</span></span>
+<span id="L514"><span class="lineNum">     514</span>                 :             :   }</span>
+<span id="L515"><span class="lineNum">     515</span>                 :             : </span>
+<span id="L516"><span class="lineNum">     516</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L517"><span class="lineNum">     517</span>                 :             :   function getReserveNormalizedVariableDebt(</span>
+<span id="L518"><span class="lineNum">     518</span>                 :             :     address asset</span>
+<span id="L519"><span class="lineNum">     519</span>                 :             :   ) external view virtual override returns (uint256) {</span>
+<span id="L520"><span class="lineNum">     520</span>                 :<span class="tlaGNC">       29583 :     return _reserves[asset].getNormalizedDebt();</span></span>
+<span id="L521"><span class="lineNum">     521</span>                 :             :   }</span>
+<span id="L522"><span class="lineNum">     522</span>                 :             : </span>
+<span id="L523"><span class="lineNum">     523</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L524"><span class="lineNum">     524</span>                 :             :   function getReservesList() external view virtual override returns (address[] memory) {</span>
+<span id="L525"><span class="lineNum">     525</span>                 :<span class="tlaGNC">       16076 :     uint256 reservesListCount = _reservesCount;</span></span>
+<span id="L526"><span class="lineNum">     526</span>                 :<span class="tlaGNC">       16076 :     uint256 droppedReservesCount = 0;</span></span>
+<span id="L527"><span class="lineNum">     527</span>                 :<span class="tlaGNC">       16076 :     address[] memory reservesList = new address[](reservesListCount);</span></span>
+<span id="L528"><span class="lineNum">     528</span>                 :             : </span>
+<span id="L529"><span class="lineNum">     529</span>                 :<span class="tlaGNC">       16076 :     for (uint256 i = 0; i &lt; reservesListCount; i++) {</span></span>
+<span id="L530"><span class="lineNum">     530</span>                 :<span class="tlaGNC">       82300 :       if (_reservesList[i] != address(0)) {</span></span>
+<span id="L531"><span class="lineNum">     531</span>                 :<span class="tlaGNC">       82299 :         reservesList[i - droppedReservesCount] = _reservesList[i];</span></span>
+<span id="L532"><span class="lineNum">     532</span>                 :             :       } else {</span>
+<span id="L533"><span class="lineNum">     533</span>                 :<span class="tlaGNC">           1 :         droppedReservesCount++;</span></span>
+<span id="L534"><span class="lineNum">     534</span>                 :             :       }</span>
+<span id="L535"><span class="lineNum">     535</span>                 :             :     }</span>
+<span id="L536"><span class="lineNum">     536</span>                 :             : </span>
+<span id="L537"><span class="lineNum">     537</span>                 :             :     // Reduces the length of the reserves array by `droppedReservesCount`</span>
+<span id="L538"><span class="lineNum">     538</span>                 :             :     assembly {</span>
+<span id="L539"><span class="lineNum">     539</span>                 :<span class="tlaGNC">       16076 :       mstore(reservesList, sub(reservesListCount, droppedReservesCount))</span></span>
+<span id="L540"><span class="lineNum">     540</span>                 :             :     }</span>
+<span id="L541"><span class="lineNum">     541</span>                 :<span class="tlaGNC">       16076 :     return reservesList;</span></span>
+<span id="L542"><span class="lineNum">     542</span>                 :             :   }</span>
+<span id="L543"><span class="lineNum">     543</span>                 :             : </span>
+<span id="L544"><span class="lineNum">     544</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L545"><span class="lineNum">     545</span>                 :             :   function getReservesCount() external view virtual override returns (uint256) {</span>
+<span id="L546"><span class="lineNum">     546</span>                 :<span class="tlaGNC">           2 :     return _reservesCount;</span></span>
+<span id="L547"><span class="lineNum">     547</span>                 :             :   }</span>
+<span id="L548"><span class="lineNum">     548</span>                 :             : </span>
+<span id="L549"><span class="lineNum">     549</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L550"><span class="lineNum">     550</span>                 :             :   function getReserveAddressById(uint16 id) external view returns (address) {</span>
+<span id="L551"><span class="lineNum">     551</span>                 :<span class="tlaGNC">           1 :     return _reservesList[id];</span></span>
+<span id="L552"><span class="lineNum">     552</span>                 :             :   }</span>
+<span id="L553"><span class="lineNum">     553</span>                 :             : </span>
+<span id="L554"><span class="lineNum">     554</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L555"><span class="lineNum">     555</span>                 :             :   function BRIDGE_PROTOCOL_FEE() public view virtual override returns (uint256) {</span>
+<span id="L556"><span class="lineNum">     556</span>                 :<span class="tlaGNC">          25 :     return _bridgeProtocolFee;</span></span>
+<span id="L557"><span class="lineNum">     557</span>                 :             :   }</span>
+<span id="L558"><span class="lineNum">     558</span>                 :             : </span>
+<span id="L559"><span class="lineNum">     559</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L560"><span class="lineNum">     560</span>                 :             :   function FLASHLOAN_PREMIUM_TOTAL() public view virtual override returns (uint128) {</span>
+<span id="L561"><span class="lineNum">     561</span>                 :<span class="tlaGNC">        1368 :     return _flashLoanPremiumTotal;</span></span>
+<span id="L562"><span class="lineNum">     562</span>                 :             :   }</span>
+<span id="L563"><span class="lineNum">     563</span>                 :             : </span>
+<span id="L564"><span class="lineNum">     564</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L565"><span class="lineNum">     565</span>                 :             :   function FLASHLOAN_PREMIUM_TO_PROTOCOL() public view virtual override returns (uint128) {</span>
+<span id="L566"><span class="lineNum">     566</span>                 :<span class="tlaGNC">        1365 :     return _flashLoanPremiumToProtocol;</span></span>
+<span id="L567"><span class="lineNum">     567</span>                 :             :   }</span>
 <span id="L568"><span class="lineNum">     568</span>                 :             : </span>
-<span id="L569"><span class="lineNum">     569</span>                 :             :     // Reduces the length of the reserves array by `droppedReservesCount`</span>
-<span id="L570"><span class="lineNum">     570</span>                 :             :     assembly {</span>
-<span id="L571"><span class="lineNum">     571</span>                 :             :       mstore(reservesList, sub(reservesListCount, droppedReservesCount))</span>
-<span id="L572"><span class="lineNum">     572</span>                 :             :     }</span>
-<span id="L573"><span class="lineNum">     573</span>                 :<span class="tlaGNC">       12086 :     return reservesList;</span></span>
-<span id="L574"><span class="lineNum">     574</span>                 :             :   }</span>
-<span id="L575"><span class="lineNum">     575</span>                 :             : </span>
-<span id="L576"><span class="lineNum">     576</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L577"><span class="lineNum">     577</span>                 :<span class="tlaGNC">           1 :   function getReservesCount() external view virtual override returns (uint256) {</span></span>
-<span id="L578"><span class="lineNum">     578</span>                 :<span class="tlaGNC">           2 :     return _reservesCount;</span></span>
-<span id="L579"><span class="lineNum">     579</span>                 :             :   }</span>
-<span id="L580"><span class="lineNum">     580</span>                 :             : </span>
-<span id="L581"><span class="lineNum">     581</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L582"><span class="lineNum">     582</span>                 :<span class="tlaGNC">           1 :   function getReserveAddressById(uint16 id) external view returns (address) {</span></span>
-<span id="L583"><span class="lineNum">     583</span>                 :<span class="tlaGNC">           2 :     return _reservesList[id];</span></span>
-<span id="L584"><span class="lineNum">     584</span>                 :             :   }</span>
-<span id="L585"><span class="lineNum">     585</span>                 :             : </span>
-<span id="L586"><span class="lineNum">     586</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L587"><span class="lineNum">     587</span>                 :<span class="tlaGNC">           3 :   function MAX_STABLE_RATE_BORROW_SIZE_PERCENT() public view virtual override returns (uint256) {</span></span>
-<span id="L588"><span class="lineNum">     588</span>                 :<span class="tlaGNC">           6 :     return _maxStableRateBorrowSizePercent;</span></span>
-<span id="L589"><span class="lineNum">     589</span>                 :             :   }</span>
-<span id="L590"><span class="lineNum">     590</span>                 :             : </span>
-<span id="L591"><span class="lineNum">     591</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L592"><span class="lineNum">     592</span>                 :<span class="tlaGNC">          25 :   function BRIDGE_PROTOCOL_FEE() public view virtual override returns (uint256) {</span></span>
-<span id="L593"><span class="lineNum">     593</span>                 :<span class="tlaGNC">          50 :     return _bridgeProtocolFee;</span></span>
-<span id="L594"><span class="lineNum">     594</span>                 :             :   }</span>
-<span id="L595"><span class="lineNum">     595</span>                 :             : </span>
-<span id="L596"><span class="lineNum">     596</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L597"><span class="lineNum">     597</span>                 :<span class="tlaGNC">        1218 :   function FLASHLOAN_PREMIUM_TOTAL() public view virtual override returns (uint128) {</span></span>
-<span id="L598"><span class="lineNum">     598</span>                 :<span class="tlaGNC">        2436 :     return _flashLoanPremiumTotal;</span></span>
-<span id="L599"><span class="lineNum">     599</span>                 :             :   }</span>
-<span id="L600"><span class="lineNum">     600</span>                 :             : </span>
-<span id="L601"><span class="lineNum">     601</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L602"><span class="lineNum">     602</span>                 :<span class="tlaGNC">        1215 :   function FLASHLOAN_PREMIUM_TO_PROTOCOL() public view virtual override returns (uint128) {</span></span>
-<span id="L603"><span class="lineNum">     603</span>                 :<span class="tlaGNC">        2430 :     return _flashLoanPremiumToProtocol;</span></span>
-<span id="L604"><span class="lineNum">     604</span>                 :             :   }</span>
-<span id="L605"><span class="lineNum">     605</span>                 :             : </span>
-<span id="L606"><span class="lineNum">     606</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L607"><span class="lineNum">     607</span>                 :<span class="tlaGNC">           3 :   function MAX_NUMBER_RESERVES() public view virtual override returns (uint16) {</span></span>
-<span id="L608"><span class="lineNum">     608</span>                 :<span class="tlaGNC">        5770 :     return ReserveConfiguration.MAX_RESERVES_COUNT;</span></span>
-<span id="L609"><span class="lineNum">     609</span>                 :             :   }</span>
-<span id="L610"><span class="lineNum">     610</span>                 :             : </span>
-<span id="L611"><span class="lineNum">     611</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L612"><span class="lineNum">     612</span>                 :<span class="tlaGNC">        1036 :   function finalizeTransfer(</span></span>
-<span id="L613"><span class="lineNum">     613</span>                 :             :     address asset,</span>
-<span id="L614"><span class="lineNum">     614</span>                 :             :     address from,</span>
-<span id="L615"><span class="lineNum">     615</span>                 :             :     address to,</span>
-<span id="L616"><span class="lineNum">     616</span>                 :             :     uint256 amount,</span>
-<span id="L617"><span class="lineNum">     617</span>                 :             :     uint256 balanceFromBefore,</span>
-<span id="L618"><span class="lineNum">     618</span>                 :             :     uint256 balanceToBefore</span>
-<span id="L619"><span class="lineNum">     619</span>                 :             :   ) external virtual override {</span>
-<span id="L620"><span class="lineNum">     620</span>                 :<span class="tlaGNC">        2072 :     require(msg.sender == _reserves[asset].aTokenAddress, Errors.CALLER_NOT_ATOKEN);</span></span>
-<span id="L621"><span class="lineNum">     621</span>                 :<span class="tlaGNC">        2072 :     SupplyLogic.executeFinalizeTransfer(</span></span>
-<span id="L622"><span class="lineNum">     622</span>                 :             :       _reserves,</span>
-<span id="L623"><span class="lineNum">     623</span>                 :             :       _reservesList,</span>
-<span id="L624"><span class="lineNum">     624</span>                 :             :       _eModeCategories,</span>
-<span id="L625"><span class="lineNum">     625</span>                 :             :       _usersConfig,</span>
-<span id="L626"><span class="lineNum">     626</span>                 :             :       DataTypes.FinalizeTransferParams({</span>
-<span id="L627"><span class="lineNum">     627</span>                 :             :         asset: asset,</span>
-<span id="L628"><span class="lineNum">     628</span>                 :             :         from: from,</span>
-<span id="L629"><span class="lineNum">     629</span>                 :             :         to: to,</span>
-<span id="L630"><span class="lineNum">     630</span>                 :             :         amount: amount,</span>
-<span id="L631"><span class="lineNum">     631</span>                 :             :         balanceFromBefore: balanceFromBefore,</span>
-<span id="L632"><span class="lineNum">     632</span>                 :             :         balanceToBefore: balanceToBefore,</span>
-<span id="L633"><span class="lineNum">     633</span>                 :             :         reservesCount: _reservesCount,</span>
-<span id="L634"><span class="lineNum">     634</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L635"><span class="lineNum">     635</span>                 :             :         fromEModeCategory: _usersEModeCategory[from]</span>
-<span id="L636"><span class="lineNum">     636</span>                 :             :       })</span>
-<span id="L637"><span class="lineNum">     637</span>                 :             :     );</span>
-<span id="L638"><span class="lineNum">     638</span>                 :             :   }</span>
-<span id="L639"><span class="lineNum">     639</span>                 :             : </span>
-<span id="L640"><span class="lineNum">     640</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L641"><span class="lineNum">     641</span>                 :<span class="tlaGNC">        6882 :   function initReserve(</span></span>
-<span id="L642"><span class="lineNum">     642</span>                 :             :     address asset,</span>
-<span id="L643"><span class="lineNum">     643</span>                 :             :     address aTokenAddress,</span>
-<span id="L644"><span class="lineNum">     644</span>                 :             :     address stableDebtAddress,</span>
-<span id="L645"><span class="lineNum">     645</span>                 :             :     address variableDebtAddress,</span>
-<span id="L646"><span class="lineNum">     646</span>                 :             :     address interestRateStrategyAddress</span>
-<span id="L647"><span class="lineNum">     647</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L648"><span class="lineNum">     648</span>                 :             :     if (</span>
-<span id="L649"><span class="lineNum">     649</span>                 :<span class="tlaGNC">        5764 :       PoolLogic.executeInitReserve(</span></span>
-<span id="L650"><span class="lineNum">     650</span>                 :             :         _reserves,</span>
-<span id="L651"><span class="lineNum">     651</span>                 :             :         _reservesList,</span>
-<span id="L652"><span class="lineNum">     652</span>                 :             :         DataTypes.InitReserveParams({</span>
-<span id="L653"><span class="lineNum">     653</span>                 :             :           asset: asset,</span>
-<span id="L654"><span class="lineNum">     654</span>                 :             :           aTokenAddress: aTokenAddress,</span>
-<span id="L655"><span class="lineNum">     655</span>                 :             :           stableDebtAddress: stableDebtAddress,</span>
-<span id="L656"><span class="lineNum">     656</span>                 :             :           variableDebtAddress: variableDebtAddress,</span>
-<span id="L657"><span class="lineNum">     657</span>                 :             :           interestRateStrategyAddress: interestRateStrategyAddress,</span>
-<span id="L658"><span class="lineNum">     658</span>                 :             :           reservesCount: _reservesCount,</span>
-<span id="L659"><span class="lineNum">     659</span>                 :             :           maxNumberReserves: MAX_NUMBER_RESERVES()</span>
-<span id="L660"><span class="lineNum">     660</span>                 :             :         })</span>
-<span id="L661"><span class="lineNum">     661</span>                 :             :       )</span>
-<span id="L662"><span class="lineNum">     662</span>                 :             :     ) {</span>
-<span id="L663"><span class="lineNum">     663</span>                 :<span class="tlaGNC">        5762 :       _reservesCount++;</span></span>
-<span id="L664"><span class="lineNum">     664</span>                 :             :     }</span>
-<span id="L665"><span class="lineNum">     665</span>                 :             :   }</span>
-<span id="L666"><span class="lineNum">     666</span>                 :             : </span>
-<span id="L667"><span class="lineNum">     667</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L668"><span class="lineNum">     668</span>                 :<span class="tlaGNC">        2007 :   function dropReserve(address asset) external virtual override onlyPoolConfigurator {</span></span>
-<span id="L669"><span class="lineNum">     669</span>                 :<span class="tlaGNC">          14 :     PoolLogic.executeDropReserve(_reserves, _reservesList, asset);</span></span>
-<span id="L670"><span class="lineNum">     670</span>                 :             :   }</span>
-<span id="L671"><span class="lineNum">     671</span>                 :             : </span>
-<span id="L672"><span class="lineNum">     672</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L673"><span class="lineNum">     673</span>                 :<span class="tlaGNC">        6006 :   function setReserveInterestRateStrategyAddress(</span></span>
-<span id="L674"><span class="lineNum">     674</span>                 :             :     address asset,</span>
-<span id="L675"><span class="lineNum">     675</span>                 :             :     address rateStrategyAddress</span>
-<span id="L676"><span class="lineNum">     676</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L677"><span class="lineNum">     677</span>                 :<span class="tlaGNC">        8012 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
-<span id="L678"><span class="lineNum">     678</span>                 :<span class="tlaGNC">        4012 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
-<span id="L679"><span class="lineNum">     679</span>                 :             : </span>
-<span id="L680"><span class="lineNum">     680</span>                 :<span class="tlaGNC">          12 :     _reserves[asset].interestRateStrategyAddress = rateStrategyAddress;</span></span>
-<span id="L681"><span class="lineNum">     681</span>                 :             :   }</span>
-<span id="L682"><span class="lineNum">     682</span>                 :             : </span>
-<span id="L683"><span class="lineNum">     683</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L684"><span class="lineNum">     684</span>                 :<span class="tlaGNC">        1751 :   function syncIndexesState(address asset) external virtual override onlyPoolConfigurator {</span></span>
-<span id="L685"><span class="lineNum">     685</span>                 :<span class="tlaGNC">        3502 :     DataTypes.ReserveData storage reserve = _reserves[asset];</span></span>
-<span id="L686"><span class="lineNum">     686</span>                 :<span class="tlaGNC">        5253 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L687"><span class="lineNum">     687</span>                 :             : </span>
-<span id="L688"><span class="lineNum">     688</span>                 :<span class="tlaGNC">        3502 :     reserve.updateState(reserveCache);</span></span>
-<span id="L689"><span class="lineNum">     689</span>                 :             :   }</span>
-<span id="L690"><span class="lineNum">     690</span>                 :             : </span>
-<span id="L691"><span class="lineNum">     691</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L692"><span class="lineNum">     692</span>                 :<span class="tlaGNC">        1751 :   function syncRatesState(address asset) external virtual override onlyPoolConfigurator {</span></span>
-<span id="L693"><span class="lineNum">     693</span>                 :<span class="tlaGNC">        3502 :     DataTypes.ReserveData storage reserve = _reserves[asset];</span></span>
-<span id="L694"><span class="lineNum">     694</span>                 :<span class="tlaGNC">        5253 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
-<span id="L695"><span class="lineNum">     695</span>                 :             : </span>
-<span id="L696"><span class="lineNum">     696</span>                 :<span class="tlaGNC">        3502 :     ReserveLogic.updateInterestRatesAndVirtualBalance(reserve, reserveCache, asset, 0, 0);</span></span>
+<span id="L569"><span class="lineNum">     569</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L570"><span class="lineNum">     570</span>                 :             :   function MAX_NUMBER_RESERVES() public view virtual override returns (uint16) {</span>
+<span id="L571"><span class="lineNum">     571</span>                 :<span class="tlaGNC">      168018 :     return ReserveConfiguration.MAX_RESERVES_COUNT;</span></span>
+<span id="L572"><span class="lineNum">     572</span>                 :             :   }</span>
+<span id="L573"><span class="lineNum">     573</span>                 :             : </span>
+<span id="L574"><span class="lineNum">     574</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L575"><span class="lineNum">     575</span>                 :             :   function finalizeTransfer(</span>
+<span id="L576"><span class="lineNum">     576</span>                 :             :     address asset,</span>
+<span id="L577"><span class="lineNum">     577</span>                 :             :     address from,</span>
+<span id="L578"><span class="lineNum">     578</span>                 :             :     address to,</span>
+<span id="L579"><span class="lineNum">     579</span>                 :             :     uint256 amount,</span>
+<span id="L580"><span class="lineNum">     580</span>                 :             :     uint256 balanceFromBefore,</span>
+<span id="L581"><span class="lineNum">     581</span>                 :             :     uint256 balanceToBefore</span>
+<span id="L582"><span class="lineNum">     582</span>                 :             :   ) external virtual override {</span>
+<span id="L583"><span class="lineNum">     583</span>                 :<span class="tlaGNC">       17042 :     require(msg.sender == _reserves[asset].aTokenAddress, Errors.CALLER_NOT_ATOKEN);</span></span>
+<span id="L584"><span class="lineNum">     584</span>                 :<span class="tlaGNC">       17042 :     SupplyLogic.executeFinalizeTransfer(</span></span>
+<span id="L585"><span class="lineNum">     585</span>                 :             :       _reserves,</span>
+<span id="L586"><span class="lineNum">     586</span>                 :             :       _reservesList,</span>
+<span id="L587"><span class="lineNum">     587</span>                 :             :       _eModeCategories,</span>
+<span id="L588"><span class="lineNum">     588</span>                 :             :       _usersConfig,</span>
+<span id="L589"><span class="lineNum">     589</span>                 :             :       DataTypes.FinalizeTransferParams({</span>
+<span id="L590"><span class="lineNum">     590</span>                 :             :         asset: asset,</span>
+<span id="L591"><span class="lineNum">     591</span>                 :             :         from: from,</span>
+<span id="L592"><span class="lineNum">     592</span>                 :             :         to: to,</span>
+<span id="L593"><span class="lineNum">     593</span>                 :             :         amount: amount,</span>
+<span id="L594"><span class="lineNum">     594</span>                 :             :         balanceFromBefore: balanceFromBefore,</span>
+<span id="L595"><span class="lineNum">     595</span>                 :             :         balanceToBefore: balanceToBefore,</span>
+<span id="L596"><span class="lineNum">     596</span>                 :             :         reservesCount: _reservesCount,</span>
+<span id="L597"><span class="lineNum">     597</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L598"><span class="lineNum">     598</span>                 :             :         fromEModeCategory: _usersEModeCategory[from]</span>
+<span id="L599"><span class="lineNum">     599</span>                 :             :       })</span>
+<span id="L600"><span class="lineNum">     600</span>                 :             :     );</span>
+<span id="L601"><span class="lineNum">     601</span>                 :             :   }</span>
+<span id="L602"><span class="lineNum">     602</span>                 :             : </span>
+<span id="L603"><span class="lineNum">     603</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L604"><span class="lineNum">     604</span>                 :             :   function initReserve(</span>
+<span id="L605"><span class="lineNum">     605</span>                 :             :     address asset,</span>
+<span id="L606"><span class="lineNum">     606</span>                 :             :     address aTokenAddress,</span>
+<span id="L607"><span class="lineNum">     607</span>                 :             :     address variableDebtAddress,</span>
+<span id="L608"><span class="lineNum">     608</span>                 :             :     address interestRateStrategyAddress</span>
+<span id="L609"><span class="lineNum">     609</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L610"><span class="lineNum">     610</span>                 :             :     if (</span>
+<span id="L611"><span class="lineNum">     611</span>                 :<span class="tlaGNC">      166016 :       PoolLogic.executeInitReserve(</span></span>
+<span id="L612"><span class="lineNum">     612</span>                 :             :         _reserves,</span>
+<span id="L613"><span class="lineNum">     613</span>                 :             :         _reservesList,</span>
+<span id="L614"><span class="lineNum">     614</span>                 :             :         DataTypes.InitReserveParams({</span>
+<span id="L615"><span class="lineNum">     615</span>                 :             :           asset: asset,</span>
+<span id="L616"><span class="lineNum">     616</span>                 :             :           aTokenAddress: aTokenAddress,</span>
+<span id="L617"><span class="lineNum">     617</span>                 :             :           variableDebtAddress: variableDebtAddress,</span>
+<span id="L618"><span class="lineNum">     618</span>                 :             :           interestRateStrategyAddress: interestRateStrategyAddress,</span>
+<span id="L619"><span class="lineNum">     619</span>                 :             :           reservesCount: _reservesCount,</span>
+<span id="L620"><span class="lineNum">     620</span>                 :             :           maxNumberReserves: MAX_NUMBER_RESERVES()</span>
+<span id="L621"><span class="lineNum">     621</span>                 :             :         })</span>
+<span id="L622"><span class="lineNum">     622</span>                 :             :       )</span>
+<span id="L623"><span class="lineNum">     623</span>                 :             :     ) {</span>
+<span id="L624"><span class="lineNum">     624</span>                 :<span class="tlaGNC">      165016 :       _reservesCount++;</span></span>
+<span id="L625"><span class="lineNum">     625</span>                 :             :     }</span>
+<span id="L626"><span class="lineNum">     626</span>                 :             :   }</span>
+<span id="L627"><span class="lineNum">     627</span>                 :             : </span>
+<span id="L628"><span class="lineNum">     628</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L629"><span class="lineNum">     629</span>                 :             :   function dropReserve(address asset) external virtual override onlyPoolConfigurator {</span>
+<span id="L630"><span class="lineNum">     630</span>                 :<span class="tlaGNC">           7 :     PoolLogic.executeDropReserve(_reserves, _reservesList, asset);</span></span>
+<span id="L631"><span class="lineNum">     631</span>                 :             :   }</span>
+<span id="L632"><span class="lineNum">     632</span>                 :             : </span>
+<span id="L633"><span class="lineNum">     633</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L634"><span class="lineNum">     634</span>                 :             :   function setReserveInterestRateStrategyAddress(</span>
+<span id="L635"><span class="lineNum">     635</span>                 :             :     address asset,</span>
+<span id="L636"><span class="lineNum">     636</span>                 :             :     address rateStrategyAddress</span>
+<span id="L637"><span class="lineNum">     637</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L638"><span class="lineNum">     638</span>                 :<span class="tlaGNC">        4046 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L639"><span class="lineNum">     639</span>                 :<span class="tlaGNC">        2046 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L640"><span class="lineNum">     640</span>                 :             : </span>
+<span id="L641"><span class="lineNum">     641</span>                 :<span class="tlaGNC">          46 :     _reserves[asset].interestRateStrategyAddress = rateStrategyAddress;</span></span>
+<span id="L642"><span class="lineNum">     642</span>                 :             :   }</span>
+<span id="L643"><span class="lineNum">     643</span>                 :             : </span>
+<span id="L644"><span class="lineNum">     644</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L645"><span class="lineNum">     645</span>                 :             :   function syncIndexesState(address asset) external virtual override onlyPoolConfigurator {</span>
+<span id="L646"><span class="lineNum">     646</span>                 :<span class="tlaGNC">        1994 :     DataTypes.ReserveData storage reserve = _reserves[asset];</span></span>
+<span id="L647"><span class="lineNum">     647</span>                 :<span class="tlaGNC">        1994 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L648"><span class="lineNum">     648</span>                 :             : </span>
+<span id="L649"><span class="lineNum">     649</span>                 :<span class="tlaGNC">        1994 :     reserve.updateState(reserveCache);</span></span>
+<span id="L650"><span class="lineNum">     650</span>                 :             :   }</span>
+<span id="L651"><span class="lineNum">     651</span>                 :             : </span>
+<span id="L652"><span class="lineNum">     652</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L653"><span class="lineNum">     653</span>                 :             :   function syncRatesState(address asset) external virtual override onlyPoolConfigurator {</span>
+<span id="L654"><span class="lineNum">     654</span>                 :<span class="tlaGNC">        1994 :     DataTypes.ReserveData storage reserve = _reserves[asset];</span></span>
+<span id="L655"><span class="lineNum">     655</span>                 :<span class="tlaGNC">        1994 :     DataTypes.ReserveCache memory reserveCache = reserve.cache();</span></span>
+<span id="L656"><span class="lineNum">     656</span>                 :             : </span>
+<span id="L657"><span class="lineNum">     657</span>                 :<span class="tlaGNC">        1994 :     ReserveLogic.updateInterestRatesAndVirtualBalance(reserve, reserveCache, asset, 0, 0);</span></span>
+<span id="L658"><span class="lineNum">     658</span>                 :             :   }</span>
+<span id="L659"><span class="lineNum">     659</span>                 :             : </span>
+<span id="L660"><span class="lineNum">     660</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L661"><span class="lineNum">     661</span>                 :             :   function setConfiguration(</span>
+<span id="L662"><span class="lineNum">     662</span>                 :             :     address asset,</span>
+<span id="L663"><span class="lineNum">     663</span>                 :             :     DataTypes.ReserveConfigurationMap calldata configuration</span>
+<span id="L664"><span class="lineNum">     664</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L665"><span class="lineNum">     665</span>                 :<span class="tlaGNC">      208599 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L666"><span class="lineNum">     666</span>                 :<span class="tlaGNC">      208599 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L667"><span class="lineNum">     667</span>                 :<span class="tlaGNC">      208599 :     _reserves[asset].configuration = configuration;</span></span>
+<span id="L668"><span class="lineNum">     668</span>                 :             :   }</span>
+<span id="L669"><span class="lineNum">     669</span>                 :             : </span>
+<span id="L670"><span class="lineNum">     670</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L671"><span class="lineNum">     671</span>                 :             :   function updateBridgeProtocolFee(</span>
+<span id="L672"><span class="lineNum">     672</span>                 :             :     uint256 protocolFee</span>
+<span id="L673"><span class="lineNum">     673</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L674"><span class="lineNum">     674</span>                 :<span class="tlaGNC">          13 :     _bridgeProtocolFee = protocolFee;</span></span>
+<span id="L675"><span class="lineNum">     675</span>                 :             :   }</span>
+<span id="L676"><span class="lineNum">     676</span>                 :             : </span>
+<span id="L677"><span class="lineNum">     677</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L678"><span class="lineNum">     678</span>                 :             :   function updateFlashloanPremiums(</span>
+<span id="L679"><span class="lineNum">     679</span>                 :             :     uint128 flashLoanPremiumTotal,</span>
+<span id="L680"><span class="lineNum">     680</span>                 :             :     uint128 flashLoanPremiumToProtocol</span>
+<span id="L681"><span class="lineNum">     681</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L682"><span class="lineNum">     682</span>                 :<span class="tlaGNC">        1362 :     _flashLoanPremiumTotal = flashLoanPremiumTotal;</span></span>
+<span id="L683"><span class="lineNum">     683</span>                 :<span class="tlaGNC">        1362 :     _flashLoanPremiumToProtocol = flashLoanPremiumToProtocol;</span></span>
+<span id="L684"><span class="lineNum">     684</span>                 :             :   }</span>
+<span id="L685"><span class="lineNum">     685</span>                 :             : </span>
+<span id="L686"><span class="lineNum">     686</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L687"><span class="lineNum">     687</span>                 :             :   function configureEModeCategory(</span>
+<span id="L688"><span class="lineNum">     688</span>                 :             :     uint8 id,</span>
+<span id="L689"><span class="lineNum">     689</span>                 :             :     DataTypes.EModeCategoryBaseConfiguration memory category</span>
+<span id="L690"><span class="lineNum">     690</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L691"><span class="lineNum">     691</span>                 :             :     // category 0 is reserved for volatile heterogeneous assets and it's always disabled</span>
+<span id="L692"><span class="lineNum">     692</span>                 :<span class="tlaGNC">       10029 :     require(id != 0, Errors.EMODE_CATEGORY_RESERVED);</span></span>
+<span id="L693"><span class="lineNum">     693</span>                 :<span class="tlaGNC">       10029 :     _eModeCategories[id].ltv = category.ltv;</span></span>
+<span id="L694"><span class="lineNum">     694</span>                 :<span class="tlaGNC">       10029 :     _eModeCategories[id].liquidationThreshold = category.liquidationThreshold;</span></span>
+<span id="L695"><span class="lineNum">     695</span>                 :<span class="tlaGNC">       10029 :     _eModeCategories[id].liquidationBonus = category.liquidationBonus;</span></span>
+<span id="L696"><span class="lineNum">     696</span>                 :<span class="tlaGNC">       10029 :     _eModeCategories[id].label = category.label;</span></span>
 <span id="L697"><span class="lineNum">     697</span>                 :             :   }</span>
 <span id="L698"><span class="lineNum">     698</span>                 :             : </span>
 <span id="L699"><span class="lineNum">     699</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L700"><span class="lineNum">     700</span>                 :<span class="tlaGNC">       38058 :   function setConfiguration(</span></span>
-<span id="L701"><span class="lineNum">     701</span>                 :             :     address asset,</span>
-<span id="L702"><span class="lineNum">     702</span>                 :             :     DataTypes.ReserveConfigurationMap calldata configuration</span>
+<span id="L700"><span class="lineNum">     700</span>                 :             :   function configureEModeCategoryCollateralBitmap(</span>
+<span id="L701"><span class="lineNum">     701</span>                 :             :     uint8 id,</span>
+<span id="L702"><span class="lineNum">     702</span>                 :             :     uint128 collateralBitmap</span>
 <span id="L703"><span class="lineNum">     703</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L704"><span class="lineNum">     704</span>                 :<span class="tlaGNC">       72116 :     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
-<span id="L705"><span class="lineNum">     705</span>                 :<span class="tlaGNC">       72116 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
-<span id="L706"><span class="lineNum">     706</span>                 :<span class="tlaGNC">       72116 :     _reserves[asset].configuration = configuration;</span></span>
+<span id="L704"><span class="lineNum">     704</span>                 :             :     // category 0 is reserved for volatile heterogeneous assets and it's always disabled</span>
+<span id="L705"><span class="lineNum">     705</span>                 :<span class="tlaGNC">       10039 :     require(id != 0, Errors.EMODE_CATEGORY_RESERVED);</span></span>
+<span id="L706"><span class="lineNum">     706</span>                 :<span class="tlaGNC">       10039 :     _eModeCategories[id].collateralBitmap = collateralBitmap;</span></span>
 <span id="L707"><span class="lineNum">     707</span>                 :             :   }</span>
 <span id="L708"><span class="lineNum">     708</span>                 :             : </span>
 <span id="L709"><span class="lineNum">     709</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L710"><span class="lineNum">     710</span>                 :<span class="tlaGNC">        2013 :   function updateBridgeProtocolFee(</span></span>
-<span id="L711"><span class="lineNum">     711</span>                 :             :     uint256 protocolFee</span>
-<span id="L712"><span class="lineNum">     712</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L713"><span class="lineNum">     713</span>                 :<span class="tlaGNC">          26 :     _bridgeProtocolFee = protocolFee;</span></span>
-<span id="L714"><span class="lineNum">     714</span>                 :             :   }</span>
-<span id="L715"><span class="lineNum">     715</span>                 :             : </span>
-<span id="L716"><span class="lineNum">     716</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L717"><span class="lineNum">     717</span>                 :<span class="tlaGNC">        3212 :   function updateFlashloanPremiums(</span></span>
-<span id="L718"><span class="lineNum">     718</span>                 :             :     uint128 flashLoanPremiumTotal,</span>
-<span id="L719"><span class="lineNum">     719</span>                 :             :     uint128 flashLoanPremiumToProtocol</span>
-<span id="L720"><span class="lineNum">     720</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L721"><span class="lineNum">     721</span>                 :<span class="tlaGNC">        2424 :     _flashLoanPremiumTotal = flashLoanPremiumTotal;</span></span>
-<span id="L722"><span class="lineNum">     722</span>                 :<span class="tlaGNC">        2424 :     _flashLoanPremiumToProtocol = flashLoanPremiumToProtocol;</span></span>
-<span id="L723"><span class="lineNum">     723</span>                 :             :   }</span>
-<span id="L724"><span class="lineNum">     724</span>                 :             : </span>
-<span id="L725"><span class="lineNum">     725</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L726"><span class="lineNum">     726</span>                 :<span class="tlaGNC">        2027 :   function configureEModeCategory(</span></span>
-<span id="L727"><span class="lineNum">     727</span>                 :             :     uint8 id,</span>
-<span id="L728"><span class="lineNum">     728</span>                 :             :     DataTypes.EModeCategory memory category</span>
-<span id="L729"><span class="lineNum">     729</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L730"><span class="lineNum">     730</span>                 :             :     // category 0 is reserved for volatile heterogeneous assets and it's always disabled</span>
-<span id="L731"><span class="lineNum">     731</span>                 :<span class="tlaGNC">          54 :     require(id != 0, Errors.EMODE_CATEGORY_RESERVED);</span></span>
-<span id="L732"><span class="lineNum">     732</span>                 :<span class="tlaGNC">          54 :     _eModeCategories[id] = category;</span></span>
-<span id="L733"><span class="lineNum">     733</span>                 :             :   }</span>
-<span id="L734"><span class="lineNum">     734</span>                 :             : </span>
-<span id="L735"><span class="lineNum">     735</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L736"><span class="lineNum">     736</span>                 :<span class="tlaGNC">          46 :   function getEModeCategoryData(</span></span>
-<span id="L737"><span class="lineNum">     737</span>                 :             :     uint8 id</span>
-<span id="L738"><span class="lineNum">     738</span>                 :             :   ) external view virtual override returns (DataTypes.EModeCategory memory) {</span>
-<span id="L739"><span class="lineNum">     739</span>                 :<span class="tlaGNC">          92 :     return _eModeCategories[id];</span></span>
-<span id="L740"><span class="lineNum">     740</span>                 :             :   }</span>
-<span id="L741"><span class="lineNum">     741</span>                 :             : </span>
-<span id="L742"><span class="lineNum">     742</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L743"><span class="lineNum">     743</span>                 :<span class="tlaGNC">          17 :   function setUserEMode(uint8 categoryId) external virtual override {</span></span>
-<span id="L744"><span class="lineNum">     744</span>                 :<span class="tlaGNC">          34 :     EModeLogic.executeSetUserEMode(</span></span>
-<span id="L745"><span class="lineNum">     745</span>                 :             :       _reserves,</span>
-<span id="L746"><span class="lineNum">     746</span>                 :             :       _reservesList,</span>
-<span id="L747"><span class="lineNum">     747</span>                 :             :       _eModeCategories,</span>
-<span id="L748"><span class="lineNum">     748</span>                 :             :       _usersEModeCategory,</span>
-<span id="L749"><span class="lineNum">     749</span>                 :             :       _usersConfig[msg.sender],</span>
-<span id="L750"><span class="lineNum">     750</span>                 :             :       DataTypes.ExecuteSetUserEModeParams({</span>
-<span id="L751"><span class="lineNum">     751</span>                 :             :         reservesCount: _reservesCount,</span>
-<span id="L752"><span class="lineNum">     752</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
-<span id="L753"><span class="lineNum">     753</span>                 :             :         categoryId: categoryId</span>
-<span id="L754"><span class="lineNum">     754</span>                 :             :       })</span>
-<span id="L755"><span class="lineNum">     755</span>                 :             :     );</span>
-<span id="L756"><span class="lineNum">     756</span>                 :             :   }</span>
-<span id="L757"><span class="lineNum">     757</span>                 :             : </span>
-<span id="L758"><span class="lineNum">     758</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L759"><span class="lineNum">     759</span>                 :<span class="tlaGNC">        3012 :   function getUserEMode(address user) external view virtual override returns (uint256) {</span></span>
-<span id="L760"><span class="lineNum">     760</span>                 :<span class="tlaGNC">        6024 :     return _usersEModeCategory[user];</span></span>
-<span id="L761"><span class="lineNum">     761</span>                 :             :   }</span>
-<span id="L762"><span class="lineNum">     762</span>                 :             : </span>
-<span id="L763"><span class="lineNum">     763</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L764"><span class="lineNum">     764</span>                 :<span class="tlaGNC">        3751 :   function resetIsolationModeTotalDebt(</span></span>
-<span id="L765"><span class="lineNum">     765</span>                 :             :     address asset</span>
-<span id="L766"><span class="lineNum">     766</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L767"><span class="lineNum">     767</span>                 :<span class="tlaGNC">        3502 :     PoolLogic.executeResetIsolationModeTotalDebt(_reserves, asset);</span></span>
-<span id="L768"><span class="lineNum">     768</span>                 :             :   }</span>
-<span id="L769"><span class="lineNum">     769</span>                 :             : </span>
-<span id="L770"><span class="lineNum">     770</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L771"><span class="lineNum">     771</span>                 :<span class="tlaGNC">        5512 :   function getLiquidationGracePeriod(address asset) external virtual override returns (uint40) {</span></span>
-<span id="L772"><span class="lineNum">     772</span>                 :<span class="tlaGNC">       11024 :     return _reserves[asset].liquidationGracePeriodUntil;</span></span>
-<span id="L773"><span class="lineNum">     773</span>                 :             :   }</span>
-<span id="L774"><span class="lineNum">     774</span>                 :             : </span>
-<span id="L775"><span class="lineNum">     775</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L776"><span class="lineNum">     776</span>                 :<span class="tlaGNC">       13028 :   function setLiquidationGracePeriod(</span></span>
-<span id="L777"><span class="lineNum">     777</span>                 :             :     address asset,</span>
-<span id="L778"><span class="lineNum">     778</span>                 :             :     uint40 until</span>
-<span id="L779"><span class="lineNum">     779</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
-<span id="L780"><span class="lineNum">     780</span>                 :<span class="tlaGNC">       22056 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
-<span id="L781"><span class="lineNum">     781</span>                 :<span class="tlaGNC">       18056 :     PoolLogic.executeSetLiquidationGracePeriod(_reserves, asset, until);</span></span>
-<span id="L782"><span class="lineNum">     782</span>                 :             :   }</span>
-<span id="L783"><span class="lineNum">     783</span>                 :             : </span>
-<span id="L784"><span class="lineNum">     784</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L785"><span class="lineNum">     785</span>                 :<span class="tlaGNC">        2000 :   function rescueTokens(</span></span>
-<span id="L786"><span class="lineNum">     786</span>                 :             :     address token,</span>
-<span id="L787"><span class="lineNum">     787</span>                 :             :     address to,</span>
-<span id="L788"><span class="lineNum">     788</span>                 :             :     uint256 amount</span>
-<span id="L789"><span class="lineNum">     789</span>                 :             :   ) external virtual override onlyPoolAdmin {</span>
-<span id="L790"><span class="lineNum">     790</span>                 :<span class="tlaGNC">        4000 :     PoolLogic.executeRescueTokens(token, to, amount);</span></span>
-<span id="L791"><span class="lineNum">     791</span>                 :             :   }</span>
-<span id="L792"><span class="lineNum">     792</span>                 :             : </span>
-<span id="L793"><span class="lineNum">     793</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L794"><span class="lineNum">     794</span>                 :             :   /// @dev Deprecated: maintained for compatibility purposes</span>
-<span id="L795"><span class="lineNum">     795</span>                 :<span class="tlaGNC">          17 :   function deposit(</span></span>
+<span id="L710"><span class="lineNum">     710</span>                 :             :   function configureEModeCategoryBorrowableBitmap(</span>
+<span id="L711"><span class="lineNum">     711</span>                 :             :     uint8 id,</span>
+<span id="L712"><span class="lineNum">     712</span>                 :             :     uint128 borrowableBitmap</span>
+<span id="L713"><span class="lineNum">     713</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L714"><span class="lineNum">     714</span>                 :             :     // category 0 is reserved for volatile heterogeneous assets and it's always disabled</span>
+<span id="L715"><span class="lineNum">     715</span>                 :<span class="tlaGNC">        7010 :     require(id != 0, Errors.EMODE_CATEGORY_RESERVED);</span></span>
+<span id="L716"><span class="lineNum">     716</span>                 :<span class="tlaGNC">        7010 :     _eModeCategories[id].borrowableBitmap = borrowableBitmap;</span></span>
+<span id="L717"><span class="lineNum">     717</span>                 :             :   }</span>
+<span id="L718"><span class="lineNum">     718</span>                 :             : </span>
+<span id="L719"><span class="lineNum">     719</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L720"><span class="lineNum">     720</span>                 :             :   function getEModeCategoryData(</span>
+<span id="L721"><span class="lineNum">     721</span>                 :             :     uint8 id</span>
+<span id="L722"><span class="lineNum">     722</span>                 :             :   ) external view virtual override returns (DataTypes.EModeCategoryLegacy memory) {</span>
+<span id="L723"><span class="lineNum">     723</span>                 :<span class="tlaGNC">           3 :     DataTypes.EModeCategory memory category = _eModeCategories[id];</span></span>
+<span id="L724"><span class="lineNum">     724</span>                 :<span class="tlaGNC">           3 :     return</span></span>
+<span id="L725"><span class="lineNum">     725</span>                 :             :       DataTypes.EModeCategoryLegacy({</span>
+<span id="L726"><span class="lineNum">     726</span>                 :             :         ltv: category.ltv,</span>
+<span id="L727"><span class="lineNum">     727</span>                 :             :         liquidationThreshold: category.liquidationThreshold,</span>
+<span id="L728"><span class="lineNum">     728</span>                 :             :         liquidationBonus: category.liquidationBonus,</span>
+<span id="L729"><span class="lineNum">     729</span>                 :             :         priceSource: address(0),</span>
+<span id="L730"><span class="lineNum">     730</span>                 :             :         label: category.label</span>
+<span id="L731"><span class="lineNum">     731</span>                 :             :       });</span>
+<span id="L732"><span class="lineNum">     732</span>                 :             :   }</span>
+<span id="L733"><span class="lineNum">     733</span>                 :             : </span>
+<span id="L734"><span class="lineNum">     734</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L735"><span class="lineNum">     735</span>                 :             :   function getEModeCategoryCollateralConfig(</span>
+<span id="L736"><span class="lineNum">     736</span>                 :             :     uint8 id</span>
+<span id="L737"><span class="lineNum">     737</span>                 :             :   ) external view returns (DataTypes.CollateralConfig memory) {</span>
+<span id="L738"><span class="lineNum">     738</span>                 :<span class="tlaGNC">         110 :     return</span></span>
+<span id="L739"><span class="lineNum">     739</span>                 :             :       DataTypes.CollateralConfig({</span>
+<span id="L740"><span class="lineNum">     740</span>                 :             :         ltv: _eModeCategories[id].ltv,</span>
+<span id="L741"><span class="lineNum">     741</span>                 :             :         liquidationThreshold: _eModeCategories[id].liquidationThreshold,</span>
+<span id="L742"><span class="lineNum">     742</span>                 :             :         liquidationBonus: _eModeCategories[id].liquidationBonus</span>
+<span id="L743"><span class="lineNum">     743</span>                 :             :       });</span>
+<span id="L744"><span class="lineNum">     744</span>                 :             :   }</span>
+<span id="L745"><span class="lineNum">     745</span>                 :             : </span>
+<span id="L746"><span class="lineNum">     746</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L747"><span class="lineNum">     747</span>                 :             :   function getEModeCategoryLabel(uint8 id) external view returns (string memory) {</span>
+<span id="L748"><span class="lineNum">     748</span>                 :<span class="tlaGNC">          25 :     return _eModeCategories[id].label;</span></span>
+<span id="L749"><span class="lineNum">     749</span>                 :             :   }</span>
+<span id="L750"><span class="lineNum">     750</span>                 :             : </span>
+<span id="L751"><span class="lineNum">     751</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L752"><span class="lineNum">     752</span>                 :             :   function getEModeCategoryCollateralBitmap(uint8 id) external view returns (uint128) {</span>
+<span id="L753"><span class="lineNum">     753</span>                 :<span class="tlaGNC">       10064 :     return _eModeCategories[id].collateralBitmap;</span></span>
+<span id="L754"><span class="lineNum">     754</span>                 :             :   }</span>
+<span id="L755"><span class="lineNum">     755</span>                 :             : </span>
+<span id="L756"><span class="lineNum">     756</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L757"><span class="lineNum">     757</span>                 :             :   function getEModeCategoryBorrowableBitmap(uint8 id) external view returns (uint128) {</span>
+<span id="L758"><span class="lineNum">     758</span>                 :<span class="tlaGNC">        7035 :     return _eModeCategories[id].borrowableBitmap;</span></span>
+<span id="L759"><span class="lineNum">     759</span>                 :             :   }</span>
+<span id="L760"><span class="lineNum">     760</span>                 :             : </span>
+<span id="L761"><span class="lineNum">     761</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L762"><span class="lineNum">     762</span>                 :             :   function setUserEMode(uint8 categoryId) external virtual override {</span>
+<span id="L763"><span class="lineNum">     763</span>                 :<span class="tlaGNC">       10023 :     EModeLogic.executeSetUserEMode(</span></span>
+<span id="L764"><span class="lineNum">     764</span>                 :             :       _reserves,</span>
+<span id="L765"><span class="lineNum">     765</span>                 :             :       _reservesList,</span>
+<span id="L766"><span class="lineNum">     766</span>                 :             :       _eModeCategories,</span>
+<span id="L767"><span class="lineNum">     767</span>                 :             :       _usersEModeCategory,</span>
+<span id="L768"><span class="lineNum">     768</span>                 :             :       _usersConfig[msg.sender],</span>
+<span id="L769"><span class="lineNum">     769</span>                 :             :       DataTypes.ExecuteSetUserEModeParams({</span>
+<span id="L770"><span class="lineNum">     770</span>                 :             :         reservesCount: _reservesCount,</span>
+<span id="L771"><span class="lineNum">     771</span>                 :             :         oracle: ADDRESSES_PROVIDER.getPriceOracle(),</span>
+<span id="L772"><span class="lineNum">     772</span>                 :             :         categoryId: categoryId</span>
+<span id="L773"><span class="lineNum">     773</span>                 :             :       })</span>
+<span id="L774"><span class="lineNum">     774</span>                 :             :     );</span>
+<span id="L775"><span class="lineNum">     775</span>                 :             :   }</span>
+<span id="L776"><span class="lineNum">     776</span>                 :             : </span>
+<span id="L777"><span class="lineNum">     777</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L778"><span class="lineNum">     778</span>                 :             :   function getUserEMode(address user) external view virtual override returns (uint256) {</span>
+<span id="L779"><span class="lineNum">     779</span>                 :<span class="tlaGNC">        5016 :     return _usersEModeCategory[user];</span></span>
+<span id="L780"><span class="lineNum">     780</span>                 :             :   }</span>
+<span id="L781"><span class="lineNum">     781</span>                 :             : </span>
+<span id="L782"><span class="lineNum">     782</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L783"><span class="lineNum">     783</span>                 :             :   function resetIsolationModeTotalDebt(</span>
+<span id="L784"><span class="lineNum">     784</span>                 :             :     address asset</span>
+<span id="L785"><span class="lineNum">     785</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L786"><span class="lineNum">     786</span>                 :<span class="tlaGNC">        1951 :     PoolLogic.executeResetIsolationModeTotalDebt(_reserves, asset);</span></span>
+<span id="L787"><span class="lineNum">     787</span>                 :             :   }</span>
+<span id="L788"><span class="lineNum">     788</span>                 :             : </span>
+<span id="L789"><span class="lineNum">     789</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L790"><span class="lineNum">     790</span>                 :             :   function getLiquidationGracePeriod(address asset) external virtual override returns (uint40) {</span>
+<span id="L791"><span class="lineNum">     791</span>                 :<span class="tlaGNC">        8756 :     return _reserves[asset].liquidationGracePeriodUntil;</span></span>
+<span id="L792"><span class="lineNum">     792</span>                 :             :   }</span>
+<span id="L793"><span class="lineNum">     793</span>                 :             : </span>
+<span id="L794"><span class="lineNum">     794</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L795"><span class="lineNum">     795</span>                 :             :   function setLiquidationGracePeriod(</span>
 <span id="L796"><span class="lineNum">     796</span>                 :             :     address asset,</span>
-<span id="L797"><span class="lineNum">     797</span>                 :             :     uint256 amount,</span>
-<span id="L798"><span class="lineNum">     798</span>                 :             :     address onBehalfOf,</span>
-<span id="L799"><span class="lineNum">     799</span>                 :             :     uint16 referralCode</span>
-<span id="L800"><span class="lineNum">     800</span>                 :             :   ) external virtual override {</span>
-<span id="L801"><span class="lineNum">     801</span>                 :<span class="tlaGNC">          34 :     SupplyLogic.executeSupply(</span></span>
-<span id="L802"><span class="lineNum">     802</span>                 :             :       _reserves,</span>
-<span id="L803"><span class="lineNum">     803</span>                 :             :       _reservesList,</span>
-<span id="L804"><span class="lineNum">     804</span>                 :             :       _usersConfig[onBehalfOf],</span>
-<span id="L805"><span class="lineNum">     805</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
-<span id="L806"><span class="lineNum">     806</span>                 :             :         asset: asset,</span>
-<span id="L807"><span class="lineNum">     807</span>                 :             :         amount: amount,</span>
-<span id="L808"><span class="lineNum">     808</span>                 :             :         onBehalfOf: onBehalfOf,</span>
-<span id="L809"><span class="lineNum">     809</span>                 :             :         referralCode: referralCode</span>
-<span id="L810"><span class="lineNum">     810</span>                 :             :       })</span>
-<span id="L811"><span class="lineNum">     811</span>                 :             :     );</span>
-<span id="L812"><span class="lineNum">     812</span>                 :             :   }</span>
-<span id="L813"><span class="lineNum">     813</span>                 :             : </span>
-<span id="L814"><span class="lineNum">     814</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L815"><span class="lineNum">     815</span>                 :<span class="tlaGNC">           2 :   function getFlashLoanLogic() external pure returns (address) {</span></span>
-<span id="L816"><span class="lineNum">     816</span>                 :<span class="tlaGNC">           6 :     return address(FlashLoanLogic);</span></span>
-<span id="L817"><span class="lineNum">     817</span>                 :             :   }</span>
-<span id="L818"><span class="lineNum">     818</span>                 :             : </span>
-<span id="L819"><span class="lineNum">     819</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L820"><span class="lineNum">     820</span>                 :<span class="tlaGNC">           2 :   function getBorrowLogic() external pure returns (address) {</span></span>
-<span id="L821"><span class="lineNum">     821</span>                 :<span class="tlaGNC">           6 :     return address(BorrowLogic);</span></span>
-<span id="L822"><span class="lineNum">     822</span>                 :             :   }</span>
-<span id="L823"><span class="lineNum">     823</span>                 :             : </span>
-<span id="L824"><span class="lineNum">     824</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L825"><span class="lineNum">     825</span>                 :<span class="tlaGNC">           2 :   function getBridgeLogic() external pure returns (address) {</span></span>
-<span id="L826"><span class="lineNum">     826</span>                 :<span class="tlaGNC">           6 :     return address(BridgeLogic);</span></span>
-<span id="L827"><span class="lineNum">     827</span>                 :             :   }</span>
-<span id="L828"><span class="lineNum">     828</span>                 :             : </span>
-<span id="L829"><span class="lineNum">     829</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L830"><span class="lineNum">     830</span>                 :<span class="tlaGNC">           2 :   function getEModeLogic() external pure returns (address) {</span></span>
-<span id="L831"><span class="lineNum">     831</span>                 :<span class="tlaGNC">           6 :     return address(EModeLogic);</span></span>
-<span id="L832"><span class="lineNum">     832</span>                 :             :   }</span>
-<span id="L833"><span class="lineNum">     833</span>                 :             : </span>
-<span id="L834"><span class="lineNum">     834</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L835"><span class="lineNum">     835</span>                 :<span class="tlaGNC">           2 :   function getLiquidationLogic() external pure returns (address) {</span></span>
-<span id="L836"><span class="lineNum">     836</span>                 :<span class="tlaGNC">           6 :     return address(LiquidationLogic);</span></span>
-<span id="L837"><span class="lineNum">     837</span>                 :             :   }</span>
-<span id="L838"><span class="lineNum">     838</span>                 :             : </span>
-<span id="L839"><span class="lineNum">     839</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L840"><span class="lineNum">     840</span>                 :<span class="tlaGNC">           2 :   function getPoolLogic() external pure returns (address) {</span></span>
-<span id="L841"><span class="lineNum">     841</span>                 :<span class="tlaGNC">           6 :     return address(PoolLogic);</span></span>
-<span id="L842"><span class="lineNum">     842</span>                 :             :   }</span>
-<span id="L843"><span class="lineNum">     843</span>                 :             : </span>
-<span id="L844"><span class="lineNum">     844</span>                 :             :   /// @inheritdoc IPool</span>
-<span id="L845"><span class="lineNum">     845</span>                 :<span class="tlaGNC">           2 :   function getSupplyLogic() external pure returns (address) {</span></span>
-<span id="L846"><span class="lineNum">     846</span>                 :<span class="tlaGNC">           6 :     return address(SupplyLogic);</span></span>
-<span id="L847"><span class="lineNum">     847</span>                 :             :   }</span>
-<span id="L848"><span class="lineNum">     848</span>                 :             : }</span>
+<span id="L797"><span class="lineNum">     797</span>                 :             :     uint40 until</span>
+<span id="L798"><span class="lineNum">     798</span>                 :             :   ) external virtual override onlyPoolConfigurator {</span>
+<span id="L799"><span class="lineNum">     799</span>                 :<span class="tlaGNC">       14412 :     require(_reserves[asset].id != 0 || _reservesList[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L800"><span class="lineNum">     800</span>                 :<span class="tlaGNC">       12412 :     PoolLogic.executeSetLiquidationGracePeriod(_reserves, asset, until);</span></span>
+<span id="L801"><span class="lineNum">     801</span>                 :             :   }</span>
+<span id="L802"><span class="lineNum">     802</span>                 :             : </span>
+<span id="L803"><span class="lineNum">     803</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L804"><span class="lineNum">     804</span>                 :             :   function rescueTokens(</span>
+<span id="L805"><span class="lineNum">     805</span>                 :             :     address token,</span>
+<span id="L806"><span class="lineNum">     806</span>                 :             :     address to,</span>
+<span id="L807"><span class="lineNum">     807</span>                 :             :     uint256 amount</span>
+<span id="L808"><span class="lineNum">     808</span>                 :             :   ) external virtual override onlyPoolAdmin {</span>
+<span id="L809"><span class="lineNum">     809</span>                 :<span class="tlaGNC">        2000 :     PoolLogic.executeRescueTokens(token, to, amount);</span></span>
+<span id="L810"><span class="lineNum">     810</span>                 :             :   }</span>
+<span id="L811"><span class="lineNum">     811</span>                 :             : </span>
+<span id="L812"><span class="lineNum">     812</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L813"><span class="lineNum">     813</span>                 :             :   /// @dev Deprecated: maintained for compatibility purposes</span>
+<span id="L814"><span class="lineNum">     814</span>                 :             :   function deposit(</span>
+<span id="L815"><span class="lineNum">     815</span>                 :             :     address asset,</span>
+<span id="L816"><span class="lineNum">     816</span>                 :             :     uint256 amount,</span>
+<span id="L817"><span class="lineNum">     817</span>                 :             :     address onBehalfOf,</span>
+<span id="L818"><span class="lineNum">     818</span>                 :             :     uint16 referralCode</span>
+<span id="L819"><span class="lineNum">     819</span>                 :             :   ) external virtual override {</span>
+<span id="L820"><span class="lineNum">     820</span>                 :<span class="tlaGNC">       20025 :     SupplyLogic.executeSupply(</span></span>
+<span id="L821"><span class="lineNum">     821</span>                 :             :       _reserves,</span>
+<span id="L822"><span class="lineNum">     822</span>                 :             :       _reservesList,</span>
+<span id="L823"><span class="lineNum">     823</span>                 :             :       _usersConfig[onBehalfOf],</span>
+<span id="L824"><span class="lineNum">     824</span>                 :             :       DataTypes.ExecuteSupplyParams({</span>
+<span id="L825"><span class="lineNum">     825</span>                 :             :         asset: asset,</span>
+<span id="L826"><span class="lineNum">     826</span>                 :             :         amount: amount,</span>
+<span id="L827"><span class="lineNum">     827</span>                 :             :         onBehalfOf: onBehalfOf,</span>
+<span id="L828"><span class="lineNum">     828</span>                 :             :         referralCode: referralCode</span>
+<span id="L829"><span class="lineNum">     829</span>                 :             :       })</span>
+<span id="L830"><span class="lineNum">     830</span>                 :             :     );</span>
+<span id="L831"><span class="lineNum">     831</span>                 :             :   }</span>
+<span id="L832"><span class="lineNum">     832</span>                 :             : </span>
+<span id="L833"><span class="lineNum">     833</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L834"><span class="lineNum">     834</span>                 :             :   function getFlashLoanLogic() external pure returns (address) {</span>
+<span id="L835"><span class="lineNum">     835</span>                 :<span class="tlaGNC">           2 :     return address(FlashLoanLogic);</span></span>
+<span id="L836"><span class="lineNum">     836</span>                 :             :   }</span>
+<span id="L837"><span class="lineNum">     837</span>                 :             : </span>
+<span id="L838"><span class="lineNum">     838</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L839"><span class="lineNum">     839</span>                 :             :   function getBorrowLogic() external pure returns (address) {</span>
+<span id="L840"><span class="lineNum">     840</span>                 :<span class="tlaGNC">           2 :     return address(BorrowLogic);</span></span>
+<span id="L841"><span class="lineNum">     841</span>                 :             :   }</span>
+<span id="L842"><span class="lineNum">     842</span>                 :             : </span>
+<span id="L843"><span class="lineNum">     843</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L844"><span class="lineNum">     844</span>                 :             :   function getBridgeLogic() external pure returns (address) {</span>
+<span id="L845"><span class="lineNum">     845</span>                 :<span class="tlaGNC">           2 :     return address(BridgeLogic);</span></span>
+<span id="L846"><span class="lineNum">     846</span>                 :             :   }</span>
+<span id="L847"><span class="lineNum">     847</span>                 :             : </span>
+<span id="L848"><span class="lineNum">     848</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L849"><span class="lineNum">     849</span>                 :             :   function getEModeLogic() external pure returns (address) {</span>
+<span id="L850"><span class="lineNum">     850</span>                 :<span class="tlaGNC">           2 :     return address(EModeLogic);</span></span>
+<span id="L851"><span class="lineNum">     851</span>                 :             :   }</span>
+<span id="L852"><span class="lineNum">     852</span>                 :             : </span>
+<span id="L853"><span class="lineNum">     853</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L854"><span class="lineNum">     854</span>                 :             :   function getLiquidationLogic() external pure returns (address) {</span>
+<span id="L855"><span class="lineNum">     855</span>                 :<span class="tlaGNC">           2 :     return address(LiquidationLogic);</span></span>
+<span id="L856"><span class="lineNum">     856</span>                 :             :   }</span>
+<span id="L857"><span class="lineNum">     857</span>                 :             : </span>
+<span id="L858"><span class="lineNum">     858</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L859"><span class="lineNum">     859</span>                 :             :   function getPoolLogic() external pure returns (address) {</span>
+<span id="L860"><span class="lineNum">     860</span>                 :<span class="tlaGNC">           2 :     return address(PoolLogic);</span></span>
+<span id="L861"><span class="lineNum">     861</span>                 :             :   }</span>
+<span id="L862"><span class="lineNum">     862</span>                 :             : </span>
+<span id="L863"><span class="lineNum">     863</span>                 :             :   /// @inheritdoc IPool</span>
+<span id="L864"><span class="lineNum">     864</span>                 :             :   function getSupplyLogic() external pure returns (address) {</span>
+<span id="L865"><span class="lineNum">     865</span>                 :<span class="tlaGNC">           2 :     return address(SupplyLogic);</span></span>
+<span id="L866"><span class="lineNum">     866</span>                 :             :   }</span>
+<span id="L867"><span class="lineNum">     867</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -924,8 +943,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func-c.html b/report/protocol/pool/PoolConfigurator.sol.func-c.html
similarity index 56%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func-c.html
rename to report/protocol/pool/PoolConfigurator.sol.func-c.html
index 0246f91c..b8fd358e 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func-c.html
+++ b/report/protocol/pool/PoolConfigurator.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/PoolConfigurator.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (<a href="PoolConfigurator.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (<a href="PoolConfigurator.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">96.8&nbsp;%</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">190</td>
             <td class="headerCovTableEntry">190</td>
-            <td class="headerCovTableEntry">184</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
-            <td class="headerCovTableEntry">39</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td></td>
@@ -53,294 +53,322 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolConfigurator.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PoolConfigurator.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L604">PoolConfigurator._onlyEmergencyAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L543">PoolConfigurator.getConfiguratorLogic</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L472">PoolConfigurator.setReserveInterestRateData</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L583">PoolConfigurator._checkNoBorrowers</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L552">PoolConfigurator.getConfiguratorLogic</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L451">PoolConfigurator.setUnbackedMintCap</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L109">PoolConfigurator.updateAToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L498">PoolConfigurator.updateBridgeProtocolFee</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">14</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L116">PoolConfigurator.updateStableDebtToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L547">PoolConfigurator._updateInterestRateStrategy</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">46</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L123">PoolConfigurator.updateVariableDebtToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L100">PoolConfigurator.updateAToken</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L592">PoolConfigurator._checkNoBorrowers</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L107">PoolConfigurator.updateVariableDebtToken</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L556">PoolConfigurator._updateInterestRateStrategy</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L463">PoolConfigurator.setReserveInterestRateData</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1002</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L481">PoolConfigurator.setReserveInterestRateStrategyAddress</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L94">PoolConfigurator.dropReserve</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L103">PoolConfigurator.dropReserve</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L186">PoolConfigurator.setReserveActive</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L460">PoolConfigurator.setUnbackedMintCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L472">PoolConfigurator.setReserveInterestRateStrategyAddress</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">1044</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L217">PoolConfigurator.setReserveActive</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L38">PoolConfigurator.onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L507">PoolConfigurator.updateBridgeProtocolFee</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L522">PoolConfigurator.updateFlashloanPremiumToProtocol</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L386">PoolConfigurator.setEModeCategory</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L509">PoolConfigurator.updateFlashloanPremiumTotal</a></td>
               
-              <td class="coverFnHi">38</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L531">PoolConfigurator.updateFlashloanPremiumToProtocol</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L314">PoolConfigurator.setSiloedBorrowing</a></td>
               
-              <td class="coverFnHi">608</td>
+              <td class="coverFnHi">1949</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L518">PoolConfigurator.updateFlashloanPremiumTotal</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L357">PoolConfigurator.setLiquidationProtocolFee</a></td>
               
-              <td class="coverFnHi">608</td>
+              <td class="coverFnHi">1954</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L633">PoolConfigurator._onlyRiskOrPoolOrEmergencyAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L231">PoolConfigurator.setBorrowableInIsolation</a></td>
               
-              <td class="coverFnHi">1011</td>
+              <td class="coverFnHi">1959</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L226">PoolConfigurator.setReserveFreeze</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L267">PoolConfigurator.disableLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">1011</td>
+              <td class="coverFnHi">2001</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L599">PoolConfigurator._onlyPoolAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L46">PoolConfigurator.onlyEmergencyOrPoolAdmin</a></td>
               
-              <td class="coverFnHi">1256</td>
+              <td class="coverFnHi">2003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L291">PoolConfigurator.setReserveFactor</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L275">PoolConfigurator.setReserveFactor</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">2949</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L205">PoolConfigurator.setReserveFlashLoaning</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L333">PoolConfigurator.setBorrowCap</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">2957</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L330">PoolConfigurator.setSiloedBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L293">PoolConfigurator.setDebtCeiling</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">2964</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L130">PoolConfigurator.setReserveBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L572">PoolConfigurator._checkNoSuppliers</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">2971</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L373">PoolConfigurator.setLiquidationProtocolFee</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L538">PoolConfigurator.getPendingLtv</a></td>
               
-              <td class="coverFnHi">1754</td>
+              <td class="coverFnHi">3003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L349">PoolConfigurator.setBorrowCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L619">PoolConfigurator._onlyRiskOrPoolOrEmergencyAdmins</a></td>
               
-              <td class="coverFnHi">1759</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L254">PoolConfigurator.setBorrowableInIsolation</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L70">PoolConfigurator.onlyRiskOrPoolOrEmergencyAdmins</a></td>
               
-              <td class="coverFnHi">1759</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L361">PoolConfigurator.setSupplyCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L195">PoolConfigurator.setReserveFreeze</a></td>
               
-              <td class="coverFnHi">1762</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L309">PoolConfigurator.setDebtCeiling</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L174">PoolConfigurator.setReserveFlashLoaning</a></td>
               
-              <td class="coverFnHi">1765</td>
+              <td class="coverFnHi">3948</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L581">PoolConfigurator._checkNoSuppliers</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L345">PoolConfigurator.setSupplyCap</a></td>
               
-              <td class="coverFnHi">1774</td>
+              <td class="coverFnHi">3963</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L440">PoolConfigurator.setAssetEModeCategory</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L482">PoolConfigurator.setPoolPause</a></td>
               
-              <td class="coverFnHi">1786</td>
+              <td class="coverFnHi">4003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L191">PoolConfigurator.setReserveStableRateBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L114">PoolConfigurator.setReserveBorrowing</a></td>
               
-              <td class="coverFnHi">1933</td>
+              <td class="coverFnHi">5947</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L547">PoolConfigurator.getPendingLtv</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L62">PoolConfigurator.onlyRiskOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">2003</td>
+              <td class="coverFnHi">7010</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L617">PoolConfigurator._onlyAssetListingOrPoolAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L433">PoolConfigurator.setAssetBorrowableInEMode</a></td>
               
-              <td class="coverFnHi">2592</td>
+              <td class="coverFnHi">7010</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L86">PoolConfigurator.initReserves</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L590">PoolConfigurator._onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">2592</td>
+              <td class="coverFnHi">7396</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L491">PoolConfigurator.setPoolPause</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L603">PoolConfigurator._onlyAssetListingOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">3003</td>
+              <td class="coverFnHi">8651</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L78">PoolConfigurator.initReserves</a></td>
+              
+              <td class="coverFnHi">8651</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L54">PoolConfigurator.onlyAssetListingOrPoolAdmins</a></td>
+              
+              <td class="coverFnHi">8651</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L122">PoolConfigurator.configureReserveAsCollateral</a></td>
+              
+              <td class="coverFnHi">10952</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L370">PoolConfigurator.setEModeCategory</a></td>
+              
+              <td class="coverFnHi">11035</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L141">PoolConfigurator.configureReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L415">PoolConfigurator.setAssetCollateralInEMode</a></td>
               
-              <td class="coverFnHi">4757</td>
+              <td class="coverFnHi">11039</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L265">PoolConfigurator.setReservePause</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L242">PoolConfigurator.setReservePause</a></td>
               
-              <td class="coverFnHi">8891</td>
+              <td class="coverFnHi">14013</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L609">PoolConfigurator._onlyPoolOrEmergencyAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L595">PoolConfigurator._onlyPoolOrEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">14903</td>
+              <td class="coverFnHi">24030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L625">PoolConfigurator._onlyRiskOrPoolAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L611">PoolConfigurator._onlyRiskOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">24323</td>
+              <td class="coverFnHi">70679</td>
               
               
             </tr>
@@ -348,8 +376,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func.html b/report/protocol/pool/PoolConfigurator.sol.func.html
similarity index 56%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func.html
rename to report/protocol/pool/PoolConfigurator.sol.func.html
index 3bc91cd2..5bdd150a 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.func.html
+++ b/report/protocol/pool/PoolConfigurator.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/PoolConfigurator.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (<a href="PoolConfigurator.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (<a href="PoolConfigurator.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">96.8&nbsp;%</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">190</td>
             <td class="headerCovTableEntry">190</td>
-            <td class="headerCovTableEntry">184</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
-            <td class="headerCovTableEntry">39</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td></td>
@@ -53,294 +53,322 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolConfigurator.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PoolConfigurator.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L592">PoolConfigurator._checkNoBorrowers</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L583">PoolConfigurator._checkNoBorrowers</a></td>
               
               <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L581">PoolConfigurator._checkNoSuppliers</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L572">PoolConfigurator._checkNoSuppliers</a></td>
               
-              <td class="coverFnHi">1774</td>
+              <td class="coverFnHi">2971</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L617">PoolConfigurator._onlyAssetListingOrPoolAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L603">PoolConfigurator._onlyAssetListingOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">2592</td>
+              <td class="coverFnHi">8651</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L604">PoolConfigurator._onlyEmergencyAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L590">PoolConfigurator._onlyPoolAdmin</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">7396</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L599">PoolConfigurator._onlyPoolAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L595">PoolConfigurator._onlyPoolOrEmergencyAdmin</a></td>
               
-              <td class="coverFnHi">1256</td>
+              <td class="coverFnHi">24030</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L609">PoolConfigurator._onlyPoolOrEmergencyAdmin</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L611">PoolConfigurator._onlyRiskOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">14903</td>
+              <td class="coverFnHi">70679</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L625">PoolConfigurator._onlyRiskOrPoolAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L619">PoolConfigurator._onlyRiskOrPoolOrEmergencyAdmins</a></td>
               
-              <td class="coverFnHi">24323</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L633">PoolConfigurator._onlyRiskOrPoolOrEmergencyAdmins</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L547">PoolConfigurator._updateInterestRateStrategy</a></td>
               
-              <td class="coverFnHi">1011</td>
+              <td class="coverFnHi">46</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L556">PoolConfigurator._updateInterestRateStrategy</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L122">PoolConfigurator.configureReserveAsCollateral</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">10952</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L141">PoolConfigurator.configureReserveAsCollateral</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L267">PoolConfigurator.disableLiquidationGracePeriod</a></td>
               
-              <td class="coverFnHi">4757</td>
+              <td class="coverFnHi">2001</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L103">PoolConfigurator.dropReserve</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L94">PoolConfigurator.dropReserve</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L552">PoolConfigurator.getConfiguratorLogic</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L543">PoolConfigurator.getConfiguratorLogic</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L547">PoolConfigurator.getPendingLtv</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L538">PoolConfigurator.getPendingLtv</a></td>
               
-              <td class="coverFnHi">2003</td>
+              <td class="coverFnHi">3003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L86">PoolConfigurator.initReserves</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L78">PoolConfigurator.initReserves</a></td>
               
-              <td class="coverFnHi">2592</td>
+              <td class="coverFnHi">8651</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L440">PoolConfigurator.setAssetEModeCategory</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L54">PoolConfigurator.onlyAssetListingOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">1786</td>
+              <td class="coverFnHi">8651</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L349">PoolConfigurator.setBorrowCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L46">PoolConfigurator.onlyEmergencyOrPoolAdmin</a></td>
               
-              <td class="coverFnHi">1759</td>
+              <td class="coverFnHi">2003</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L254">PoolConfigurator.setBorrowableInIsolation</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L38">PoolConfigurator.onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">1759</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L309">PoolConfigurator.setDebtCeiling</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L62">PoolConfigurator.onlyRiskOrPoolAdmins</a></td>
               
-              <td class="coverFnHi">1765</td>
+              <td class="coverFnHi">7010</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L386">PoolConfigurator.setEModeCategory</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L70">PoolConfigurator.onlyRiskOrPoolOrEmergencyAdmins</a></td>
               
-              <td class="coverFnHi">38</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L373">PoolConfigurator.setLiquidationProtocolFee</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L433">PoolConfigurator.setAssetBorrowableInEMode</a></td>
               
-              <td class="coverFnHi">1754</td>
+              <td class="coverFnHi">7010</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L491">PoolConfigurator.setPoolPause</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L415">PoolConfigurator.setAssetCollateralInEMode</a></td>
               
-              <td class="coverFnHi">3003</td>
+              <td class="coverFnHi">11039</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L217">PoolConfigurator.setReserveActive</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L333">PoolConfigurator.setBorrowCap</a></td>
+              
+              <td class="coverFnHi">2957</td>
               
-              <td class="coverFnHi">14</td>
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L231">PoolConfigurator.setBorrowableInIsolation</a></td>
+              
+              <td class="coverFnHi">1959</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L130">PoolConfigurator.setReserveBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L293">PoolConfigurator.setDebtCeiling</a></td>
               
-              <td class="coverFnHi">1751</td>
+              <td class="coverFnHi">2964</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L291">PoolConfigurator.setReserveFactor</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L370">PoolConfigurator.setEModeCategory</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">11035</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L205">PoolConfigurator.setReserveFlashLoaning</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L357">PoolConfigurator.setLiquidationProtocolFee</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">1954</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L226">PoolConfigurator.setReserveFreeze</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L482">PoolConfigurator.setPoolPause</a></td>
+              
+              <td class="coverFnHi">4003</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L186">PoolConfigurator.setReserveActive</a></td>
               
               <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L472">PoolConfigurator.setReserveInterestRateData</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L114">PoolConfigurator.setReserveBorrowing</a></td>
               
-              <td class="coverFnLo">0</td>
+              <td class="coverFnHi">5947</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L481">PoolConfigurator.setReserveInterestRateStrategyAddress</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L275">PoolConfigurator.setReserveFactor</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">2949</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L265">PoolConfigurator.setReservePause</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L174">PoolConfigurator.setReserveFlashLoaning</a></td>
               
-              <td class="coverFnHi">8891</td>
+              <td class="coverFnHi">3948</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L191">PoolConfigurator.setReserveStableRateBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L195">PoolConfigurator.setReserveFreeze</a></td>
               
-              <td class="coverFnHi">1933</td>
+              <td class="coverFnHi">3014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L330">PoolConfigurator.setSiloedBorrowing</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L463">PoolConfigurator.setReserveInterestRateData</a></td>
               
-              <td class="coverFnHi">1749</td>
+              <td class="coverFnHi">1002</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L361">PoolConfigurator.setSupplyCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L472">PoolConfigurator.setReserveInterestRateStrategyAddress</a></td>
               
-              <td class="coverFnHi">1762</td>
+              <td class="coverFnHi">1044</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L460">PoolConfigurator.setUnbackedMintCap</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L242">PoolConfigurator.setReservePause</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">14013</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L109">PoolConfigurator.updateAToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L314">PoolConfigurator.setSiloedBorrowing</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1949</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L507">PoolConfigurator.updateBridgeProtocolFee</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L345">PoolConfigurator.setSupplyCap</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">3963</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L531">PoolConfigurator.updateFlashloanPremiumToProtocol</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L451">PoolConfigurator.setUnbackedMintCap</a></td>
+              
+              <td class="coverFnHi">7</td>
+              
               
-              <td class="coverFnHi">608</td>
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L100">PoolConfigurator.updateAToken</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L498">PoolConfigurator.updateBridgeProtocolFee</a></td>
+              
+              <td class="coverFnHi">14</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L518">PoolConfigurator.updateFlashloanPremiumTotal</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L522">PoolConfigurator.updateFlashloanPremiumToProtocol</a></td>
               
-              <td class="coverFnHi">608</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L116">PoolConfigurator.updateStableDebtToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L509">PoolConfigurator.updateFlashloanPremiumTotal</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1682</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L123">PoolConfigurator.updateVariableDebtToken</a></td>
+              <td class="coverFn"><a href="PoolConfigurator.sol.gcov.html#L107">PoolConfigurator.updateVariableDebtToken</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
@@ -348,8 +376,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.gcov.html b/report/protocol/pool/PoolConfigurator.sol.gcov.html
similarity index 75%
rename from report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.gcov.html
rename to report/protocol/pool/PoolConfigurator.sol.gcov.html
index 39285c10..4e0e3977 100644
--- a/report/core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol.gcov.html
+++ b/report/protocol/pool/PoolConfigurator.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/pool/src/core/contracts/protocol/pool/PoolConfigurator.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/pool/PoolConfigurator.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/pool/src/core/contracts/protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (source / <a href="PoolConfigurator.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/pool">protocol/pool</a> - PoolConfigurator.sol<span style="font-size: 80%;"> (source / <a href="PoolConfigurator.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">96.8&nbsp;%</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">190</td>
             <td class="headerCovTableEntry">190</td>
-            <td class="headerCovTableEntry">184</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">94.9&nbsp;%</td>
-            <td class="headerCovTableEntry">39</td>
-            <td class="headerCovTableEntry">37</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">43</td>
+            <td class="headerCovTableEntry">43</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,36 +72,36 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {PercentageMath} from '../libraries/math/PercentageMath.sol';</span>
-<span id="L10"><span class="lineNum">      10</span>                 :             : import {DataTypes} from '../libraries/types/DataTypes.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {ConfiguratorLogic} from '../libraries/logic/ConfiguratorLogic.sol';</span>
-<span id="L12"><span class="lineNum">      12</span>                 :             : import {ConfiguratorInputTypes} from '../libraries/types/ConfiguratorInputTypes.sol';</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             : import {IPoolConfigurator} from '../../interfaces/IPoolConfigurator.sol';</span>
-<span id="L14"><span class="lineNum">      14</span>                 :             : import {IPool} from '../../interfaces/IPool.sol';</span>
-<span id="L15"><span class="lineNum">      15</span>                 :             : import {IACLManager} from '../../interfaces/IACLManager.sol';</span>
-<span id="L16"><span class="lineNum">      16</span>                 :             : import {IPoolDataProvider} from '../../interfaces/IPoolDataProvider.sol';</span>
-<span id="L17"><span class="lineNum">      17</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
-<span id="L18"><span class="lineNum">      18</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             : </span>
-<span id="L20"><span class="lineNum">      20</span>                 :             : /**</span>
-<span id="L21"><span class="lineNum">      21</span>                 :             :  * @title PoolConfigurator</span>
-<span id="L22"><span class="lineNum">      22</span>                 :             :  * @author Aave</span>
-<span id="L23"><span class="lineNum">      23</span>                 :             :  * @dev Implements the configuration methods for the Aave protocol</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :  */</span>
-<span id="L25"><span class="lineNum">      25</span>                 :             : abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator {</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :   using PercentageMath for uint256;</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             : </span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :   IPoolAddressesProvider internal _addressesProvider;</span>
-<span id="L30"><span class="lineNum">      30</span>                 :             :   IPool internal _pool;</span>
-<span id="L31"><span class="lineNum">      31</span>                 :             : </span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :   mapping(address =&gt; uint256) internal _pendingLtv;</span>
-<span id="L33"><span class="lineNum">      33</span>                 :             :   mapping(address =&gt; bool) internal _isPendingLtvSet;</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {EModeConfiguration} from '../libraries/configuration/EModeConfiguration.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
+<span id="L10"><span class="lineNum">      10</span>                 :             : import {PercentageMath} from '../libraries/math/PercentageMath.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {DataTypes} from '../libraries/types/DataTypes.sol';</span>
+<span id="L12"><span class="lineNum">      12</span>                 :             : import {ConfiguratorLogic} from '../libraries/logic/ConfiguratorLogic.sol';</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             : import {ConfiguratorInputTypes} from '../libraries/types/ConfiguratorInputTypes.sol';</span>
+<span id="L14"><span class="lineNum">      14</span>                 :             : import {IPoolConfigurator} from '../../interfaces/IPoolConfigurator.sol';</span>
+<span id="L15"><span class="lineNum">      15</span>                 :             : import {IPool} from '../../interfaces/IPool.sol';</span>
+<span id="L16"><span class="lineNum">      16</span>                 :             : import {IACLManager} from '../../interfaces/IACLManager.sol';</span>
+<span id="L17"><span class="lineNum">      17</span>                 :             : import {IPoolDataProvider} from '../../interfaces/IPoolDataProvider.sol';</span>
+<span id="L18"><span class="lineNum">      18</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L19"><span class="lineNum">      19</span>                 :             : import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L20"><span class="lineNum">      20</span>                 :             : </span>
+<span id="L21"><span class="lineNum">      21</span>                 :             : /**</span>
+<span id="L22"><span class="lineNum">      22</span>                 :             :  * @title PoolConfigurator</span>
+<span id="L23"><span class="lineNum">      23</span>                 :             :  * @author Aave</span>
+<span id="L24"><span class="lineNum">      24</span>                 :             :  * @dev Implements the configuration methods for the Aave protocol</span>
+<span id="L25"><span class="lineNum">      25</span>                 :             :  */</span>
+<span id="L26"><span class="lineNum">      26</span>                 :             : abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator {</span>
+<span id="L27"><span class="lineNum">      27</span>                 :             :   using PercentageMath for uint256;</span>
+<span id="L28"><span class="lineNum">      28</span>                 :             :   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;</span>
+<span id="L29"><span class="lineNum">      29</span>                 :             : </span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   IPoolAddressesProvider internal _addressesProvider;</span>
+<span id="L31"><span class="lineNum">      31</span>                 :             :   IPool internal _pool;</span>
+<span id="L32"><span class="lineNum">      32</span>                 :             : </span>
+<span id="L33"><span class="lineNum">      33</span>                 :             :   mapping(address =&gt; uint256) internal _pendingLtv;</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             : </span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :   uint40 public constant MAX_GRACE_PERIOD = 4 hours;</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
@@ -109,610 +109,596 @@
 <span id="L38"><span class="lineNum">      38</span>                 :             :    * @dev Only pool admin can call functions marked by this modifier.</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :    */</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :   modifier onlyPoolAdmin() {</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     _onlyPoolAdmin();</span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC tlaBgGNC">        1682 :     _onlyPoolAdmin();</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :     _;</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :   }</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             : </span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :   /**</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :    * @dev Only emergency admin can call functions marked by this modifier.</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :    * @dev Only emergency or pool admin can call functions marked by this modifier.</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :    */</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :   modifier onlyEmergencyAdmin() {</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     _onlyEmergencyAdmin();</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   modifier onlyEmergencyOrPoolAdmin() {</span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">        2003 :     _onlyPoolOrEmergencyAdmin();</span></span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :     _;</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   }</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             : </span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :   /**</span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :    * @dev Only emergency or pool admin can call functions marked by this modifier.</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :    * @dev Only asset listing or pool admin can call functions marked by this modifier.</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :    */</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             :   modifier onlyEmergencyOrPoolAdmin() {</span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :     _onlyPoolOrEmergencyAdmin();</span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   modifier onlyAssetListingOrPoolAdmins() {</span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">        8651 :     _onlyAssetListingOrPoolAdmins();</span></span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :     _;</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :   }</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             : </span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   /**</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :    * @dev Only asset listing or pool admin can call functions marked by this modifier.</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :    * @dev Only risk or pool admin can call functions marked by this modifier.</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :    */</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             :   modifier onlyAssetListingOrPoolAdmins() {</span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :     _onlyAssetListingOrPoolAdmins();</span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   modifier onlyRiskOrPoolAdmins() {</span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">        7010 :     _onlyRiskOrPoolAdmins();</span></span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     _;</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   }</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   /**</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :    * @dev Only risk or pool admin can call functions marked by this modifier.</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :    * @dev Only risk, pool or emergency admin can call functions marked by this modifier.</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :    */</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :   modifier onlyRiskOrPoolAdmins() {</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     _onlyRiskOrPoolAdmins();</span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   modifier onlyRiskOrPoolOrEmergencyAdmins() {</span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">        3014 :     _onlyRiskOrPoolOrEmergencyAdmins();</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :     _;</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   }</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             : </span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :   /**</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :    * @dev Only risk, pool or emergency admin can call functions marked by this modifier.</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             :    */</span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :   modifier onlyRiskOrPoolOrEmergencyAdmins() {</span>
-<span id="L81"><span class="lineNum">      81</span>                 :             :     _onlyRiskOrPoolOrEmergencyAdmins();</span>
-<span id="L82"><span class="lineNum">      82</span>                 :             :     _;</span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :   }</span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   function initialize(IPoolAddressesProvider provider) public virtual;</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             : </span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function initReserves(</span>
+<span id="L81"><span class="lineNum">      81</span>                 :             :     ConfiguratorInputTypes.InitReserveInput[] calldata input</span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   ) external override onlyAssetListingOrPoolAdmins {</span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">        7651 :     IPool cachedPool = _pool;</span></span>
 <span id="L84"><span class="lineNum">      84</span>                 :             : </span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :   function initialize(IPoolAddressesProvider provider) public virtual;</span>
-<span id="L86"><span class="lineNum">      86</span>                 :             : </span>
-<span id="L87"><span class="lineNum">      87</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC tlaBgGNC">        2592 :   function initReserves(</span></span>
-<span id="L89"><span class="lineNum">      89</span>                 :             :     ConfiguratorInputTypes.InitReserveInput[] calldata input</span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :   ) external override onlyAssetListingOrPoolAdmins {</span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">        5182 :     IPool cachedPool = _pool;</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">       13535 :     for (uint256 i = 0; i &lt; input.length; i++) {</span></span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">        7764 :       require(IERC20Detailed(input[i].underlyingAsset).decimals() &gt; 5, Errors.INVALID_DECIMALS);</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        7651 :     for (uint256 i = 0; i &lt; input.length; i++) {</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">      167016 :       ConfiguratorLogic.executeInitReserve(cachedPool, input[i]);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">      165016 :       emit ReserveInterestRateDataChanged(</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :         input[i].underlyingAsset,</span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :         input[i].interestRateStrategyAddress,</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :         input[i].interestRateData</span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :       );</span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :     }</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :   }</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             : </span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">        5764 :       ConfiguratorLogic.executeInitReserve(cachedPool, input[i]);</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">        5762 :       emit ReserveInterestRateDataChanged(</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :             :         input[i].underlyingAsset,</span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :         input[i].interestRateStrategyAddress,</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             :         input[i].interestRateData</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :       );</span>
-<span id="L101"><span class="lineNum">     101</span>                 :             :     }</span>
-<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
-<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           6 :   function dropReserve(address asset) external override onlyPoolAdmin {</span></span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">          10 :     _pool.dropReserve(asset);</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           2 :     emit ReserveDropped(asset);</span></span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
-<span id="L109"><span class="lineNum">     109</span>                 :             : </span>
-<span id="L110"><span class="lineNum">     110</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           2 :   function updateAToken(</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :             :     ConfiguratorInputTypes.UpdateATokenInput calldata input</span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :   ) external override onlyPoolAdmin {</span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">           2 :     ConfiguratorLogic.executeUpdateAToken(_pool, input);</span></span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :   }</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             : </span>
-<span id="L117"><span class="lineNum">     117</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           2 :   function updateStableDebtToken(</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             :   ) external override onlyPoolAdmin {</span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           2 :     ConfiguratorLogic.executeUpdateStableDebtToken(_pool, input);</span></span>
-<span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
-<span id="L123"><span class="lineNum">     123</span>                 :             : </span>
-<span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           2 :   function updateVariableDebtToken(</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             :   ) external override onlyPoolAdmin {</span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">           2 :     ConfiguratorLogic.executeUpdateVariableDebtToken(_pool, input);</span></span>
-<span id="L129"><span class="lineNum">     129</span>                 :             :   }</span>
-<span id="L130"><span class="lineNum">     130</span>                 :             : </span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">        1751 :   function setReserveBorrowing(address asset, bool enabled) external override onlyRiskOrPoolAdmins {</span></span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">        5250 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">        3500 :     if (!enabled) {</span></span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">           4 :       require(!currentConfig.getStableRateBorrowingEnabled(), Errors.STABLE_BORROWING_ENABLED);</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :     }</span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        3500 :     currentConfig.setBorrowingEnabled(enabled);</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">        3500 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">        3500 :     emit ReserveBorrowing(asset, enabled);</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   }</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   function dropReserve(address asset) external override onlyPoolAdmin {</span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           5 :     _pool.dropReserve(asset);</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           1 :     emit ReserveDropped(asset);</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :   }</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             : </span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :   function updateAToken(</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             :     ConfiguratorInputTypes.UpdateATokenInput calldata input</span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   ) external override onlyPoolAdmin {</span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           1 :     ConfiguratorLogic.executeUpdateAToken(_pool, input);</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   }</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             : </span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :   function updateVariableDebtToken(</span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             :   ) external override onlyPoolAdmin {</span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">           1 :     ConfiguratorLogic.executeUpdateVariableDebtToken(_pool, input);</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :   }</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             : </span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function setReserveBorrowing(address asset, bool enabled) external override onlyRiskOrPoolAdmins {</span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">        4947 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">        4947 :     currentConfig.setBorrowingEnabled(enabled);</span></span>
+<span id="L119"><span class="lineNum">     119</span>                 :<span class="tlaGNC">        4947 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">        4947 :     emit ReserveBorrowing(asset, enabled);</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   }</span>
+<span id="L122"><span class="lineNum">     122</span>                 :             : </span>
+<span id="L123"><span class="lineNum">     123</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L124"><span class="lineNum">     124</span>                 :             :   function configureReserveAsCollateral(</span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :     address asset,</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             :     uint256 ltv,</span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :     uint256 liquidationThreshold,</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :     uint256 liquidationBonus</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :     //validation of the parameters: the LTV can</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :     //only be lower or equal than the liquidation threshold</span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :     //(otherwise a loan against the asset would cause instantaneous liquidation)</span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">        9952 :     require(ltv &lt;= liquidationThreshold, Errors.INVALID_RESERVE_PARAMS);</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :             : </span>
+<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">        7952 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :             : </span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">        7952 :     if (liquidationThreshold != 0) {</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :       //liquidation bonus must be bigger than 100.00%, otherwise the liquidator would receive less</span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :       //collateral than needed to cover the debt</span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">        6951 :       require(liquidationBonus &gt; PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_RESERVE_PARAMS);</span></span>
 <span id="L141"><span class="lineNum">     141</span>                 :             : </span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">        4757 :   function configureReserveAsCollateral(</span></span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :     address asset,</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :     uint256 ltv,</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :     uint256 liquidationThreshold,</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :     uint256 liquidationBonus</span>
-<span id="L148"><span class="lineNum">     148</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L149"><span class="lineNum">     149</span>                 :             :     //validation of the parameters: the LTV can</span>
-<span id="L150"><span class="lineNum">     150</span>                 :             :     //only be lower or equal than the liquidation threshold</span>
-<span id="L151"><span class="lineNum">     151</span>                 :             :     //(otherwise a loan against the asset would cause instantaneous liquidation)</span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">        9512 :     require(ltv &lt;= liquidationThreshold, Errors.INVALID_RESERVE_PARAMS);</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :             : </span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">       14262 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :       //if threshold * bonus is less than PERCENTAGE_FACTOR, it's guaranteed that at the moment</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :       //a loan is taken there is enough collateral available to cover the liquidation bonus</span>
+<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">        5951 :       require(</span></span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :         liquidationThreshold.percentMul(liquidationBonus) &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :         Errors.INVALID_RESERVE_PARAMS</span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :       );</span>
+<span id="L148"><span class="lineNum">     148</span>                 :             :     } else {</span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">        1001 :       require(liquidationBonus == 0, Errors.INVALID_RESERVE_PARAMS);</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :             :       //if the liquidation threshold is being set to 0,</span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :       // the reserve is being disabled as collateral. To do so,</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             :       //we need to ensure no liquidity is supplied</span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        1001 :       _checkNoSuppliers(asset);</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :     }</span>
 <span id="L155"><span class="lineNum">     155</span>                 :             : </span>
-<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">        9508 :     if (liquidationThreshold != 0) {</span></span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :       //liquidation bonus must be bigger than 100.00%, otherwise the liquidator would receive less</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :       //collateral than needed to cover the debt</span>
-<span id="L159"><span class="lineNum">     159</span>                 :<span class="tlaGNC">        9504 :       require(liquidationBonus &gt; PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_RESERVE_PARAMS);</span></span>
-<span id="L160"><span class="lineNum">     160</span>                 :             : </span>
-<span id="L161"><span class="lineNum">     161</span>                 :             :       //if threshold * bonus is less than PERCENTAGE_FACTOR, it's guaranteed that at the moment</span>
-<span id="L162"><span class="lineNum">     162</span>                 :             :       //a loan is taken there is enough collateral available to cover the liquidation bonus</span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">        9502 :       require(</span></span>
-<span id="L164"><span class="lineNum">     164</span>                 :             :         liquidationThreshold.percentMul(liquidationBonus) &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :         Errors.INVALID_RESERVE_PARAMS</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :       );</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :     } else {</span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           4 :       require(liquidationBonus == 0, Errors.INVALID_RESERVE_PARAMS);</span></span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :       //if the liquidation threshold is being set to 0,</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :       // the reserve is being disabled as collateral. To do so,</span>
-<span id="L171"><span class="lineNum">     171</span>                 :             :       //we need to ensure no liquidity is supplied</span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           4 :       _checkNoSuppliers(asset);</span></span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :     }</span>
+<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">        4952 :     uint256 newLtv = ltv;</span></span>
+<span id="L157"><span class="lineNum">     157</span>                 :             : </span>
+<span id="L158"><span class="lineNum">     158</span>                 :<span class="tlaGNC">        4952 :     if (currentConfig.getFrozen()) {</span></span>
+<span id="L159"><span class="lineNum">     159</span>                 :<span class="tlaGNC">        1000 :       _pendingLtv[asset] = ltv;</span></span>
+<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">        1000 :       newLtv = 0;</span></span>
+<span id="L161"><span class="lineNum">     161</span>                 :             : </span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">        1000 :       emit PendingLtvChanged(asset, ltv);</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :             :     } else {</span>
+<span id="L164"><span class="lineNum">     164</span>                 :<span class="tlaGNC">        3952 :       currentConfig.setLtv(ltv);</span></span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :     }</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             : </span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">        4952 :     currentConfig.setLiquidationThreshold(liquidationThreshold);</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">        4952 :     currentConfig.setLiquidationBonus(liquidationBonus);</span></span>
+<span id="L169"><span class="lineNum">     169</span>                 :             : </span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">        4952 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L171"><span class="lineNum">     171</span>                 :             : </span>
+<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">        4952 :     emit CollateralConfigurationChanged(asset, newLtv, liquidationThreshold, liquidationBonus);</span></span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :   }</span>
 <span id="L174"><span class="lineNum">     174</span>                 :             : </span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">        9502 :     if (currentConfig.getFrozen()) {</span></span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">        2000 :       _pendingLtv[asset] = ltv;</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">        2000 :       _isPendingLtvSet[asset] = true;</span></span>
-<span id="L178"><span class="lineNum">     178</span>                 :             : </span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">        2000 :       emit PendingLtvChanged(asset, ltv);</span></span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :     } else {</span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">        7502 :       currentConfig.setLtv(ltv);</span></span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :     }</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             : </span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">        9502 :     currentConfig.setLiquidationThreshold(liquidationThreshold);</span></span>
-<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">        9502 :     currentConfig.setLiquidationBonus(liquidationBonus);</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :   function setReserveFlashLoaning(</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             :     address asset,</span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :     bool enabled</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">        3948 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :             : </span>
+<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">        3948 :     currentConfig.setFlashLoanEnabled(enabled);</span></span>
+<span id="L183"><span class="lineNum">     183</span>                 :<span class="tlaGNC">        3948 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">        3948 :     emit ReserveFlashLoaning(asset, enabled);</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :             :   }</span>
 <span id="L186"><span class="lineNum">     186</span>                 :             : </span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">        9502 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :             : </span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">        9502 :     emit CollateralConfigurationChanged(asset, ltv, liquidationThreshold, liquidationBonus);</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :             :   }</span>
-<span id="L191"><span class="lineNum">     191</span>                 :             : </span>
-<span id="L192"><span class="lineNum">     192</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">        1933 :   function setReserveStableRateBorrowing(</span></span>
-<span id="L194"><span class="lineNum">     194</span>                 :             :     address asset,</span>
-<span id="L195"><span class="lineNum">     195</span>                 :             :     bool enabled</span>
-<span id="L196"><span class="lineNum">     196</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">        5796 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">        1932 :     if (enabled) {</span></span>
-<span id="L199"><span class="lineNum">     199</span>                 :<span class="tlaGNC">         368 :       require(currentConfig.getBorrowingEnabled(), Errors.BORROWING_NOT_ENABLED);</span></span>
-<span id="L200"><span class="lineNum">     200</span>                 :             :     }</span>
-<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        3862 :     currentConfig.setStableRateBorrowingEnabled(enabled);</span></span>
-<span id="L202"><span class="lineNum">     202</span>                 :<span class="tlaGNC">        3862 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        3862 :     emit ReserveStableRateBorrowing(asset, enabled);</span></span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :   }</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             : </span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">        1749 :   function setReserveFlashLoaning(</span></span>
-<span id="L208"><span class="lineNum">     208</span>                 :             :     address asset,</span>
-<span id="L209"><span class="lineNum">     209</span>                 :             :     bool enabled</span>
-<span id="L210"><span class="lineNum">     210</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">        5247 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L212"><span class="lineNum">     212</span>                 :             : </span>
-<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">        3498 :     currentConfig.setFlashLoanEnabled(enabled);</span></span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">        3498 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">        3498 :     emit ReserveFlashLoaning(asset, enabled);</span></span>
-<span id="L216"><span class="lineNum">     216</span>                 :             :   }</span>
-<span id="L217"><span class="lineNum">     217</span>                 :             : </span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">          14 :   function setReserveActive(address asset, bool active) external override onlyPoolAdmin {</span></span>
-<span id="L220"><span class="lineNum">     220</span>                 :<span class="tlaGNC">          38 :     if (!active) _checkNoSuppliers(asset);</span></span>
-<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">          36 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">          24 :     currentConfig.setActive(active);</span></span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">          24 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">          24 :     emit ReserveActive(asset, active);</span></span>
-<span id="L225"><span class="lineNum">     225</span>                 :             :   }</span>
-<span id="L226"><span class="lineNum">     226</span>                 :             : </span>
-<span id="L227"><span class="lineNum">     227</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">        1011 :   function setReserveFreeze(</span></span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :     address asset,</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :     bool freeze</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :   ) external override onlyRiskOrPoolOrEmergencyAdmins {</span>
-<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">        3030 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">        2020 :     currentConfig.setFrozen(freeze);</span></span>
-<span id="L234"><span class="lineNum">     234</span>                 :             : </span>
-<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">        1010 :     if (freeze) {</span></span>
-<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">        2016 :       _pendingLtv[asset] = currentConfig.getLtv();</span></span>
-<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">        2016 :       _isPendingLtvSet[asset] = true;</span></span>
-<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">        2016 :       currentConfig.setLtv(0);</span></span>
-<span id="L239"><span class="lineNum">     239</span>                 :             : </span>
-<span id="L240"><span class="lineNum">     240</span>                 :<span class="tlaGNC">        2016 :       emit PendingLtvChanged(asset, currentConfig.getLtv());</span></span>
-<span id="L241"><span class="lineNum">     241</span>                 :<span class="tlaGNC">           2 :     } else if (_isPendingLtvSet[asset]) {</span></span>
-<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">           2 :       uint256 ltv = _pendingLtv[asset];</span></span>
-<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">           2 :       currentConfig.setLtv(ltv);</span></span>
-<span id="L244"><span class="lineNum">     244</span>                 :             : </span>
-<span id="L245"><span class="lineNum">     245</span>                 :<span class="tlaGNC">           2 :       delete _pendingLtv[asset];</span></span>
-<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">           2 :       delete _isPendingLtvSet[asset];</span></span>
-<span id="L247"><span class="lineNum">     247</span>                 :             : </span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">           2 :       emit PendingLtvRemoved(asset);</span></span>
-<span id="L249"><span class="lineNum">     249</span>                 :             :     }</span>
-<span id="L250"><span class="lineNum">     250</span>                 :             : </span>
-<span id="L251"><span class="lineNum">     251</span>                 :<span class="tlaGNC">        2020 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">        2020 :     emit ReserveFrozen(asset, freeze);</span></span>
-<span id="L253"><span class="lineNum">     253</span>                 :             :   }</span>
-<span id="L254"><span class="lineNum">     254</span>                 :             : </span>
-<span id="L255"><span class="lineNum">     255</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L256"><span class="lineNum">     256</span>                 :<span class="tlaGNC">        1759 :   function setBorrowableInIsolation(</span></span>
-<span id="L257"><span class="lineNum">     257</span>                 :             :     address asset,</span>
-<span id="L258"><span class="lineNum">     258</span>                 :             :     bool borrowable</span>
-<span id="L259"><span class="lineNum">     259</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">        5277 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">        3518 :     currentConfig.setBorrowableInIsolation(borrowable);</span></span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">        3518 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L263"><span class="lineNum">     263</span>                 :<span class="tlaGNC">        3518 :     emit BorrowableInIsolationChanged(asset, borrowable);</span></span>
-<span id="L264"><span class="lineNum">     264</span>                 :             :   }</span>
-<span id="L265"><span class="lineNum">     265</span>                 :             : </span>
-<span id="L266"><span class="lineNum">     266</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L267"><span class="lineNum">     267</span>                 :<span class="tlaGNC">        8891 :   function setReservePause(</span></span>
-<span id="L268"><span class="lineNum">     268</span>                 :             :     address asset,</span>
-<span id="L269"><span class="lineNum">     269</span>                 :             :     bool paused,</span>
-<span id="L270"><span class="lineNum">     270</span>                 :             :     uint40 gracePeriod</span>
-<span id="L271"><span class="lineNum">     271</span>                 :             :   ) public override onlyEmergencyOrPoolAdmin {</span>
-<span id="L272"><span class="lineNum">     272</span>                 :             :     // Only setting grace period if the transition is paused -&gt; unpaused</span>
-<span id="L273"><span class="lineNum">     273</span>                 :<span class="tlaGNC">       35582 :     if (!paused &amp;&amp; gracePeriod != 0) {</span></span>
-<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">       16056 :       require(gracePeriod &lt;= MAX_GRACE_PERIOD, Errors.INVALID_GRACE_PERIOD);</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L188"><span class="lineNum">     188</span>                 :             :   function setReserveActive(address asset, bool active) external override onlyPoolAdmin {</span>
+<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">          11 :     if (!active) _checkNoSuppliers(asset);</span></span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">          10 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">          10 :     currentConfig.setActive(active);</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">          10 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">          10 :     emit ReserveActive(asset, active);</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :             :   }</span>
+<span id="L195"><span class="lineNum">     195</span>                 :             : </span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :   function setReserveFreeze(</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :     address asset,</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             :     bool freeze</span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :   ) external override onlyRiskOrPoolOrEmergencyAdmins {</span>
+<span id="L201"><span class="lineNum">     201</span>                 :<span class="tlaGNC">        2014 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L202"><span class="lineNum">     202</span>                 :             : </span>
+<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">        2014 :     require(freeze != currentConfig.getFrozen(), Errors.INVALID_FREEZE_STATE);</span></span>
+<span id="L204"><span class="lineNum">     204</span>                 :             : </span>
+<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">        2012 :     currentConfig.setFrozen(freeze);</span></span>
+<span id="L206"><span class="lineNum">     206</span>                 :             : </span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">        2012 :     uint256 ltvSet;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">        2012 :     uint256 pendingLtvSet;</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :             : </span>
+<span id="L210"><span class="lineNum">     210</span>                 :<span class="tlaGNC">        2012 :     if (freeze) {</span></span>
+<span id="L211"><span class="lineNum">     211</span>                 :<span class="tlaGNC">        1010 :       pendingLtvSet = currentConfig.getLtv();</span></span>
+<span id="L212"><span class="lineNum">     212</span>                 :<span class="tlaGNC">        1010 :       _pendingLtv[asset] = pendingLtvSet;</span></span>
+<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">        1010 :       currentConfig.setLtv(0);</span></span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :     } else {</span>
+<span id="L215"><span class="lineNum">     215</span>                 :<span class="tlaGNC">        1002 :       ltvSet = _pendingLtv[asset];</span></span>
+<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">        1002 :       currentConfig.setLtv(ltvSet);</span></span>
+<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">        1002 :       delete _pendingLtv[asset];</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :     }</span>
+<span id="L219"><span class="lineNum">     219</span>                 :             : </span>
+<span id="L220"><span class="lineNum">     220</span>                 :<span class="tlaGNC">        2012 :     emit PendingLtvChanged(asset, pendingLtvSet);</span></span>
+<span id="L221"><span class="lineNum">     221</span>                 :<span class="tlaGNC">        2012 :     emit CollateralConfigurationChanged(</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :       asset,</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :       ltvSet,</span>
+<span id="L224"><span class="lineNum">     224</span>                 :             :       currentConfig.getLiquidationThreshold(),</span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :       currentConfig.getLiquidationBonus()</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             :     );</span>
+<span id="L227"><span class="lineNum">     227</span>                 :             : </span>
+<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">        2012 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">        2012 :     emit ReserveFrozen(asset, freeze);</span></span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :   }</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             : </span>
+<span id="L232"><span class="lineNum">     232</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :   function setBorrowableInIsolation(</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             :     address asset,</span>
+<span id="L235"><span class="lineNum">     235</span>                 :             :     bool borrowable</span>
+<span id="L236"><span class="lineNum">     236</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">        1959 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">        1959 :     currentConfig.setBorrowableInIsolation(borrowable);</span></span>
+<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">        1959 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L240"><span class="lineNum">     240</span>                 :<span class="tlaGNC">        1959 :     emit BorrowableInIsolationChanged(asset, borrowable);</span></span>
+<span id="L241"><span class="lineNum">     241</span>                 :             :   }</span>
+<span id="L242"><span class="lineNum">     242</span>                 :             : </span>
+<span id="L243"><span class="lineNum">     243</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L244"><span class="lineNum">     244</span>                 :             :   function setReservePause(</span>
+<span id="L245"><span class="lineNum">     245</span>                 :             :     address asset,</span>
+<span id="L246"><span class="lineNum">     246</span>                 :             :     bool paused,</span>
+<span id="L247"><span class="lineNum">     247</span>                 :             :     uint40 gracePeriod</span>
+<span id="L248"><span class="lineNum">     248</span>                 :             :   ) public override onlyEmergencyOrPoolAdmin {</span>
+<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">       14022 :     if (!paused &amp;&amp; gracePeriod != 0) {</span></span>
+<span id="L250"><span class="lineNum">     250</span>                 :<span class="tlaGNC">       10411 :       require(gracePeriod &lt;= MAX_GRACE_PERIOD, Errors.INVALID_GRACE_PERIOD);</span></span>
+<span id="L251"><span class="lineNum">     251</span>                 :             : </span>
+<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">        9411 :       uint40 until = uint40(block.timestamp) + gracePeriod;</span></span>
+<span id="L253"><span class="lineNum">     253</span>                 :<span class="tlaGNC">        9411 :       _pool.setLiquidationGracePeriod(asset, until);</span></span>
+<span id="L254"><span class="lineNum">     254</span>                 :<span class="tlaGNC">        9411 :       emit LiquidationGracePeriodChanged(asset, until);</span></span>
+<span id="L255"><span class="lineNum">     255</span>                 :             :     }</span>
+<span id="L256"><span class="lineNum">     256</span>                 :             : </span>
+<span id="L257"><span class="lineNum">     257</span>                 :<span class="tlaGNC">       13022 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L258"><span class="lineNum">     258</span>                 :<span class="tlaGNC">       13022 :     currentConfig.setPaused(paused);</span></span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">       13022 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">       13022 :     emit ReservePaused(asset, paused);</span></span>
+<span id="L261"><span class="lineNum">     261</span>                 :             :   }</span>
+<span id="L262"><span class="lineNum">     262</span>                 :             : </span>
+<span id="L263"><span class="lineNum">     263</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L264"><span class="lineNum">     264</span>                 :             :   function setReservePause(address asset, bool paused) external override onlyEmergencyOrPoolAdmin {</span>
+<span id="L265"><span class="lineNum">     265</span>                 :<span class="tlaGNC">        1001 :     setReservePause(asset, paused, 0);</span></span>
+<span id="L266"><span class="lineNum">     266</span>                 :             :   }</span>
+<span id="L267"><span class="lineNum">     267</span>                 :             : </span>
+<span id="L268"><span class="lineNum">     268</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L269"><span class="lineNum">     269</span>                 :             :   function disableLiquidationGracePeriod(address asset) external override onlyEmergencyOrPoolAdmin {</span>
+<span id="L270"><span class="lineNum">     270</span>                 :             :     // set the liquidation grace period in the past to disable liquidation grace period</span>
+<span id="L271"><span class="lineNum">     271</span>                 :<span class="tlaGNC">        1001 :     _pool.setLiquidationGracePeriod(asset, 0);</span></span>
+<span id="L272"><span class="lineNum">     272</span>                 :             : </span>
+<span id="L273"><span class="lineNum">     273</span>                 :<span class="tlaGNC">        1001 :     emit LiquidationGracePeriodDisabled(asset);</span></span>
+<span id="L274"><span class="lineNum">     274</span>                 :             :   }</span>
 <span id="L275"><span class="lineNum">     275</span>                 :             : </span>
-<span id="L276"><span class="lineNum">     276</span>                 :<span class="tlaGNC">       28112 :       uint40 until = uint40(block.timestamp) + gracePeriod;</span></span>
-<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">       14056 :       _pool.setLiquidationGracePeriod(asset, until);</span></span>
-<span id="L278"><span class="lineNum">     278</span>                 :<span class="tlaGNC">       14056 :       emit LiquidationGracePeriodChanged(asset, until);</span></span>
-<span id="L279"><span class="lineNum">     279</span>                 :             :     }</span>
-<span id="L280"><span class="lineNum">     280</span>                 :             : </span>
-<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">       23700 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">       15800 :     currentConfig.setPaused(paused);</span></span>
-<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">       15800 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L284"><span class="lineNum">     284</span>                 :<span class="tlaGNC">       15800 :     emit ReservePaused(asset, paused);</span></span>
-<span id="L285"><span class="lineNum">     285</span>                 :             :   }</span>
-<span id="L286"><span class="lineNum">     286</span>                 :             : </span>
-<span id="L287"><span class="lineNum">     287</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L288"><span class="lineNum">     288</span>                 :             :   function setReservePause(address asset, bool paused) public override onlyEmergencyOrPoolAdmin {</span>
-<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     setReservePause(asset, paused, 0);</span></span>
-<span id="L290"><span class="lineNum">     290</span>                 :             :   }</span>
-<span id="L291"><span class="lineNum">     291</span>                 :             : </span>
-<span id="L292"><span class="lineNum">     292</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L293"><span class="lineNum">     293</span>                 :<span class="tlaGNC tlaBgGNC">        1749 :   function setReserveFactor(</span></span>
-<span id="L294"><span class="lineNum">     294</span>                 :             :     address asset,</span>
-<span id="L295"><span class="lineNum">     295</span>                 :             :     uint256 newReserveFactor</span>
-<span id="L296"><span class="lineNum">     296</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">        3496 :     require(newReserveFactor &lt;= PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_RESERVE_FACTOR);</span></span>
-<span id="L298"><span class="lineNum">     298</span>                 :             : </span>
-<span id="L299"><span class="lineNum">     299</span>                 :<span class="tlaGNC">        3494 :     _pool.syncIndexesState(asset);</span></span>
+<span id="L276"><span class="lineNum">     276</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L277"><span class="lineNum">     277</span>                 :             :   function setReserveFactor(</span>
+<span id="L278"><span class="lineNum">     278</span>                 :             :     address asset,</span>
+<span id="L279"><span class="lineNum">     279</span>                 :             :     uint256 newReserveFactor</span>
+<span id="L280"><span class="lineNum">     280</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">        1949 :     require(newReserveFactor &lt;= PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_RESERVE_FACTOR);</span></span>
+<span id="L282"><span class="lineNum">     282</span>                 :             : </span>
+<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">        1948 :     _pool.syncIndexesState(asset);</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :             : </span>
+<span id="L285"><span class="lineNum">     285</span>                 :<span class="tlaGNC">        1948 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L286"><span class="lineNum">     286</span>                 :<span class="tlaGNC">        1948 :     uint256 oldReserveFactor = currentConfig.getReserveFactor();</span></span>
+<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">        1948 :     currentConfig.setReserveFactor(newReserveFactor);</span></span>
+<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">        1948 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">        1948 :     emit ReserveFactorChanged(asset, oldReserveFactor, newReserveFactor);</span></span>
+<span id="L290"><span class="lineNum">     290</span>                 :             : </span>
+<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">        1948 :     _pool.syncRatesState(asset);</span></span>
+<span id="L292"><span class="lineNum">     292</span>                 :             :   }</span>
+<span id="L293"><span class="lineNum">     293</span>                 :             : </span>
+<span id="L294"><span class="lineNum">     294</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L295"><span class="lineNum">     295</span>                 :             :   function setDebtCeiling(</span>
+<span id="L296"><span class="lineNum">     296</span>                 :             :     address asset,</span>
+<span id="L297"><span class="lineNum">     297</span>                 :             :     uint256 newDebtCeiling</span>
+<span id="L298"><span class="lineNum">     298</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L299"><span class="lineNum">     299</span>                 :<span class="tlaGNC">        1964 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
 <span id="L300"><span class="lineNum">     300</span>                 :             : </span>
-<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">        5241 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">        5241 :     uint256 oldReserveFactor = currentConfig.getReserveFactor();</span></span>
-<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">        3494 :     currentConfig.setReserveFactor(newReserveFactor);</span></span>
-<span id="L304"><span class="lineNum">     304</span>                 :<span class="tlaGNC">        3494 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">        3494 :     emit ReserveFactorChanged(asset, oldReserveFactor, newReserveFactor);</span></span>
-<span id="L306"><span class="lineNum">     306</span>                 :             : </span>
-<span id="L307"><span class="lineNum">     307</span>                 :<span class="tlaGNC">        3494 :     _pool.syncRatesState(asset);</span></span>
-<span id="L308"><span class="lineNum">     308</span>                 :             :   }</span>
-<span id="L309"><span class="lineNum">     309</span>                 :             : </span>
-<span id="L310"><span class="lineNum">     310</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L311"><span class="lineNum">     311</span>                 :<span class="tlaGNC">        1765 :   function setDebtCeiling(</span></span>
-<span id="L312"><span class="lineNum">     312</span>                 :             :     address asset,</span>
-<span id="L313"><span class="lineNum">     313</span>                 :             :     uint256 newDebtCeiling</span>
-<span id="L314"><span class="lineNum">     314</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L315"><span class="lineNum">     315</span>                 :<span class="tlaGNC">        5292 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L316"><span class="lineNum">     316</span>                 :             : </span>
-<span id="L317"><span class="lineNum">     317</span>                 :<span class="tlaGNC">        5292 :     uint256 oldDebtCeiling = currentConfig.getDebtCeiling();</span></span>
-<span id="L318"><span class="lineNum">     318</span>                 :<span class="tlaGNC">        8819 :     if (currentConfig.getLiquidationThreshold() != 0 &amp;&amp; oldDebtCeiling == 0) {</span></span>
-<span id="L319"><span class="lineNum">     319</span>                 :<span class="tlaGNC">        3520 :       _checkNoSuppliers(asset);</span></span>
-<span id="L320"><span class="lineNum">     320</span>                 :             :     }</span>
-<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">        3526 :     currentConfig.setDebtCeiling(newDebtCeiling);</span></span>
-<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">        3526 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L323"><span class="lineNum">     323</span>                 :             : </span>
-<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">        3526 :     if (newDebtCeiling == 0) {</span></span>
-<span id="L325"><span class="lineNum">     325</span>                 :<span class="tlaGNC">        3498 :       _pool.resetIsolationModeTotalDebt(asset);</span></span>
-<span id="L326"><span class="lineNum">     326</span>                 :             :     }</span>
-<span id="L327"><span class="lineNum">     327</span>                 :             : </span>
-<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">        3526 :     emit DebtCeilingChanged(asset, oldDebtCeiling, newDebtCeiling);</span></span>
-<span id="L329"><span class="lineNum">     329</span>                 :             :   }</span>
+<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">        1964 :     uint256 oldDebtCeiling = currentConfig.getDebtCeiling();</span></span>
+<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">        1964 :     if (currentConfig.getLiquidationThreshold() != 0 &amp;&amp; oldDebtCeiling == 0) {</span></span>
+<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">        1960 :       _checkNoSuppliers(asset);</span></span>
+<span id="L304"><span class="lineNum">     304</span>                 :             :     }</span>
+<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">        1963 :     currentConfig.setDebtCeiling(newDebtCeiling);</span></span>
+<span id="L306"><span class="lineNum">     306</span>                 :<span class="tlaGNC">        1963 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L307"><span class="lineNum">     307</span>                 :             : </span>
+<span id="L308"><span class="lineNum">     308</span>                 :<span class="tlaGNC">        1963 :     if (newDebtCeiling == 0) {</span></span>
+<span id="L309"><span class="lineNum">     309</span>                 :<span class="tlaGNC">        1949 :       _pool.resetIsolationModeTotalDebt(asset);</span></span>
+<span id="L310"><span class="lineNum">     310</span>                 :             :     }</span>
+<span id="L311"><span class="lineNum">     311</span>                 :             : </span>
+<span id="L312"><span class="lineNum">     312</span>                 :<span class="tlaGNC">        1963 :     emit DebtCeilingChanged(asset, oldDebtCeiling, newDebtCeiling);</span></span>
+<span id="L313"><span class="lineNum">     313</span>                 :             :   }</span>
+<span id="L314"><span class="lineNum">     314</span>                 :             : </span>
+<span id="L315"><span class="lineNum">     315</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L316"><span class="lineNum">     316</span>                 :             :   function setSiloedBorrowing(</span>
+<span id="L317"><span class="lineNum">     317</span>                 :             :     address asset,</span>
+<span id="L318"><span class="lineNum">     318</span>                 :             :     bool newSiloed</span>
+<span id="L319"><span class="lineNum">     319</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L320"><span class="lineNum">     320</span>                 :<span class="tlaGNC">        1949 :     if (newSiloed) {</span></span>
+<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">           3 :       _checkNoBorrowers(asset);</span></span>
+<span id="L322"><span class="lineNum">     322</span>                 :             :     }</span>
+<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">        1948 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L324"><span class="lineNum">     324</span>                 :             : </span>
+<span id="L325"><span class="lineNum">     325</span>                 :<span class="tlaGNC">        1948 :     bool oldSiloed = currentConfig.getSiloedBorrowing();</span></span>
+<span id="L326"><span class="lineNum">     326</span>                 :             : </span>
+<span id="L327"><span class="lineNum">     327</span>                 :<span class="tlaGNC">        1948 :     currentConfig.setSiloedBorrowing(newSiloed);</span></span>
+<span id="L328"><span class="lineNum">     328</span>                 :             : </span>
+<span id="L329"><span class="lineNum">     329</span>                 :<span class="tlaGNC">        1948 :     _pool.setConfiguration(asset, currentConfig);</span></span>
 <span id="L330"><span class="lineNum">     330</span>                 :             : </span>
-<span id="L331"><span class="lineNum">     331</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L332"><span class="lineNum">     332</span>                 :<span class="tlaGNC">        1749 :   function setSiloedBorrowing(</span></span>
-<span id="L333"><span class="lineNum">     333</span>                 :             :     address asset,</span>
-<span id="L334"><span class="lineNum">     334</span>                 :             :     bool newSiloed</span>
-<span id="L335"><span class="lineNum">     335</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L336"><span class="lineNum">     336</span>                 :<span class="tlaGNC">        1749 :     if (newSiloed) {</span></span>
-<span id="L337"><span class="lineNum">     337</span>                 :<span class="tlaGNC">           6 :       _checkNoBorrowers(asset);</span></span>
-<span id="L338"><span class="lineNum">     338</span>                 :             :     }</span>
-<span id="L339"><span class="lineNum">     339</span>                 :<span class="tlaGNC">        5244 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L340"><span class="lineNum">     340</span>                 :             : </span>
-<span id="L341"><span class="lineNum">     341</span>                 :<span class="tlaGNC">        5244 :     bool oldSiloed = currentConfig.getSiloedBorrowing();</span></span>
-<span id="L342"><span class="lineNum">     342</span>                 :             : </span>
-<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC">        3496 :     currentConfig.setSiloedBorrowing(newSiloed);</span></span>
-<span id="L344"><span class="lineNum">     344</span>                 :             : </span>
-<span id="L345"><span class="lineNum">     345</span>                 :<span class="tlaGNC">        3496 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L346"><span class="lineNum">     346</span>                 :             : </span>
-<span id="L347"><span class="lineNum">     347</span>                 :<span class="tlaGNC">        3496 :     emit SiloedBorrowingChanged(asset, oldSiloed, newSiloed);</span></span>
-<span id="L348"><span class="lineNum">     348</span>                 :             :   }</span>
-<span id="L349"><span class="lineNum">     349</span>                 :             : </span>
-<span id="L350"><span class="lineNum">     350</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L351"><span class="lineNum">     351</span>                 :<span class="tlaGNC">        1759 :   function setBorrowCap(</span></span>
-<span id="L352"><span class="lineNum">     352</span>                 :             :     address asset,</span>
-<span id="L353"><span class="lineNum">     353</span>                 :             :     uint256 newBorrowCap</span>
-<span id="L354"><span class="lineNum">     354</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaGNC">        5271 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L356"><span class="lineNum">     356</span>                 :<span class="tlaGNC">        5271 :     uint256 oldBorrowCap = currentConfig.getBorrowCap();</span></span>
-<span id="L357"><span class="lineNum">     357</span>                 :<span class="tlaGNC">        3514 :     currentConfig.setBorrowCap(newBorrowCap);</span></span>
-<span id="L358"><span class="lineNum">     358</span>                 :<span class="tlaGNC">        3512 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L359"><span class="lineNum">     359</span>                 :<span class="tlaGNC">        3512 :     emit BorrowCapChanged(asset, oldBorrowCap, newBorrowCap);</span></span>
-<span id="L360"><span class="lineNum">     360</span>                 :             :   }</span>
-<span id="L361"><span class="lineNum">     361</span>                 :             : </span>
-<span id="L362"><span class="lineNum">     362</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L363"><span class="lineNum">     363</span>                 :<span class="tlaGNC">        1762 :   function setSupplyCap(</span></span>
-<span id="L364"><span class="lineNum">     364</span>                 :             :     address asset,</span>
-<span id="L365"><span class="lineNum">     365</span>                 :             :     uint256 newSupplyCap</span>
-<span id="L366"><span class="lineNum">     366</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L367"><span class="lineNum">     367</span>                 :<span class="tlaGNC">        5280 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L368"><span class="lineNum">     368</span>                 :<span class="tlaGNC">        5280 :     uint256 oldSupplyCap = currentConfig.getSupplyCap();</span></span>
-<span id="L369"><span class="lineNum">     369</span>                 :<span class="tlaGNC">        3520 :     currentConfig.setSupplyCap(newSupplyCap);</span></span>
-<span id="L370"><span class="lineNum">     370</span>                 :<span class="tlaGNC">        3518 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L371"><span class="lineNum">     371</span>                 :<span class="tlaGNC">        3518 :     emit SupplyCapChanged(asset, oldSupplyCap, newSupplyCap);</span></span>
-<span id="L372"><span class="lineNum">     372</span>                 :             :   }</span>
-<span id="L373"><span class="lineNum">     373</span>                 :             : </span>
-<span id="L374"><span class="lineNum">     374</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L375"><span class="lineNum">     375</span>                 :<span class="tlaGNC">        1754 :   function setLiquidationProtocolFee(</span></span>
-<span id="L376"><span class="lineNum">     376</span>                 :             :     address asset,</span>
-<span id="L377"><span class="lineNum">     377</span>                 :             :     uint256 newFee</span>
+<span id="L331"><span class="lineNum">     331</span>                 :<span class="tlaGNC">        1948 :     emit SiloedBorrowingChanged(asset, oldSiloed, newSiloed);</span></span>
+<span id="L332"><span class="lineNum">     332</span>                 :             :   }</span>
+<span id="L333"><span class="lineNum">     333</span>                 :             : </span>
+<span id="L334"><span class="lineNum">     334</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L335"><span class="lineNum">     335</span>                 :             :   function setBorrowCap(</span>
+<span id="L336"><span class="lineNum">     336</span>                 :             :     address asset,</span>
+<span id="L337"><span class="lineNum">     337</span>                 :             :     uint256 newBorrowCap</span>
+<span id="L338"><span class="lineNum">     338</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L339"><span class="lineNum">     339</span>                 :<span class="tlaGNC">        1956 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L340"><span class="lineNum">     340</span>                 :<span class="tlaGNC">        1956 :     uint256 oldBorrowCap = currentConfig.getBorrowCap();</span></span>
+<span id="L341"><span class="lineNum">     341</span>                 :<span class="tlaGNC">        1956 :     currentConfig.setBorrowCap(newBorrowCap);</span></span>
+<span id="L342"><span class="lineNum">     342</span>                 :<span class="tlaGNC">        1955 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC">        1955 :     emit BorrowCapChanged(asset, oldBorrowCap, newBorrowCap);</span></span>
+<span id="L344"><span class="lineNum">     344</span>                 :             :   }</span>
+<span id="L345"><span class="lineNum">     345</span>                 :             : </span>
+<span id="L346"><span class="lineNum">     346</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L347"><span class="lineNum">     347</span>                 :             :   function setSupplyCap(</span>
+<span id="L348"><span class="lineNum">     348</span>                 :             :     address asset,</span>
+<span id="L349"><span class="lineNum">     349</span>                 :             :     uint256 newSupplyCap</span>
+<span id="L350"><span class="lineNum">     350</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L351"><span class="lineNum">     351</span>                 :<span class="tlaGNC">        2962 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">        2962 :     uint256 oldSupplyCap = currentConfig.getSupplyCap();</span></span>
+<span id="L353"><span class="lineNum">     353</span>                 :<span class="tlaGNC">        2962 :     currentConfig.setSupplyCap(newSupplyCap);</span></span>
+<span id="L354"><span class="lineNum">     354</span>                 :<span class="tlaGNC">        2961 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaGNC">        2961 :     emit SupplyCapChanged(asset, oldSupplyCap, newSupplyCap);</span></span>
+<span id="L356"><span class="lineNum">     356</span>                 :             :   }</span>
+<span id="L357"><span class="lineNum">     357</span>                 :             : </span>
+<span id="L358"><span class="lineNum">     358</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L359"><span class="lineNum">     359</span>                 :             :   function setLiquidationProtocolFee(</span>
+<span id="L360"><span class="lineNum">     360</span>                 :             :     address asset,</span>
+<span id="L361"><span class="lineNum">     361</span>                 :             :     uint256 newFee</span>
+<span id="L362"><span class="lineNum">     362</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L363"><span class="lineNum">     363</span>                 :<span class="tlaGNC">        1953 :     require(newFee &lt;= PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_LIQUIDATION_PROTOCOL_FEE);</span></span>
+<span id="L364"><span class="lineNum">     364</span>                 :<span class="tlaGNC">        1951 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L365"><span class="lineNum">     365</span>                 :<span class="tlaGNC">        1951 :     uint256 oldFee = currentConfig.getLiquidationProtocolFee();</span></span>
+<span id="L366"><span class="lineNum">     366</span>                 :<span class="tlaGNC">        1951 :     currentConfig.setLiquidationProtocolFee(newFee);</span></span>
+<span id="L367"><span class="lineNum">     367</span>                 :<span class="tlaGNC">        1951 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L368"><span class="lineNum">     368</span>                 :<span class="tlaGNC">        1951 :     emit LiquidationProtocolFeeChanged(asset, oldFee, newFee);</span></span>
+<span id="L369"><span class="lineNum">     369</span>                 :             :   }</span>
+<span id="L370"><span class="lineNum">     370</span>                 :             : </span>
+<span id="L371"><span class="lineNum">     371</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L372"><span class="lineNum">     372</span>                 :             :   function setEModeCategory(</span>
+<span id="L373"><span class="lineNum">     373</span>                 :             :     uint8 categoryId,</span>
+<span id="L374"><span class="lineNum">     374</span>                 :             :     uint16 ltv,</span>
+<span id="L375"><span class="lineNum">     375</span>                 :             :     uint16 liquidationThreshold,</span>
+<span id="L376"><span class="lineNum">     376</span>                 :             :     uint16 liquidationBonus,</span>
+<span id="L377"><span class="lineNum">     377</span>                 :             :     string calldata label</span>
 <span id="L378"><span class="lineNum">     378</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L379"><span class="lineNum">     379</span>                 :<span class="tlaGNC">        3506 :     require(newFee &lt;= PercentageMath.PERCENTAGE_FACTOR, Errors.INVALID_LIQUIDATION_PROTOCOL_FEE);</span></span>
-<span id="L380"><span class="lineNum">     380</span>                 :<span class="tlaGNC">        5253 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L381"><span class="lineNum">     381</span>                 :<span class="tlaGNC">        5253 :     uint256 oldFee = currentConfig.getLiquidationProtocolFee();</span></span>
-<span id="L382"><span class="lineNum">     382</span>                 :<span class="tlaGNC">        3502 :     currentConfig.setLiquidationProtocolFee(newFee);</span></span>
-<span id="L383"><span class="lineNum">     383</span>                 :<span class="tlaGNC">        3502 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L384"><span class="lineNum">     384</span>                 :<span class="tlaGNC">        3502 :     emit LiquidationProtocolFeeChanged(asset, oldFee, newFee);</span></span>
-<span id="L385"><span class="lineNum">     385</span>                 :             :   }</span>
-<span id="L386"><span class="lineNum">     386</span>                 :             : </span>
-<span id="L387"><span class="lineNum">     387</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L388"><span class="lineNum">     388</span>                 :<span class="tlaGNC">          38 :   function setEModeCategory(</span></span>
-<span id="L389"><span class="lineNum">     389</span>                 :             :     uint8 categoryId,</span>
-<span id="L390"><span class="lineNum">     390</span>                 :             :     uint16 ltv,</span>
-<span id="L391"><span class="lineNum">     391</span>                 :             :     uint16 liquidationThreshold,</span>
-<span id="L392"><span class="lineNum">     392</span>                 :             :     uint16 liquidationBonus,</span>
-<span id="L393"><span class="lineNum">     393</span>                 :             :     address oracle,</span>
-<span id="L394"><span class="lineNum">     394</span>                 :             :     string calldata label</span>
-<span id="L395"><span class="lineNum">     395</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L396"><span class="lineNum">     396</span>                 :<span class="tlaGNC">          74 :     require(ltv != 0, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
-<span id="L397"><span class="lineNum">     397</span>                 :<span class="tlaGNC">          72 :     require(liquidationThreshold != 0, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
+<span id="L379"><span class="lineNum">     379</span>                 :<span class="tlaGNC">       10035 :     require(ltv != 0, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
+<span id="L380"><span class="lineNum">     380</span>                 :<span class="tlaGNC">       10034 :     require(liquidationThreshold != 0, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
+<span id="L381"><span class="lineNum">     381</span>                 :             : </span>
+<span id="L382"><span class="lineNum">     382</span>                 :             :     // validation of the parameters: the LTV can</span>
+<span id="L383"><span class="lineNum">     383</span>                 :             :     // only be lower or equal than the liquidation threshold</span>
+<span id="L384"><span class="lineNum">     384</span>                 :             :     // (otherwise a loan against the asset would cause instantaneous liquidation)</span>
+<span id="L385"><span class="lineNum">     385</span>                 :<span class="tlaGNC">       10033 :     require(ltv &lt;= liquidationThreshold, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
+<span id="L386"><span class="lineNum">     386</span>                 :<span class="tlaGNC">       10032 :     require(</span></span>
+<span id="L387"><span class="lineNum">     387</span>                 :             :       liquidationBonus &gt; PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L388"><span class="lineNum">     388</span>                 :             :       Errors.INVALID_EMODE_CATEGORY_PARAMS</span>
+<span id="L389"><span class="lineNum">     389</span>                 :             :     );</span>
+<span id="L390"><span class="lineNum">     390</span>                 :             : </span>
+<span id="L391"><span class="lineNum">     391</span>                 :             :     // if threshold * bonus is less than PERCENTAGE_FACTOR, it's guaranteed that at the moment</span>
+<span id="L392"><span class="lineNum">     392</span>                 :             :     // a loan is taken there is enough collateral available to cover the liquidation bonus</span>
+<span id="L393"><span class="lineNum">     393</span>                 :<span class="tlaGNC">       10030 :     require(</span></span>
+<span id="L394"><span class="lineNum">     394</span>                 :             :       uint256(liquidationThreshold).percentMul(liquidationBonus) &lt;=</span>
+<span id="L395"><span class="lineNum">     395</span>                 :             :         PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L396"><span class="lineNum">     396</span>                 :             :       Errors.INVALID_EMODE_CATEGORY_PARAMS</span>
+<span id="L397"><span class="lineNum">     397</span>                 :             :     );</span>
 <span id="L398"><span class="lineNum">     398</span>                 :             : </span>
-<span id="L399"><span class="lineNum">     399</span>                 :             :     // validation of the parameters: the LTV can</span>
-<span id="L400"><span class="lineNum">     400</span>                 :             :     // only be lower or equal than the liquidation threshold</span>
-<span id="L401"><span class="lineNum">     401</span>                 :             :     // (otherwise a loan against the asset would cause instantaneous liquidation)</span>
-<span id="L402"><span class="lineNum">     402</span>                 :<span class="tlaGNC">          70 :     require(ltv &lt;= liquidationThreshold, Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
-<span id="L403"><span class="lineNum">     403</span>                 :<span class="tlaGNC">          66 :     require(</span></span>
-<span id="L404"><span class="lineNum">     404</span>                 :             :       liquidationBonus &gt; PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L405"><span class="lineNum">     405</span>                 :             :       Errors.INVALID_EMODE_CATEGORY_PARAMS</span>
-<span id="L406"><span class="lineNum">     406</span>                 :             :     );</span>
-<span id="L407"><span class="lineNum">     407</span>                 :             : </span>
-<span id="L408"><span class="lineNum">     408</span>                 :             :     // if threshold * bonus is less than PERCENTAGE_FACTOR, it's guaranteed that at the moment</span>
-<span id="L409"><span class="lineNum">     409</span>                 :             :     // a loan is taken there is enough collateral available to cover the liquidation bonus</span>
-<span id="L410"><span class="lineNum">     410</span>                 :<span class="tlaGNC">          62 :     require(</span></span>
-<span id="L411"><span class="lineNum">     411</span>                 :             :       uint256(liquidationThreshold).percentMul(liquidationBonus) &lt;=</span>
-<span id="L412"><span class="lineNum">     412</span>                 :             :         PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L413"><span class="lineNum">     413</span>                 :             :       Errors.INVALID_EMODE_CATEGORY_PARAMS</span>
-<span id="L414"><span class="lineNum">     414</span>                 :             :     );</span>
+<span id="L399"><span class="lineNum">     399</span>                 :<span class="tlaGNC">       10029 :     DataTypes.EModeCategoryBaseConfiguration memory categoryData;</span></span>
+<span id="L400"><span class="lineNum">     400</span>                 :<span class="tlaGNC">       10029 :     categoryData.ltv = ltv;</span></span>
+<span id="L401"><span class="lineNum">     401</span>                 :<span class="tlaGNC">       10029 :     categoryData.liquidationThreshold = liquidationThreshold;</span></span>
+<span id="L402"><span class="lineNum">     402</span>                 :<span class="tlaGNC">       10029 :     categoryData.liquidationBonus = liquidationBonus;</span></span>
+<span id="L403"><span class="lineNum">     403</span>                 :<span class="tlaGNC">       10029 :     categoryData.label = label;</span></span>
+<span id="L404"><span class="lineNum">     404</span>                 :             : </span>
+<span id="L405"><span class="lineNum">     405</span>                 :<span class="tlaGNC">       10029 :     _pool.configureEModeCategory(categoryId, categoryData);</span></span>
+<span id="L406"><span class="lineNum">     406</span>                 :<span class="tlaGNC">       10029 :     emit EModeCategoryAdded(</span></span>
+<span id="L407"><span class="lineNum">     407</span>                 :             :       categoryId,</span>
+<span id="L408"><span class="lineNum">     408</span>                 :             :       ltv,</span>
+<span id="L409"><span class="lineNum">     409</span>                 :             :       liquidationThreshold,</span>
+<span id="L410"><span class="lineNum">     410</span>                 :             :       liquidationBonus,</span>
+<span id="L411"><span class="lineNum">     411</span>                 :             :       address(0),</span>
+<span id="L412"><span class="lineNum">     412</span>                 :             :       label</span>
+<span id="L413"><span class="lineNum">     413</span>                 :             :     );</span>
+<span id="L414"><span class="lineNum">     414</span>                 :             :   }</span>
 <span id="L415"><span class="lineNum">     415</span>                 :             : </span>
-<span id="L416"><span class="lineNum">     416</span>                 :<span class="tlaGNC">          90 :     address[] memory reserves = _pool.getReservesList();</span></span>
-<span id="L417"><span class="lineNum">     417</span>                 :<span class="tlaGNC">         256 :     for (uint256 i = 0; i &lt; reserves.length; i++) {</span></span>
-<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">         258 :       DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(reserves[i]);</span></span>
-<span id="L419"><span class="lineNum">     419</span>                 :<span class="tlaGNC">         258 :       if (categoryId == currentConfig.getEModeCategory()) {</span></span>
-<span id="L420"><span class="lineNum">     420</span>                 :<span class="tlaGNC">           6 :         require(ltv &gt; currentConfig.getLtv(), Errors.INVALID_EMODE_CATEGORY_PARAMS);</span></span>
-<span id="L421"><span class="lineNum">     421</span>                 :<span class="tlaGNC">           2 :         require(</span></span>
-<span id="L422"><span class="lineNum">     422</span>                 :             :           liquidationThreshold &gt; currentConfig.getLiquidationThreshold(),</span>
-<span id="L423"><span class="lineNum">     423</span>                 :             :           Errors.INVALID_EMODE_CATEGORY_PARAMS</span>
-<span id="L424"><span class="lineNum">     424</span>                 :             :         );</span>
-<span id="L425"><span class="lineNum">     425</span>                 :             :       }</span>
-<span id="L426"><span class="lineNum">     426</span>                 :             :     }</span>
-<span id="L427"><span class="lineNum">     427</span>                 :             : </span>
-<span id="L428"><span class="lineNum">     428</span>                 :<span class="tlaGNC">          54 :     _pool.configureEModeCategory(</span></span>
-<span id="L429"><span class="lineNum">     429</span>                 :             :       categoryId,</span>
-<span id="L430"><span class="lineNum">     430</span>                 :             :       DataTypes.EModeCategory({</span>
-<span id="L431"><span class="lineNum">     431</span>                 :             :         ltv: ltv,</span>
-<span id="L432"><span class="lineNum">     432</span>                 :             :         liquidationThreshold: liquidationThreshold,</span>
-<span id="L433"><span class="lineNum">     433</span>                 :             :         liquidationBonus: liquidationBonus,</span>
-<span id="L434"><span class="lineNum">     434</span>                 :             :         priceSource: oracle,</span>
-<span id="L435"><span class="lineNum">     435</span>                 :             :         label: label</span>
-<span id="L436"><span class="lineNum">     436</span>                 :             :       })</span>
-<span id="L437"><span class="lineNum">     437</span>                 :             :     );</span>
-<span id="L438"><span class="lineNum">     438</span>                 :<span class="tlaGNC">          54 :     emit EModeCategoryAdded(categoryId, ltv, liquidationThreshold, liquidationBonus, oracle, label);</span></span>
-<span id="L439"><span class="lineNum">     439</span>                 :             :   }</span>
-<span id="L440"><span class="lineNum">     440</span>                 :             : </span>
-<span id="L441"><span class="lineNum">     441</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L442"><span class="lineNum">     442</span>                 :<span class="tlaGNC">        1786 :   function setAssetEModeCategory(</span></span>
-<span id="L443"><span class="lineNum">     443</span>                 :             :     address asset,</span>
-<span id="L444"><span class="lineNum">     444</span>                 :             :     uint8 newCategoryId</span>
-<span id="L445"><span class="lineNum">     445</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L446"><span class="lineNum">     446</span>                 :<span class="tlaGNC">        5355 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L447"><span class="lineNum">     447</span>                 :             : </span>
-<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">        3570 :     if (newCategoryId != 0) {</span></span>
-<span id="L449"><span class="lineNum">     449</span>                 :<span class="tlaGNC">         114 :       DataTypes.EModeCategory memory categoryData = _pool.getEModeCategoryData(newCategoryId);</span></span>
-<span id="L450"><span class="lineNum">     450</span>                 :<span class="tlaGNC">          76 :       require(</span></span>
-<span id="L451"><span class="lineNum">     451</span>                 :             :         categoryData.liquidationThreshold &gt; currentConfig.getLiquidationThreshold(),</span>
-<span id="L452"><span class="lineNum">     452</span>                 :             :         Errors.INVALID_EMODE_CATEGORY_ASSIGNMENT</span>
-<span id="L453"><span class="lineNum">     453</span>                 :             :       );</span>
-<span id="L454"><span class="lineNum">     454</span>                 :             :     }</span>
-<span id="L455"><span class="lineNum">     455</span>                 :<span class="tlaGNC">        5352 :     uint256 oldCategoryId = currentConfig.getEModeCategory();</span></span>
-<span id="L456"><span class="lineNum">     456</span>                 :<span class="tlaGNC">        3568 :     currentConfig.setEModeCategory(newCategoryId);</span></span>
-<span id="L457"><span class="lineNum">     457</span>                 :<span class="tlaGNC">        3568 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L458"><span class="lineNum">     458</span>                 :<span class="tlaGNC">        3568 :     emit EModeAssetCategoryChanged(asset, uint8(oldCategoryId), newCategoryId);</span></span>
-<span id="L459"><span class="lineNum">     459</span>                 :             :   }</span>
-<span id="L460"><span class="lineNum">     460</span>                 :             : </span>
-<span id="L461"><span class="lineNum">     461</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L462"><span class="lineNum">     462</span>                 :<span class="tlaGNC">           7 :   function setUnbackedMintCap(</span></span>
-<span id="L463"><span class="lineNum">     463</span>                 :             :     address asset,</span>
-<span id="L464"><span class="lineNum">     464</span>                 :             :     uint256 newUnbackedMintCap</span>
-<span id="L465"><span class="lineNum">     465</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L466"><span class="lineNum">     466</span>                 :<span class="tlaGNC">          21 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
-<span id="L467"><span class="lineNum">     467</span>                 :<span class="tlaGNC">          21 :     uint256 oldUnbackedMintCap = currentConfig.getUnbackedMintCap();</span></span>
-<span id="L468"><span class="lineNum">     468</span>                 :<span class="tlaGNC">          14 :     currentConfig.setUnbackedMintCap(newUnbackedMintCap);</span></span>
-<span id="L469"><span class="lineNum">     469</span>                 :<span class="tlaGNC">          14 :     _pool.setConfiguration(asset, currentConfig);</span></span>
-<span id="L470"><span class="lineNum">     470</span>                 :<span class="tlaGNC">          14 :     emit UnbackedMintCapChanged(asset, oldUnbackedMintCap, newUnbackedMintCap);</span></span>
+<span id="L416"><span class="lineNum">     416</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L417"><span class="lineNum">     417</span>                 :             :   function setAssetCollateralInEMode(</span>
+<span id="L418"><span class="lineNum">     418</span>                 :             :     address asset,</span>
+<span id="L419"><span class="lineNum">     419</span>                 :             :     uint8 categoryId,</span>
+<span id="L420"><span class="lineNum">     420</span>                 :             :     bool allowed</span>
+<span id="L421"><span class="lineNum">     421</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L422"><span class="lineNum">     422</span>                 :<span class="tlaGNC">       10039 :     uint128 collateralBitmap = _pool.getEModeCategoryCollateralBitmap(categoryId);</span></span>
+<span id="L423"><span class="lineNum">     423</span>                 :<span class="tlaGNC">       10039 :     DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);</span></span>
+<span id="L424"><span class="lineNum">     424</span>                 :<span class="tlaGNC">       10039 :     require(reserveData.id != 0 || _pool.getReservesList()[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L425"><span class="lineNum">     425</span>                 :<span class="tlaGNC">       10039 :     collateralBitmap = EModeConfiguration.setReserveBitmapBit(</span></span>
+<span id="L426"><span class="lineNum">     426</span>                 :             :       collateralBitmap,</span>
+<span id="L427"><span class="lineNum">     427</span>                 :             :       reserveData.id,</span>
+<span id="L428"><span class="lineNum">     428</span>                 :             :       allowed</span>
+<span id="L429"><span class="lineNum">     429</span>                 :             :     );</span>
+<span id="L430"><span class="lineNum">     430</span>                 :<span class="tlaGNC">       10039 :     _pool.configureEModeCategoryCollateralBitmap(categoryId, collateralBitmap);</span></span>
+<span id="L431"><span class="lineNum">     431</span>                 :<span class="tlaGNC">       10039 :     emit AssetCollateralInEModeChanged(asset, categoryId, allowed);</span></span>
+<span id="L432"><span class="lineNum">     432</span>                 :             :   }</span>
+<span id="L433"><span class="lineNum">     433</span>                 :             : </span>
+<span id="L434"><span class="lineNum">     434</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L435"><span class="lineNum">     435</span>                 :             :   function setAssetBorrowableInEMode(</span>
+<span id="L436"><span class="lineNum">     436</span>                 :             :     address asset,</span>
+<span id="L437"><span class="lineNum">     437</span>                 :             :     uint8 categoryId,</span>
+<span id="L438"><span class="lineNum">     438</span>                 :             :     bool borrowable</span>
+<span id="L439"><span class="lineNum">     439</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L440"><span class="lineNum">     440</span>                 :<span class="tlaGNC">        7010 :     uint128 borrowableBitmap = _pool.getEModeCategoryBorrowableBitmap(categoryId);</span></span>
+<span id="L441"><span class="lineNum">     441</span>                 :<span class="tlaGNC">        7010 :     DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);</span></span>
+<span id="L442"><span class="lineNum">     442</span>                 :<span class="tlaGNC">        7010 :     require(reserveData.id != 0 || _pool.getReservesList()[0] == asset, Errors.ASSET_NOT_LISTED);</span></span>
+<span id="L443"><span class="lineNum">     443</span>                 :<span class="tlaGNC">        7010 :     borrowableBitmap = EModeConfiguration.setReserveBitmapBit(</span></span>
+<span id="L444"><span class="lineNum">     444</span>                 :             :       borrowableBitmap,</span>
+<span id="L445"><span class="lineNum">     445</span>                 :             :       reserveData.id,</span>
+<span id="L446"><span class="lineNum">     446</span>                 :             :       borrowable</span>
+<span id="L447"><span class="lineNum">     447</span>                 :             :     );</span>
+<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">        7010 :     _pool.configureEModeCategoryBorrowableBitmap(categoryId, borrowableBitmap);</span></span>
+<span id="L449"><span class="lineNum">     449</span>                 :<span class="tlaGNC">        7010 :     emit AssetBorrowableInEModeChanged(asset, categoryId, borrowable);</span></span>
+<span id="L450"><span class="lineNum">     450</span>                 :             :   }</span>
+<span id="L451"><span class="lineNum">     451</span>                 :             : </span>
+<span id="L452"><span class="lineNum">     452</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L453"><span class="lineNum">     453</span>                 :             :   function setUnbackedMintCap(</span>
+<span id="L454"><span class="lineNum">     454</span>                 :             :     address asset,</span>
+<span id="L455"><span class="lineNum">     455</span>                 :             :     uint256 newUnbackedMintCap</span>
+<span id="L456"><span class="lineNum">     456</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L457"><span class="lineNum">     457</span>                 :<span class="tlaGNC">           7 :     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);</span></span>
+<span id="L458"><span class="lineNum">     458</span>                 :<span class="tlaGNC">           7 :     uint256 oldUnbackedMintCap = currentConfig.getUnbackedMintCap();</span></span>
+<span id="L459"><span class="lineNum">     459</span>                 :<span class="tlaGNC">           7 :     currentConfig.setUnbackedMintCap(newUnbackedMintCap);</span></span>
+<span id="L460"><span class="lineNum">     460</span>                 :<span class="tlaGNC">           7 :     _pool.setConfiguration(asset, currentConfig);</span></span>
+<span id="L461"><span class="lineNum">     461</span>                 :<span class="tlaGNC">           7 :     emit UnbackedMintCapChanged(asset, oldUnbackedMintCap, newUnbackedMintCap);</span></span>
+<span id="L462"><span class="lineNum">     462</span>                 :             :   }</span>
+<span id="L463"><span class="lineNum">     463</span>                 :             : </span>
+<span id="L464"><span class="lineNum">     464</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L465"><span class="lineNum">     465</span>                 :             :   function setReserveInterestRateData(</span>
+<span id="L466"><span class="lineNum">     466</span>                 :             :     address asset,</span>
+<span id="L467"><span class="lineNum">     467</span>                 :             :     bytes calldata rateData</span>
+<span id="L468"><span class="lineNum">     468</span>                 :             :   ) external onlyRiskOrPoolAdmins {</span>
+<span id="L469"><span class="lineNum">     469</span>                 :<span class="tlaGNC">           2 :     DataTypes.ReserveDataLegacy memory reserve = _pool.getReserveData(asset);</span></span>
+<span id="L470"><span class="lineNum">     470</span>                 :<span class="tlaGNC">           2 :     _updateInterestRateStrategy(asset, reserve, reserve.interestRateStrategyAddress, rateData);</span></span>
 <span id="L471"><span class="lineNum">     471</span>                 :             :   }</span>
 <span id="L472"><span class="lineNum">     472</span>                 :             : </span>
 <span id="L473"><span class="lineNum">     473</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L474"><span class="lineNum">     474</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function setReserveInterestRateData(</span></span>
+<span id="L474"><span class="lineNum">     474</span>                 :             :   function setReserveInterestRateStrategyAddress(</span>
 <span id="L475"><span class="lineNum">     475</span>                 :             :     address asset,</span>
-<span id="L476"><span class="lineNum">     476</span>                 :             :     bytes calldata rateData</span>
-<span id="L477"><span class="lineNum">     477</span>                 :             :   ) external onlyRiskOrPoolAdmins {</span>
-<span id="L478"><span class="lineNum">     478</span>                 :<span class="tlaUNC">           0 :     DataTypes.ReserveDataLegacy memory reserve = _pool.getReserveData(asset);</span></span>
-<span id="L479"><span class="lineNum">     479</span>                 :<span class="tlaUNC">           0 :     _updateInterestRateStrategy(asset, reserve, reserve.interestRateStrategyAddress, rateData);</span></span>
-<span id="L480"><span class="lineNum">     480</span>                 :             :   }</span>
-<span id="L481"><span class="lineNum">     481</span>                 :             : </span>
-<span id="L482"><span class="lineNum">     482</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L483"><span class="lineNum">     483</span>                 :<span class="tlaGNC tlaBgGNC">           5 :   function setReserveInterestRateStrategyAddress(</span></span>
-<span id="L484"><span class="lineNum">     484</span>                 :             :     address asset,</span>
-<span id="L485"><span class="lineNum">     485</span>                 :             :     address rateStrategyAddress,</span>
-<span id="L486"><span class="lineNum">     486</span>                 :             :     bytes calldata rateData</span>
-<span id="L487"><span class="lineNum">     487</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
-<span id="L488"><span class="lineNum">     488</span>                 :<span class="tlaGNC">          12 :     DataTypes.ReserveDataLegacy memory reserve = _pool.getReserveData(asset);</span></span>
-<span id="L489"><span class="lineNum">     489</span>                 :<span class="tlaGNC">           8 :     _updateInterestRateStrategy(asset, reserve, rateStrategyAddress, rateData);</span></span>
-<span id="L490"><span class="lineNum">     490</span>                 :             :   }</span>
-<span id="L491"><span class="lineNum">     491</span>                 :             : </span>
-<span id="L492"><span class="lineNum">     492</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L493"><span class="lineNum">     493</span>                 :<span class="tlaGNC">        3003 :   function setPoolPause(bool paused, uint40 gracePeriod) public override onlyEmergencyOrPoolAdmin {</span></span>
-<span id="L494"><span class="lineNum">     494</span>                 :<span class="tlaGNC">        3009 :     address[] memory reserves = _pool.getReservesList();</span></span>
-<span id="L495"><span class="lineNum">     495</span>                 :             : </span>
-<span id="L496"><span class="lineNum">     496</span>                 :<span class="tlaGNC">        9027 :     for (uint256 i = 0; i &lt; reserves.length; i++) {</span></span>
-<span id="L497"><span class="lineNum">     497</span>                 :<span class="tlaGNC">        9027 :       if (reserves[i] != address(0)) {</span></span>
-<span id="L498"><span class="lineNum">     498</span>                 :<span class="tlaGNC">        6018 :         setReservePause(reserves[i], paused, gracePeriod);</span></span>
-<span id="L499"><span class="lineNum">     499</span>                 :             :       }</span>
-<span id="L500"><span class="lineNum">     500</span>                 :             :     }</span>
-<span id="L501"><span class="lineNum">     501</span>                 :             :   }</span>
-<span id="L502"><span class="lineNum">     502</span>                 :             : </span>
-<span id="L503"><span class="lineNum">     503</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L504"><span class="lineNum">     504</span>                 :             :   function setPoolPause(bool paused) external override onlyEmergencyOrPoolAdmin {</span>
-<span id="L505"><span class="lineNum">     505</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     setPoolPause(paused, 0);</span></span>
-<span id="L506"><span class="lineNum">     506</span>                 :             :   }</span>
-<span id="L507"><span class="lineNum">     507</span>                 :             : </span>
-<span id="L508"><span class="lineNum">     508</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L509"><span class="lineNum">     509</span>                 :<span class="tlaGNC tlaBgGNC">          14 :   function updateBridgeProtocolFee(uint256 newBridgeProtocolFee) external override onlyPoolAdmin {</span></span>
-<span id="L510"><span class="lineNum">     510</span>                 :<span class="tlaGNC">          28 :     require(</span></span>
-<span id="L511"><span class="lineNum">     511</span>                 :             :       newBridgeProtocolFee &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L512"><span class="lineNum">     512</span>                 :             :       Errors.BRIDGE_PROTOCOL_FEE_INVALID</span>
-<span id="L513"><span class="lineNum">     513</span>                 :             :     );</span>
-<span id="L514"><span class="lineNum">     514</span>                 :<span class="tlaGNC">          39 :     uint256 oldBridgeProtocolFee = _pool.BRIDGE_PROTOCOL_FEE();</span></span>
-<span id="L515"><span class="lineNum">     515</span>                 :<span class="tlaGNC">          26 :     _pool.updateBridgeProtocolFee(newBridgeProtocolFee);</span></span>
-<span id="L516"><span class="lineNum">     516</span>                 :<span class="tlaGNC">          26 :     emit BridgeProtocolFeeUpdated(oldBridgeProtocolFee, newBridgeProtocolFee);</span></span>
-<span id="L517"><span class="lineNum">     517</span>                 :             :   }</span>
-<span id="L518"><span class="lineNum">     518</span>                 :             : </span>
-<span id="L519"><span class="lineNum">     519</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L520"><span class="lineNum">     520</span>                 :<span class="tlaGNC">         608 :   function updateFlashloanPremiumTotal(</span></span>
-<span id="L521"><span class="lineNum">     521</span>                 :             :     uint128 newFlashloanPremiumTotal</span>
-<span id="L522"><span class="lineNum">     522</span>                 :             :   ) external override onlyPoolAdmin {</span>
-<span id="L523"><span class="lineNum">     523</span>                 :<span class="tlaGNC">        1214 :     require(</span></span>
-<span id="L524"><span class="lineNum">     524</span>                 :             :       newFlashloanPremiumTotal &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L525"><span class="lineNum">     525</span>                 :             :       Errors.FLASHLOAN_PREMIUM_INVALID</span>
-<span id="L526"><span class="lineNum">     526</span>                 :             :     );</span>
-<span id="L527"><span class="lineNum">     527</span>                 :<span class="tlaGNC">        1818 :     uint128 oldFlashloanPremiumTotal = _pool.FLASHLOAN_PREMIUM_TOTAL();</span></span>
-<span id="L528"><span class="lineNum">     528</span>                 :<span class="tlaGNC">        1212 :     _pool.updateFlashloanPremiums(newFlashloanPremiumTotal, _pool.FLASHLOAN_PREMIUM_TO_PROTOCOL());</span></span>
-<span id="L529"><span class="lineNum">     529</span>                 :<span class="tlaGNC">        1212 :     emit FlashloanPremiumTotalUpdated(oldFlashloanPremiumTotal, newFlashloanPremiumTotal);</span></span>
-<span id="L530"><span class="lineNum">     530</span>                 :             :   }</span>
-<span id="L531"><span class="lineNum">     531</span>                 :             : </span>
-<span id="L532"><span class="lineNum">     532</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L533"><span class="lineNum">     533</span>                 :<span class="tlaGNC">         608 :   function updateFlashloanPremiumToProtocol(</span></span>
-<span id="L534"><span class="lineNum">     534</span>                 :             :     uint128 newFlashloanPremiumToProtocol</span>
-<span id="L535"><span class="lineNum">     535</span>                 :             :   ) external override onlyPoolAdmin {</span>
-<span id="L536"><span class="lineNum">     536</span>                 :<span class="tlaGNC">        1214 :     require(</span></span>
-<span id="L537"><span class="lineNum">     537</span>                 :             :       newFlashloanPremiumToProtocol &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
-<span id="L538"><span class="lineNum">     538</span>                 :             :       Errors.FLASHLOAN_PREMIUM_INVALID</span>
-<span id="L539"><span class="lineNum">     539</span>                 :             :     );</span>
-<span id="L540"><span class="lineNum">     540</span>                 :<span class="tlaGNC">        1818 :     uint128 oldFlashloanPremiumToProtocol = _pool.FLASHLOAN_PREMIUM_TO_PROTOCOL();</span></span>
-<span id="L541"><span class="lineNum">     541</span>                 :<span class="tlaGNC">        1212 :     _pool.updateFlashloanPremiums(_pool.FLASHLOAN_PREMIUM_TOTAL(), newFlashloanPremiumToProtocol);</span></span>
-<span id="L542"><span class="lineNum">     542</span>                 :<span class="tlaGNC">        1212 :     emit FlashloanPremiumToProtocolUpdated(</span></span>
-<span id="L543"><span class="lineNum">     543</span>                 :             :       oldFlashloanPremiumToProtocol,</span>
-<span id="L544"><span class="lineNum">     544</span>                 :             :       newFlashloanPremiumToProtocol</span>
-<span id="L545"><span class="lineNum">     545</span>                 :             :     );</span>
-<span id="L546"><span class="lineNum">     546</span>                 :             :   }</span>
-<span id="L547"><span class="lineNum">     547</span>                 :             : </span>
-<span id="L548"><span class="lineNum">     548</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L549"><span class="lineNum">     549</span>                 :<span class="tlaGNC">        2003 :   function getPendingLtv(address asset) external view override returns (uint256, bool) {</span></span>
-<span id="L550"><span class="lineNum">     550</span>                 :<span class="tlaGNC">        4006 :     return (_pendingLtv[asset], _isPendingLtvSet[asset]);</span></span>
-<span id="L551"><span class="lineNum">     551</span>                 :             :   }</span>
-<span id="L552"><span class="lineNum">     552</span>                 :             : </span>
-<span id="L553"><span class="lineNum">     553</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
-<span id="L554"><span class="lineNum">     554</span>                 :<span class="tlaGNC">           1 :   function getConfiguratorLogic() external pure returns (address) {</span></span>
-<span id="L555"><span class="lineNum">     555</span>                 :<span class="tlaGNC">           3 :     return address(ConfiguratorLogic);</span></span>
-<span id="L556"><span class="lineNum">     556</span>                 :             :   }</span>
-<span id="L557"><span class="lineNum">     557</span>                 :             : </span>
-<span id="L558"><span class="lineNum">     558</span>                 :<span class="tlaGNC">           4 :   function _updateInterestRateStrategy(</span></span>
-<span id="L559"><span class="lineNum">     559</span>                 :             :     address asset,</span>
-<span id="L560"><span class="lineNum">     560</span>                 :             :     DataTypes.ReserveDataLegacy memory reserve,</span>
-<span id="L561"><span class="lineNum">     561</span>                 :             :     address newRateStrategyAddress,</span>
-<span id="L562"><span class="lineNum">     562</span>                 :             :     bytes calldata rateData</span>
-<span id="L563"><span class="lineNum">     563</span>                 :             :   ) internal {</span>
-<span id="L564"><span class="lineNum">     564</span>                 :<span class="tlaGNC">           8 :     address oldRateStrategyAddress = reserve.interestRateStrategyAddress;</span></span>
-<span id="L565"><span class="lineNum">     565</span>                 :             : </span>
-<span id="L566"><span class="lineNum">     566</span>                 :<span class="tlaGNC">           8 :     _pool.syncIndexesState(asset);</span></span>
-<span id="L567"><span class="lineNum">     567</span>                 :             : </span>
-<span id="L568"><span class="lineNum">     568</span>                 :<span class="tlaGNC">           8 :     IDefaultInterestRateStrategyV2(newRateStrategyAddress).setInterestRateParams(asset, rateData);</span></span>
-<span id="L569"><span class="lineNum">     569</span>                 :<span class="tlaGNC">           8 :     emit ReserveInterestRateDataChanged(asset, newRateStrategyAddress, rateData);</span></span>
+<span id="L476"><span class="lineNum">     476</span>                 :             :     address rateStrategyAddress,</span>
+<span id="L477"><span class="lineNum">     477</span>                 :             :     bytes calldata rateData</span>
+<span id="L478"><span class="lineNum">     478</span>                 :             :   ) external override onlyRiskOrPoolAdmins {</span>
+<span id="L479"><span class="lineNum">     479</span>                 :<span class="tlaGNC">          44 :     DataTypes.ReserveDataLegacy memory reserve = _pool.getReserveData(asset);</span></span>
+<span id="L480"><span class="lineNum">     480</span>                 :<span class="tlaGNC">          44 :     _updateInterestRateStrategy(asset, reserve, rateStrategyAddress, rateData);</span></span>
+<span id="L481"><span class="lineNum">     481</span>                 :             :   }</span>
+<span id="L482"><span class="lineNum">     482</span>                 :             : </span>
+<span id="L483"><span class="lineNum">     483</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L484"><span class="lineNum">     484</span>                 :             :   function setPoolPause(bool paused, uint40 gracePeriod) public override onlyEmergencyOrPoolAdmin {</span>
+<span id="L485"><span class="lineNum">     485</span>                 :<span class="tlaGNC">        1003 :     address[] memory reserves = _pool.getReservesList();</span></span>
+<span id="L486"><span class="lineNum">     486</span>                 :             : </span>
+<span id="L487"><span class="lineNum">     487</span>                 :<span class="tlaGNC">        1003 :     for (uint256 i = 0; i &lt; reserves.length; i++) {</span></span>
+<span id="L488"><span class="lineNum">     488</span>                 :<span class="tlaGNC">        3009 :       if (reserves[i] != address(0)) {</span></span>
+<span id="L489"><span class="lineNum">     489</span>                 :<span class="tlaGNC">        3009 :         setReservePause(reserves[i], paused, gracePeriod);</span></span>
+<span id="L490"><span class="lineNum">     490</span>                 :             :       }</span>
+<span id="L491"><span class="lineNum">     491</span>                 :             :     }</span>
+<span id="L492"><span class="lineNum">     492</span>                 :             :   }</span>
+<span id="L493"><span class="lineNum">     493</span>                 :             : </span>
+<span id="L494"><span class="lineNum">     494</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L495"><span class="lineNum">     495</span>                 :             :   function setPoolPause(bool paused) external override onlyEmergencyOrPoolAdmin {</span>
+<span id="L496"><span class="lineNum">     496</span>                 :<span class="tlaGNC">           3 :     setPoolPause(paused, 0);</span></span>
+<span id="L497"><span class="lineNum">     497</span>                 :             :   }</span>
+<span id="L498"><span class="lineNum">     498</span>                 :             : </span>
+<span id="L499"><span class="lineNum">     499</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L500"><span class="lineNum">     500</span>                 :             :   function updateBridgeProtocolFee(uint256 newBridgeProtocolFee) external override onlyPoolAdmin {</span>
+<span id="L501"><span class="lineNum">     501</span>                 :<span class="tlaGNC">          14 :     require(</span></span>
+<span id="L502"><span class="lineNum">     502</span>                 :             :       newBridgeProtocolFee &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L503"><span class="lineNum">     503</span>                 :             :       Errors.BRIDGE_PROTOCOL_FEE_INVALID</span>
+<span id="L504"><span class="lineNum">     504</span>                 :             :     );</span>
+<span id="L505"><span class="lineNum">     505</span>                 :<span class="tlaGNC">          13 :     uint256 oldBridgeProtocolFee = _pool.BRIDGE_PROTOCOL_FEE();</span></span>
+<span id="L506"><span class="lineNum">     506</span>                 :<span class="tlaGNC">          13 :     _pool.updateBridgeProtocolFee(newBridgeProtocolFee);</span></span>
+<span id="L507"><span class="lineNum">     507</span>                 :<span class="tlaGNC">          13 :     emit BridgeProtocolFeeUpdated(oldBridgeProtocolFee, newBridgeProtocolFee);</span></span>
+<span id="L508"><span class="lineNum">     508</span>                 :             :   }</span>
+<span id="L509"><span class="lineNum">     509</span>                 :             : </span>
+<span id="L510"><span class="lineNum">     510</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L511"><span class="lineNum">     511</span>                 :             :   function updateFlashloanPremiumTotal(</span>
+<span id="L512"><span class="lineNum">     512</span>                 :             :     uint128 newFlashloanPremiumTotal</span>
+<span id="L513"><span class="lineNum">     513</span>                 :             :   ) external override onlyPoolAdmin {</span>
+<span id="L514"><span class="lineNum">     514</span>                 :<span class="tlaGNC">         682 :     require(</span></span>
+<span id="L515"><span class="lineNum">     515</span>                 :             :       newFlashloanPremiumTotal &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L516"><span class="lineNum">     516</span>                 :             :       Errors.FLASHLOAN_PREMIUM_INVALID</span>
+<span id="L517"><span class="lineNum">     517</span>                 :             :     );</span>
+<span id="L518"><span class="lineNum">     518</span>                 :<span class="tlaGNC">         681 :     uint128 oldFlashloanPremiumTotal = _pool.FLASHLOAN_PREMIUM_TOTAL();</span></span>
+<span id="L519"><span class="lineNum">     519</span>                 :<span class="tlaGNC">         681 :     _pool.updateFlashloanPremiums(newFlashloanPremiumTotal, _pool.FLASHLOAN_PREMIUM_TO_PROTOCOL());</span></span>
+<span id="L520"><span class="lineNum">     520</span>                 :<span class="tlaGNC">         681 :     emit FlashloanPremiumTotalUpdated(oldFlashloanPremiumTotal, newFlashloanPremiumTotal);</span></span>
+<span id="L521"><span class="lineNum">     521</span>                 :             :   }</span>
+<span id="L522"><span class="lineNum">     522</span>                 :             : </span>
+<span id="L523"><span class="lineNum">     523</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L524"><span class="lineNum">     524</span>                 :             :   function updateFlashloanPremiumToProtocol(</span>
+<span id="L525"><span class="lineNum">     525</span>                 :             :     uint128 newFlashloanPremiumToProtocol</span>
+<span id="L526"><span class="lineNum">     526</span>                 :             :   ) external override onlyPoolAdmin {</span>
+<span id="L527"><span class="lineNum">     527</span>                 :<span class="tlaGNC">         682 :     require(</span></span>
+<span id="L528"><span class="lineNum">     528</span>                 :             :       newFlashloanPremiumToProtocol &lt;= PercentageMath.PERCENTAGE_FACTOR,</span>
+<span id="L529"><span class="lineNum">     529</span>                 :             :       Errors.FLASHLOAN_PREMIUM_INVALID</span>
+<span id="L530"><span class="lineNum">     530</span>                 :             :     );</span>
+<span id="L531"><span class="lineNum">     531</span>                 :<span class="tlaGNC">         681 :     uint128 oldFlashloanPremiumToProtocol = _pool.FLASHLOAN_PREMIUM_TO_PROTOCOL();</span></span>
+<span id="L532"><span class="lineNum">     532</span>                 :<span class="tlaGNC">         681 :     _pool.updateFlashloanPremiums(_pool.FLASHLOAN_PREMIUM_TOTAL(), newFlashloanPremiumToProtocol);</span></span>
+<span id="L533"><span class="lineNum">     533</span>                 :<span class="tlaGNC">         681 :     emit FlashloanPremiumToProtocolUpdated(</span></span>
+<span id="L534"><span class="lineNum">     534</span>                 :             :       oldFlashloanPremiumToProtocol,</span>
+<span id="L535"><span class="lineNum">     535</span>                 :             :       newFlashloanPremiumToProtocol</span>
+<span id="L536"><span class="lineNum">     536</span>                 :             :     );</span>
+<span id="L537"><span class="lineNum">     537</span>                 :             :   }</span>
+<span id="L538"><span class="lineNum">     538</span>                 :             : </span>
+<span id="L539"><span class="lineNum">     539</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L540"><span class="lineNum">     540</span>                 :             :   function getPendingLtv(address asset) external view override returns (uint256) {</span>
+<span id="L541"><span class="lineNum">     541</span>                 :<span class="tlaGNC">        3003 :     return _pendingLtv[asset];</span></span>
+<span id="L542"><span class="lineNum">     542</span>                 :             :   }</span>
+<span id="L543"><span class="lineNum">     543</span>                 :             : </span>
+<span id="L544"><span class="lineNum">     544</span>                 :             :   /// @inheritdoc IPoolConfigurator</span>
+<span id="L545"><span class="lineNum">     545</span>                 :             :   function getConfiguratorLogic() external pure returns (address) {</span>
+<span id="L546"><span class="lineNum">     546</span>                 :<span class="tlaGNC">           1 :     return address(ConfiguratorLogic);</span></span>
+<span id="L547"><span class="lineNum">     547</span>                 :             :   }</span>
+<span id="L548"><span class="lineNum">     548</span>                 :             : </span>
+<span id="L549"><span class="lineNum">     549</span>                 :             :   function _updateInterestRateStrategy(</span>
+<span id="L550"><span class="lineNum">     550</span>                 :             :     address asset,</span>
+<span id="L551"><span class="lineNum">     551</span>                 :             :     DataTypes.ReserveDataLegacy memory reserve,</span>
+<span id="L552"><span class="lineNum">     552</span>                 :             :     address newRateStrategyAddress,</span>
+<span id="L553"><span class="lineNum">     553</span>                 :             :     bytes calldata rateData</span>
+<span id="L554"><span class="lineNum">     554</span>                 :             :   ) internal {</span>
+<span id="L555"><span class="lineNum">     555</span>                 :<span class="tlaGNC">          46 :     address oldRateStrategyAddress = reserve.interestRateStrategyAddress;</span></span>
+<span id="L556"><span class="lineNum">     556</span>                 :             : </span>
+<span id="L557"><span class="lineNum">     557</span>                 :<span class="tlaGNC">          46 :     _pool.syncIndexesState(asset);</span></span>
+<span id="L558"><span class="lineNum">     558</span>                 :             : </span>
+<span id="L559"><span class="lineNum">     559</span>                 :<span class="tlaGNC">          46 :     IDefaultInterestRateStrategyV2(newRateStrategyAddress).setInterestRateParams(asset, rateData);</span></span>
+<span id="L560"><span class="lineNum">     560</span>                 :<span class="tlaGNC">          46 :     emit ReserveInterestRateDataChanged(asset, newRateStrategyAddress, rateData);</span></span>
+<span id="L561"><span class="lineNum">     561</span>                 :             : </span>
+<span id="L562"><span class="lineNum">     562</span>                 :<span class="tlaGNC">          46 :     if (oldRateStrategyAddress != newRateStrategyAddress) {</span></span>
+<span id="L563"><span class="lineNum">     563</span>                 :<span class="tlaGNC">          44 :       _pool.setReserveInterestRateStrategyAddress(asset, newRateStrategyAddress);</span></span>
+<span id="L564"><span class="lineNum">     564</span>                 :<span class="tlaGNC">          44 :       emit ReserveInterestRateStrategyChanged(</span></span>
+<span id="L565"><span class="lineNum">     565</span>                 :             :         asset,</span>
+<span id="L566"><span class="lineNum">     566</span>                 :             :         oldRateStrategyAddress,</span>
+<span id="L567"><span class="lineNum">     567</span>                 :             :         newRateStrategyAddress</span>
+<span id="L568"><span class="lineNum">     568</span>                 :             :       );</span>
+<span id="L569"><span class="lineNum">     569</span>                 :             :     }</span>
 <span id="L570"><span class="lineNum">     570</span>                 :             : </span>
-<span id="L571"><span class="lineNum">     571</span>                 :<span class="tlaGNC">           8 :     if (oldRateStrategyAddress != newRateStrategyAddress) {</span></span>
-<span id="L572"><span class="lineNum">     572</span>                 :<span class="tlaGNC">           8 :       _pool.setReserveInterestRateStrategyAddress(asset, newRateStrategyAddress);</span></span>
-<span id="L573"><span class="lineNum">     573</span>                 :<span class="tlaGNC">           8 :       emit ReserveInterestRateStrategyChanged(</span></span>
-<span id="L574"><span class="lineNum">     574</span>                 :             :         asset,</span>
-<span id="L575"><span class="lineNum">     575</span>                 :             :         oldRateStrategyAddress,</span>
-<span id="L576"><span class="lineNum">     576</span>                 :             :         newRateStrategyAddress</span>
-<span id="L577"><span class="lineNum">     577</span>                 :             :       );</span>
-<span id="L578"><span class="lineNum">     578</span>                 :             :     }</span>
-<span id="L579"><span class="lineNum">     579</span>                 :             : </span>
-<span id="L580"><span class="lineNum">     580</span>                 :<span class="tlaGNC">           8 :     _pool.syncRatesState(asset);</span></span>
-<span id="L581"><span class="lineNum">     581</span>                 :             :   }</span>
-<span id="L582"><span class="lineNum">     582</span>                 :             : </span>
-<span id="L583"><span class="lineNum">     583</span>                 :<span class="tlaGNC">        1774 :   function _checkNoSuppliers(address asset) internal view {</span></span>
-<span id="L584"><span class="lineNum">     584</span>                 :<span class="tlaGNC">        5322 :     DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);</span></span>
-<span id="L585"><span class="lineNum">     585</span>                 :<span class="tlaGNC">        5322 :     uint256 totalSupplied = IPoolDataProvider(_addressesProvider.getPoolDataProvider())</span></span>
-<span id="L586"><span class="lineNum">     586</span>                 :             :       .getATokenTotalSupply(asset);</span>
-<span id="L587"><span class="lineNum">     587</span>                 :             : </span>
-<span id="L588"><span class="lineNum">     588</span>                 :<span class="tlaGNC">        3548 :     require(</span></span>
-<span id="L589"><span class="lineNum">     589</span>                 :             :       totalSupplied == 0 &amp;&amp; reserveData.accruedToTreasury == 0,</span>
-<span id="L590"><span class="lineNum">     590</span>                 :             :       Errors.RESERVE_LIQUIDITY_NOT_ZERO</span>
-<span id="L591"><span class="lineNum">     591</span>                 :             :     );</span>
-<span id="L592"><span class="lineNum">     592</span>                 :             :   }</span>
-<span id="L593"><span class="lineNum">     593</span>                 :             : </span>
-<span id="L594"><span class="lineNum">     594</span>                 :<span class="tlaGNC">           3 :   function _checkNoBorrowers(address asset) internal view {</span></span>
-<span id="L595"><span class="lineNum">     595</span>                 :<span class="tlaGNC">           9 :     uint256 totalDebt = IPoolDataProvider(_addressesProvider.getPoolDataProvider()).getTotalDebt(</span></span>
-<span id="L596"><span class="lineNum">     596</span>                 :             :       asset</span>
-<span id="L597"><span class="lineNum">     597</span>                 :             :     );</span>
-<span id="L598"><span class="lineNum">     598</span>                 :<span class="tlaGNC">           6 :     require(totalDebt == 0, Errors.RESERVE_DEBT_NOT_ZERO);</span></span>
-<span id="L599"><span class="lineNum">     599</span>                 :             :   }</span>
-<span id="L600"><span class="lineNum">     600</span>                 :             : </span>
-<span id="L601"><span class="lineNum">     601</span>                 :<span class="tlaGNC">        1256 :   function _onlyPoolAdmin() internal view {</span></span>
-<span id="L602"><span class="lineNum">     602</span>                 :<span class="tlaGNC">        3768 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L603"><span class="lineNum">     603</span>                 :<span class="tlaGNC">        2512 :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span></span>
-<span id="L604"><span class="lineNum">     604</span>                 :             :   }</span>
-<span id="L605"><span class="lineNum">     605</span>                 :             : </span>
-<span id="L606"><span class="lineNum">     606</span>                 :<span class="tlaUNC tlaBgUNC">           0 :   function _onlyEmergencyAdmin() internal view {</span></span>
-<span id="L607"><span class="lineNum">     607</span>                 :<span class="tlaUNC">           0 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L608"><span class="lineNum">     608</span>                 :<span class="tlaUNC">           0 :     require(aclManager.isEmergencyAdmin(msg.sender), Errors.CALLER_NOT_EMERGENCY_ADMIN);</span></span>
-<span id="L609"><span class="lineNum">     609</span>                 :             :   }</span>
-<span id="L610"><span class="lineNum">     610</span>                 :             : </span>
-<span id="L611"><span class="lineNum">     611</span>                 :<span class="tlaGNC tlaBgGNC">       14903 :   function _onlyPoolOrEmergencyAdmin() internal view {</span></span>
-<span id="L612"><span class="lineNum">     612</span>                 :<span class="tlaGNC">       44709 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L613"><span class="lineNum">     613</span>                 :<span class="tlaGNC">       29806 :     require(</span></span>
-<span id="L614"><span class="lineNum">     614</span>                 :             :       aclManager.isPoolAdmin(msg.sender) || aclManager.isEmergencyAdmin(msg.sender),</span>
-<span id="L615"><span class="lineNum">     615</span>                 :             :       Errors.CALLER_NOT_POOL_OR_EMERGENCY_ADMIN</span>
-<span id="L616"><span class="lineNum">     616</span>                 :             :     );</span>
-<span id="L617"><span class="lineNum">     617</span>                 :             :   }</span>
-<span id="L618"><span class="lineNum">     618</span>                 :             : </span>
-<span id="L619"><span class="lineNum">     619</span>                 :<span class="tlaGNC">        2592 :   function _onlyAssetListingOrPoolAdmins() internal view {</span></span>
-<span id="L620"><span class="lineNum">     620</span>                 :<span class="tlaGNC">        7776 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L621"><span class="lineNum">     621</span>                 :<span class="tlaGNC">        5184 :     require(</span></span>
-<span id="L622"><span class="lineNum">     622</span>                 :             :       aclManager.isAssetListingAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
-<span id="L623"><span class="lineNum">     623</span>                 :             :       Errors.CALLER_NOT_ASSET_LISTING_OR_POOL_ADMIN</span>
-<span id="L624"><span class="lineNum">     624</span>                 :             :     );</span>
-<span id="L625"><span class="lineNum">     625</span>                 :             :   }</span>
-<span id="L626"><span class="lineNum">     626</span>                 :             : </span>
-<span id="L627"><span class="lineNum">     627</span>                 :<span class="tlaGNC">       24323 :   function _onlyRiskOrPoolAdmins() internal view {</span></span>
-<span id="L628"><span class="lineNum">     628</span>                 :<span class="tlaGNC">       72969 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L629"><span class="lineNum">     629</span>                 :<span class="tlaGNC">       48646 :     require(</span></span>
-<span id="L630"><span class="lineNum">     630</span>                 :             :       aclManager.isRiskAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
-<span id="L631"><span class="lineNum">     631</span>                 :             :       Errors.CALLER_NOT_RISK_OR_POOL_ADMIN</span>
-<span id="L632"><span class="lineNum">     632</span>                 :             :     );</span>
-<span id="L633"><span class="lineNum">     633</span>                 :             :   }</span>
-<span id="L634"><span class="lineNum">     634</span>                 :             : </span>
-<span id="L635"><span class="lineNum">     635</span>                 :<span class="tlaGNC">        1011 :   function _onlyRiskOrPoolOrEmergencyAdmins() internal view {</span></span>
-<span id="L636"><span class="lineNum">     636</span>                 :<span class="tlaGNC">        3033 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
-<span id="L637"><span class="lineNum">     637</span>                 :<span class="tlaGNC">        2022 :     require(</span></span>
-<span id="L638"><span class="lineNum">     638</span>                 :             :       aclManager.isRiskAdmin(msg.sender) ||</span>
-<span id="L639"><span class="lineNum">     639</span>                 :             :         aclManager.isPoolAdmin(msg.sender) ||</span>
-<span id="L640"><span class="lineNum">     640</span>                 :             :         aclManager.isEmergencyAdmin(msg.sender),</span>
-<span id="L641"><span class="lineNum">     641</span>                 :             :       Errors.CALLER_NOT_RISK_OR_POOL_OR_EMERGENCY_ADMIN</span>
-<span id="L642"><span class="lineNum">     642</span>                 :             :     );</span>
-<span id="L643"><span class="lineNum">     643</span>                 :             :   }</span>
-<span id="L644"><span class="lineNum">     644</span>                 :             : }</span>
+<span id="L571"><span class="lineNum">     571</span>                 :<span class="tlaGNC">          46 :     _pool.syncRatesState(asset);</span></span>
+<span id="L572"><span class="lineNum">     572</span>                 :             :   }</span>
+<span id="L573"><span class="lineNum">     573</span>                 :             : </span>
+<span id="L574"><span class="lineNum">     574</span>                 :             :   function _checkNoSuppliers(address asset) internal view {</span>
+<span id="L575"><span class="lineNum">     575</span>                 :<span class="tlaGNC">        2971 :     DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);</span></span>
+<span id="L576"><span class="lineNum">     576</span>                 :<span class="tlaGNC">        2971 :     uint256 totalSupplied = IPoolDataProvider(_addressesProvider.getPoolDataProvider())</span></span>
+<span id="L577"><span class="lineNum">     577</span>                 :             :       .getATokenTotalSupply(asset);</span>
+<span id="L578"><span class="lineNum">     578</span>                 :             : </span>
+<span id="L579"><span class="lineNum">     579</span>                 :<span class="tlaGNC">        2971 :     require(</span></span>
+<span id="L580"><span class="lineNum">     580</span>                 :             :       totalSupplied == 0 &amp;&amp; reserveData.accruedToTreasury == 0,</span>
+<span id="L581"><span class="lineNum">     581</span>                 :             :       Errors.RESERVE_LIQUIDITY_NOT_ZERO</span>
+<span id="L582"><span class="lineNum">     582</span>                 :             :     );</span>
+<span id="L583"><span class="lineNum">     583</span>                 :             :   }</span>
+<span id="L584"><span class="lineNum">     584</span>                 :             : </span>
+<span id="L585"><span class="lineNum">     585</span>                 :             :   function _checkNoBorrowers(address asset) internal view {</span>
+<span id="L586"><span class="lineNum">     586</span>                 :<span class="tlaGNC">           3 :     uint256 totalDebt = IPoolDataProvider(_addressesProvider.getPoolDataProvider()).getTotalDebt(</span></span>
+<span id="L587"><span class="lineNum">     587</span>                 :             :       asset</span>
+<span id="L588"><span class="lineNum">     588</span>                 :             :     );</span>
+<span id="L589"><span class="lineNum">     589</span>                 :<span class="tlaGNC">           3 :     require(totalDebt == 0, Errors.RESERVE_DEBT_NOT_ZERO);</span></span>
+<span id="L590"><span class="lineNum">     590</span>                 :             :   }</span>
+<span id="L591"><span class="lineNum">     591</span>                 :             : </span>
+<span id="L592"><span class="lineNum">     592</span>                 :             :   function _onlyPoolAdmin() internal view {</span>
+<span id="L593"><span class="lineNum">     593</span>                 :<span class="tlaGNC">        7396 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L594"><span class="lineNum">     594</span>                 :<span class="tlaGNC">        7396 :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span></span>
+<span id="L595"><span class="lineNum">     595</span>                 :             :   }</span>
+<span id="L596"><span class="lineNum">     596</span>                 :             : </span>
+<span id="L597"><span class="lineNum">     597</span>                 :             :   function _onlyPoolOrEmergencyAdmin() internal view {</span>
+<span id="L598"><span class="lineNum">     598</span>                 :<span class="tlaGNC">       24030 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L599"><span class="lineNum">     599</span>                 :<span class="tlaGNC">       24030 :     require(</span></span>
+<span id="L600"><span class="lineNum">     600</span>                 :             :       aclManager.isPoolAdmin(msg.sender) || aclManager.isEmergencyAdmin(msg.sender),</span>
+<span id="L601"><span class="lineNum">     601</span>                 :             :       Errors.CALLER_NOT_POOL_OR_EMERGENCY_ADMIN</span>
+<span id="L602"><span class="lineNum">     602</span>                 :             :     );</span>
+<span id="L603"><span class="lineNum">     603</span>                 :             :   }</span>
+<span id="L604"><span class="lineNum">     604</span>                 :             : </span>
+<span id="L605"><span class="lineNum">     605</span>                 :             :   function _onlyAssetListingOrPoolAdmins() internal view {</span>
+<span id="L606"><span class="lineNum">     606</span>                 :<span class="tlaGNC">        8651 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L607"><span class="lineNum">     607</span>                 :<span class="tlaGNC">        8651 :     require(</span></span>
+<span id="L608"><span class="lineNum">     608</span>                 :             :       aclManager.isAssetListingAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
+<span id="L609"><span class="lineNum">     609</span>                 :             :       Errors.CALLER_NOT_ASSET_LISTING_OR_POOL_ADMIN</span>
+<span id="L610"><span class="lineNum">     610</span>                 :             :     );</span>
+<span id="L611"><span class="lineNum">     611</span>                 :             :   }</span>
+<span id="L612"><span class="lineNum">     612</span>                 :             : </span>
+<span id="L613"><span class="lineNum">     613</span>                 :             :   function _onlyRiskOrPoolAdmins() internal view {</span>
+<span id="L614"><span class="lineNum">     614</span>                 :<span class="tlaGNC">       70679 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L615"><span class="lineNum">     615</span>                 :<span class="tlaGNC">       70679 :     require(</span></span>
+<span id="L616"><span class="lineNum">     616</span>                 :             :       aclManager.isRiskAdmin(msg.sender) || aclManager.isPoolAdmin(msg.sender),</span>
+<span id="L617"><span class="lineNum">     617</span>                 :             :       Errors.CALLER_NOT_RISK_OR_POOL_ADMIN</span>
+<span id="L618"><span class="lineNum">     618</span>                 :             :     );</span>
+<span id="L619"><span class="lineNum">     619</span>                 :             :   }</span>
+<span id="L620"><span class="lineNum">     620</span>                 :             : </span>
+<span id="L621"><span class="lineNum">     621</span>                 :             :   function _onlyRiskOrPoolOrEmergencyAdmins() internal view {</span>
+<span id="L622"><span class="lineNum">     622</span>                 :<span class="tlaGNC">        3014 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L623"><span class="lineNum">     623</span>                 :<span class="tlaGNC">        3014 :     require(</span></span>
+<span id="L624"><span class="lineNum">     624</span>                 :             :       aclManager.isRiskAdmin(msg.sender) ||</span>
+<span id="L625"><span class="lineNum">     625</span>                 :             :         aclManager.isPoolAdmin(msg.sender) ||</span>
+<span id="L626"><span class="lineNum">     626</span>                 :             :         aclManager.isEmergencyAdmin(msg.sender),</span>
+<span id="L627"><span class="lineNum">     627</span>                 :             :       Errors.CALLER_NOT_RISK_OR_POOL_OR_EMERGENCY_ADMIN</span>
+<span id="L628"><span class="lineNum">     628</span>                 :             :     );</span>
+<span id="L629"><span class="lineNum">     629</span>                 :             :   }</span>
+<span id="L630"><span class="lineNum">     630</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -720,8 +706,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/protocol/pool/index-sort-b.html b/report/protocol/pool/index-sort-b.html
new file mode 100644
index 00000000..4a505ab3
--- /dev/null
+++ b/report/protocol/pool/index-sort-b.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/pool</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/pool</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">99.4&nbsp;%</td>
+            <td class="headerCovTableEntry">331</td>
+            <td class="headerCovTableEntry">329</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">119</td>
+            <td class="headerCovTableEntry">119</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/L2Pool.sol">L2Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/Pool.sol">Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="98.3%"><img src="../../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">67</td>
+              <td class="coverNumDflt">67</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/PoolConfigurator.sol">PoolConfigurator.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">43</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/protocol/pool/index-sort-f.html b/report/protocol/pool/index-sort-f.html
new file mode 100644
index 00000000..3acdb117
--- /dev/null
+++ b/report/protocol/pool/index-sort-f.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/pool</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/pool</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">99.4&nbsp;%</td>
+            <td class="headerCovTableEntry">331</td>
+            <td class="headerCovTableEntry">329</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">119</td>
+            <td class="headerCovTableEntry">119</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/L2Pool.sol">L2Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/PoolConfigurator.sol">PoolConfigurator.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">43</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/Pool.sol">Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="98.3%"><img src="../../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">67</td>
+              <td class="coverNumDflt">67</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/protocol/pool/index-sort-l.html b/report/protocol/pool/index-sort-l.html
new file mode 100644
index 00000000..67060566
--- /dev/null
+++ b/report/protocol/pool/index-sort-l.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/pool</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/pool</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">99.4&nbsp;%</td>
+            <td class="headerCovTableEntry">331</td>
+            <td class="headerCovTableEntry">329</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">119</td>
+            <td class="headerCovTableEntry">119</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/Pool.sol">Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="98.3%"><img src="../../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">67</td>
+              <td class="coverNumDflt">67</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/L2Pool.sol">L2Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/PoolConfigurator.sol">PoolConfigurator.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">43</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/protocol/pool/index.html b/report/protocol/pool/index.html
new file mode 100644
index 00000000..2a47059c
--- /dev/null
+++ b/report/protocol/pool/index.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info.p - protocol/pool</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/pool</td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info.p</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryHi">99.4&nbsp;%</td>
+            <td class="headerCovTableEntry">331</td>
+            <td class="headerCovTableEntry">329</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
+            <td class="headerCovTableEntry">119</td>
+            <td class="headerCovTableEntry">119</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td class="headerItem">Branches:</td>
+            <td class="headerCovTableEntryHi">-</td>
+            <td class="headerCovTableEntry">0</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table width="80%" cellpadding=1 cellspacing=1 border=0>
+
+            <tr>
+              <td width="40%"><br></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            <td width="6%"></td>
+            </tr>
+
+            <tr>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+            </tr>
+            <tr>
+                    <td class="tableHead" colspan=2> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+                    <td class="tableHead"> Rate</td>
+                    <td class="tableHead"> Total</td>
+                    <td class="tableHead"> Hit</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="L2Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/L2Pool.sol">L2Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverNumDflt">20</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">9</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="Pool.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/Pool.sol">Pool.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="98.3%"><img src="../../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">67</td>
+              <td class="coverNumDflt">67</td>
+            </tr>
+            <tr>
+              <td class="coverFile"><a href="PoolConfigurator.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/pool/PoolConfigurator.sol">PoolConfigurator.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+              </td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverNumDflt">190</td>
+              <td class="coverPerHi">-</td>
+              <td class="coverNumDflt"></td>
+              <td class="coverNumDflt"></td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">43</td>
+              <td class="coverNumDflt">43</td>
+            </tr>
+          </table>
+          </center>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func-c.html b/report/protocol/tokenization/AToken.sol.func-c.html
similarity index 70%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func-c.html
rename to report/protocol/tokenization/AToken.sol.func-c.html
index 9d8e9ac6..c352b47a 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func-c.html
+++ b/report/protocol/tokenization/AToken.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/AToken.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (<a href="AToken.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (<a href="AToken.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AToken.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="AToken.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -79,107 +79,114 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L203">AToken.DOMAIN_SEPARATOR</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L78">AToken.mintToTreasury</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L78">AToken.mintToTreasury</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L36">AToken.</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">20</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L203">AToken.DOMAIN_SEPARATOR</a></td>
+              
+              <td class="coverFnHi">1004</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L211">AToken.nonces</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">1008</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L139">AToken.permit</a></td>
               
-              <td class="coverFnHi">15</td>
+              <td class="coverFnHi">3015</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L120">AToken.UNDERLYING_ASSET_ADDRESS</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L86">AToken.transferOnLiquidation</a></td>
               
-              <td class="coverFnHi">1005</td>
+              <td class="coverFnHi">8014</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L216">AToken._EIP712BaseId</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L130">AToken.handleRepayment</a></td>
               
-              <td class="coverFnHi">3471</td>
+              <td class="coverFnHi">11038</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L86">AToken.transferOnLiquidation</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L65">AToken.burn</a></td>
               
-              <td class="coverFnHi">6015</td>
+              <td class="coverFnHi">11054</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L115">AToken.RESERVE_TREASURY_ADDRESS</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L125">AToken.transferUnderlyingTo</a></td>
               
-              <td class="coverFnHi">7018</td>
+              <td class="coverFnHi">15108</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L65">AToken.burn</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L104">AToken.totalSupply</a></td>
               
-              <td class="coverFnHi">7055</td>
+              <td class="coverFnHi">18137</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L172">AToken._transfer</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L97">AToken.balanceOf</a></td>
               
-              <td class="coverFnHi">8086</td>
+              <td class="coverFnHi">31189</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L130">AToken.handleRepayment</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L120">AToken.UNDERLYING_ASSET_ADDRESS</a></td>
               
-              <td class="coverFnHi">9039</td>
+              <td class="coverFnHi">34168</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L125">AToken.transferUnderlyingTo</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L172">AToken._transfer</a></td>
               
-              <td class="coverFnHi">9110</td>
+              <td class="coverFnHi">42097</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L104">AToken.totalSupply</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L115">AToken.RESERVE_TREASURY_ADDRESS</a></td>
               
-              <td class="coverFnHi">10945</td>
+              <td class="coverFnHi">43085</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L55">AToken.mint</a></td>
               
-              <td class="coverFnHi">12594</td>
+              <td class="coverFnHi">43527</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="AToken.sol.gcov.html#L97">AToken.balanceOf</a></td>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L216">AToken._EIP712BaseId</a></td>
               
-              <td class="coverFnHi">15189</td>
+              <td class="coverFnHi">166698</td>
               
               
             </tr>
@@ -187,8 +194,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func.html b/report/protocol/tokenization/AToken.sol.func.html
similarity index 70%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func.html
rename to report/protocol/tokenization/AToken.sol.func.html
index d4c280e6..6a99c7dd 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.func.html
+++ b/report/protocol/tokenization/AToken.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/AToken.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (<a href="AToken.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (<a href="AToken.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td></td>
@@ -53,84 +53,91 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AToken.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="AToken.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="AToken.sol.gcov.html#L36">AToken.</a></td>
+              
+              <td class="coverFnHi">20</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L203">AToken.DOMAIN_SEPARATOR</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1004</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L115">AToken.RESERVE_TREASURY_ADDRESS</a></td>
               
-              <td class="coverFnHi">7018</td>
+              <td class="coverFnHi">43085</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L120">AToken.UNDERLYING_ASSET_ADDRESS</a></td>
               
-              <td class="coverFnHi">1005</td>
+              <td class="coverFnHi">34168</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L216">AToken._EIP712BaseId</a></td>
               
-              <td class="coverFnHi">3471</td>
+              <td class="coverFnHi">166698</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L172">AToken._transfer</a></td>
               
-              <td class="coverFnHi">8086</td>
+              <td class="coverFnHi">42097</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L97">AToken.balanceOf</a></td>
               
-              <td class="coverFnHi">15189</td>
+              <td class="coverFnHi">31189</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L65">AToken.burn</a></td>
               
-              <td class="coverFnHi">7055</td>
+              <td class="coverFnHi">11054</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L130">AToken.handleRepayment</a></td>
               
-              <td class="coverFnHi">9039</td>
+              <td class="coverFnHi">11038</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L55">AToken.mint</a></td>
               
-              <td class="coverFnHi">12594</td>
+              <td class="coverFnHi">43527</td>
               
               
             </tr>
@@ -144,14 +151,14 @@
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L211">AToken.nonces</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">1008</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L139">AToken.permit</a></td>
               
-              <td class="coverFnHi">15</td>
+              <td class="coverFnHi">3015</td>
               
               
             </tr>
@@ -165,21 +172,21 @@
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L104">AToken.totalSupply</a></td>
               
-              <td class="coverFnHi">10945</td>
+              <td class="coverFnHi">18137</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L86">AToken.transferOnLiquidation</a></td>
               
-              <td class="coverFnHi">6015</td>
+              <td class="coverFnHi">8014</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="AToken.sol.gcov.html#L125">AToken.transferUnderlyingTo</a></td>
               
-              <td class="coverFnHi">9110</td>
+              <td class="coverFnHi">15108</td>
               
               
             </tr>
@@ -187,8 +194,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.gcov.html b/report/protocol/tokenization/AToken.sol.gcov.html
similarity index 83%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.gcov.html
rename to report/protocol/tokenization/AToken.sol.gcov.html
index a1871e3d..f59846f3 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol.gcov.html
+++ b/report/protocol/tokenization/AToken.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/AToken.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/AToken.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (source / <a href="AToken.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - AToken.sol<span style="font-size: 80%;"> (source / <a href="AToken.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">17</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -75,7 +75,7 @@
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {SafeCast} from '../../dependencies/openzeppelin/contracts/SafeCast.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {WadRayMath} from '../libraries/math/WadRayMath.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {IPool} from '../../interfaces/IPool.sol';</span>
@@ -125,82 +125,82 @@
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) public virtual;</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC tlaBgGNC">       12594 :   function mint(</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   function mint(</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :     address caller,</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :     address onBehalfOf,</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :     uint256 amount,</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :     uint256 index</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :   ) external virtual override onlyPool returns (bool) {</span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       37779 :     return _mintScaled(caller, onBehalfOf, amount, index);</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC tlaBgGNC">       43526 :     return _mintScaled(caller, onBehalfOf, amount, index);</span></span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :   }</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             : </span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">        7055 :   function burn(</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :   function burn(</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     address from,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     address receiverOfUnderlying,</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :     uint256 amount,</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :     uint256 index</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   ) external virtual override onlyPool {</span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       14108 :     _burnScaled(from, receiverOfUnderlying, amount, index);</span></span>
-<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">       21156 :     if (receiverOfUnderlying != address(this)) {</span></span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       12094 :       IERC20(_underlyingAsset).safeTransfer(receiverOfUnderlying, amount);</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       11053 :     _burnScaled(from, receiverOfUnderlying, amount, index);</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">       11051 :     if (receiverOfUnderlying != address(this)) {</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       10046 :       IERC20(_underlyingAsset).safeTransfer(receiverOfUnderlying, amount);</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :     }</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           6 :   function mintToTreasury(uint256 amount, uint256 index) external virtual override onlyPool {</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">          12 :     if (amount == 0) {</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          12 :       return;</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function mintToTreasury(uint256 amount, uint256 index) external virtual override onlyPool {</span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">           6 :     if (amount == 0) {</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">           6 :       return;</span></span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :     }</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">          10 :     _mintScaled(address(POOL), _treasury, amount, index);</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           5 :     _mintScaled(address(POOL), _treasury, amount, index);</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             :   }</span>
 <span id="L86"><span class="lineNum">      86</span>                 :             : </span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">        6015 :   function transferOnLiquidation(</span></span>
+<span id="L88"><span class="lineNum">      88</span>                 :             :   function transferOnLiquidation(</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :     address from,</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :     address to,</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :     uint256 value</span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   ) external virtual override onlyPool {</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :     // Being a normal transfer, the Transfer() and BalanceTransfer() are emitted</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :     // so no need to emit a specific event here</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">       12028 :     _transfer(from, to, value, false);</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">        8013 :     _transfer(from, to, value, false);</span></span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   }</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             : </span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">       15189 :   function balanceOf(</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :   function balanceOf(</span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :     address user</span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :   ) public view virtual override(IncentivizedERC20, IERC20) returns (uint256) {</span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">       45567 :     return super.balanceOf(user).rayMul(POOL.getReserveNormalizedIncome(_underlyingAsset));</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">       31189 :     return super.balanceOf(user).rayMul(POOL.getReserveNormalizedIncome(_underlyingAsset));</span></span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :   }</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             : </span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">       10945 :   function totalSupply() public view virtual override(IncentivizedERC20, IERC20) returns (uint256) {</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       32835 :     uint256 currentSupplyScaled = super.totalSupply();</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   function totalSupply() public view virtual override(IncentivizedERC20, IERC20) returns (uint256) {</span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       18137 :     uint256 currentSupplyScaled = super.totalSupply();</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             : </span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       21890 :     if (currentSupplyScaled == 0) {</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">        3568 :       return 0;</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       18137 :     if (currentSupplyScaled == 0) {</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">        1982 :       return 0;</span></span>
 <span id="L111"><span class="lineNum">     111</span>                 :             :     }</span>
 <span id="L112"><span class="lineNum">     112</span>                 :             : </span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">       27483 :     return currentSupplyScaled.rayMul(POOL.getReserveNormalizedIncome(_underlyingAsset));</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">       16155 :     return currentSupplyScaled.rayMul(POOL.getReserveNormalizedIncome(_underlyingAsset));</span></span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :   }</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             : </span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">        7018 :   function RESERVE_TREASURY_ADDRESS() external view override returns (address) {</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">       14036 :     return _treasury;</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :             :   function RESERVE_TREASURY_ADDRESS() external view override returns (address) {</span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">       43085 :     return _treasury;</span></span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :   }</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             : </span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        1005 :   function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        2010 :     return _underlyingAsset;</span></span>
+<span id="L122"><span class="lineNum">     122</span>                 :             :   function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {</span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">       34168 :     return _underlyingAsset;</span></span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :   }</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             : </span>
 <span id="L126"><span class="lineNum">     126</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">        9110 :   function transferUnderlyingTo(address target, uint256 amount) external virtual override onlyPool {</span></span>
-<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">       18218 :     IERC20(_underlyingAsset).safeTransfer(target, amount);</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :   function transferUnderlyingTo(address target, uint256 amount) external virtual override onlyPool {</span>
+<span id="L128"><span class="lineNum">     128</span>                 :<span class="tlaGNC">       15107 :     IERC20(_underlyingAsset).safeTransfer(target, amount);</span></span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :   }</span>
 <span id="L130"><span class="lineNum">     130</span>                 :             : </span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">        9039 :   function handleRepayment(</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :             :   function handleRepayment(</span>
 <span id="L133"><span class="lineNum">     133</span>                 :             :     address user,</span>
 <span id="L134"><span class="lineNum">     134</span>                 :             :     address onBehalfOf,</span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :     uint256 amount</span>
@@ -209,7 +209,7 @@
 <span id="L138"><span class="lineNum">     138</span>                 :             :   }</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             : </span>
 <span id="L140"><span class="lineNum">     140</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">          15 :   function permit(</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :   function permit(</span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :     address owner,</span>
 <span id="L143"><span class="lineNum">     143</span>                 :             :     address spender,</span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :     uint256 value,</span>
@@ -218,20 +218,20 @@
 <span id="L147"><span class="lineNum">     147</span>                 :             :     bytes32 r,</span>
 <span id="L148"><span class="lineNum">     148</span>                 :             :     bytes32 s</span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :   ) external override {</span>
-<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">          30 :     require(owner != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">        3015 :     require(owner != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
 <span id="L151"><span class="lineNum">     151</span>                 :             :     //solium-disable-next-line</span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">          28 :     require(block.timestamp &lt;= deadline, Errors.INVALID_EXPIRATION);</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">          24 :     uint256 currentValidNonce = _nonces[owner];</span></span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">          36 :     bytes32 digest = keccak256(</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">        3014 :     require(block.timestamp &lt;= deadline, Errors.INVALID_EXPIRATION);</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">        3012 :     uint256 currentValidNonce = _nonces[owner];</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">        3012 :     bytes32 digest = keccak256(</span></span>
 <span id="L155"><span class="lineNum">     155</span>                 :             :       abi.encodePacked(</span>
 <span id="L156"><span class="lineNum">     156</span>                 :             :         '\x19\x01',</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             :         DOMAIN_SEPARATOR(),</span>
 <span id="L158"><span class="lineNum">     158</span>                 :             :         keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, currentValidNonce, deadline))</span>
 <span id="L159"><span class="lineNum">     159</span>                 :             :       )</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             :     );</span>
-<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">          24 :     require(owner == ecrecover(digest, v, r, s), Errors.INVALID_SIGNATURE);</span></span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">          20 :     _nonces[owner] = currentValidNonce + 1;</span></span>
-<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">          20 :     _approve(owner, spender, value);</span></span>
+<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">        3012 :     require(owner == ecrecover(digest, v, r, s), Errors.INVALID_SIGNATURE);</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">        1010 :     _nonces[owner] = currentValidNonce + 1;</span></span>
+<span id="L163"><span class="lineNum">     163</span>                 :<span class="tlaGNC">        1010 :     _approve(owner, spender, value);</span></span>
 <span id="L164"><span class="lineNum">     164</span>                 :             :   }</span>
 <span id="L165"><span class="lineNum">     165</span>                 :             : </span>
 <span id="L166"><span class="lineNum">     166</span>                 :             :   /**</span>
@@ -242,21 +242,21 @@
 <span id="L171"><span class="lineNum">     171</span>                 :             :    * @param amount The amount getting transferred</span>
 <span id="L172"><span class="lineNum">     172</span>                 :             :    * @param validate True if the transfer needs to be validated, false otherwise</span>
 <span id="L173"><span class="lineNum">     173</span>                 :             :    */</span>
-<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">        8086 :   function _transfer(address from, address to, uint256 amount, bool validate) internal virtual {</span></span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">       14100 :     address underlyingAsset = _underlyingAsset;</span></span>
+<span id="L174"><span class="lineNum">     174</span>                 :             :   function _transfer(address from, address to, uint256 amount, bool validate) internal virtual {</span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">       25055 :     address underlyingAsset = _underlyingAsset;</span></span>
 <span id="L176"><span class="lineNum">     176</span>                 :             : </span>
-<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">       21150 :     uint256 index = POOL.getReserveNormalizedIncome(underlyingAsset);</span></span>
+<span id="L177"><span class="lineNum">     177</span>                 :<span class="tlaGNC">       25055 :     uint256 index = POOL.getReserveNormalizedIncome(underlyingAsset);</span></span>
 <span id="L178"><span class="lineNum">     178</span>                 :             : </span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">       21150 :     uint256 fromBalanceBefore = super.balanceOf(from).rayMul(index);</span></span>
-<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">       21150 :     uint256 toBalanceBefore = super.balanceOf(to).rayMul(index);</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">       25055 :     uint256 fromBalanceBefore = super.balanceOf(from).rayMul(index);</span></span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">       25055 :     uint256 toBalanceBefore = super.balanceOf(to).rayMul(index);</span></span>
 <span id="L181"><span class="lineNum">     181</span>                 :             : </span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">       14100 :     super._transfer(from, to, amount, index);</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">       25055 :     super._transfer(from, to, amount, index);</span></span>
 <span id="L183"><span class="lineNum">     183</span>                 :             : </span>
-<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">        7050 :     if (validate) {</span></span>
-<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">        2072 :       POOL.finalizeTransfer(underlyingAsset, from, to, amount, fromBalanceBefore, toBalanceBefore);</span></span>
+<span id="L184"><span class="lineNum">     184</span>                 :<span class="tlaGNC">       25055 :     if (validate) {</span></span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">       17042 :       POOL.finalizeTransfer(underlyingAsset, from, to, amount, fromBalanceBefore, toBalanceBefore);</span></span>
 <span id="L186"><span class="lineNum">     186</span>                 :             :     }</span>
 <span id="L187"><span class="lineNum">     187</span>                 :             : </span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       14098 :     emit BalanceTransfer(from, to, amount.rayDiv(index), index);</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       25054 :     emit BalanceTransfer(from, to, amount.rayDiv(index), index);</span></span>
 <span id="L189"><span class="lineNum">     189</span>                 :             :   }</span>
 <span id="L190"><span class="lineNum">     190</span>                 :             : </span>
 <span id="L191"><span class="lineNum">     191</span>                 :             :   /**</span>
@@ -266,34 +266,34 @@
 <span id="L195"><span class="lineNum">     195</span>                 :             :    * @param amount The amount getting transferred</span>
 <span id="L196"><span class="lineNum">     196</span>                 :             :    */</span>
 <span id="L197"><span class="lineNum">     197</span>                 :             :   function _transfer(address from, address to, uint128 amount) internal virtual override {</span>
-<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">        2072 :     _transfer(from, to, amount, true);</span></span>
+<span id="L198"><span class="lineNum">     198</span>                 :<span class="tlaGNC">       17042 :     _transfer(from, to, amount, true);</span></span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :   }</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             : </span>
 <span id="L201"><span class="lineNum">     201</span>                 :             :   /**</span>
 <span id="L202"><span class="lineNum">     202</span>                 :             :    * @dev Overrides the base function to fully implement IAToken</span>
 <span id="L203"><span class="lineNum">     203</span>                 :             :    * @dev see `EIP712Base.DOMAIN_SEPARATOR()` for more detailed documentation</span>
 <span id="L204"><span class="lineNum">     204</span>                 :             :    */</span>
-<span id="L205"><span class="lineNum">     205</span>                 :<span class="tlaGNC">           4 :   function DOMAIN_SEPARATOR() public view override(IAToken, EIP712Base) returns (bytes32) {</span></span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">          48 :     return super.DOMAIN_SEPARATOR();</span></span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :   function DOMAIN_SEPARATOR() public view override(IAToken, EIP712Base) returns (bytes32) {</span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">        4016 :     return super.DOMAIN_SEPARATOR();</span></span>
 <span id="L207"><span class="lineNum">     207</span>                 :             :   }</span>
 <span id="L208"><span class="lineNum">     208</span>                 :             : </span>
 <span id="L209"><span class="lineNum">     209</span>                 :             :   /**</span>
 <span id="L210"><span class="lineNum">     210</span>                 :             :    * @dev Overrides the base function to fully implement IAToken</span>
 <span id="L211"><span class="lineNum">     211</span>                 :             :    * @dev see `EIP712Base.nonces()` for more detailed documentation</span>
 <span id="L212"><span class="lineNum">     212</span>                 :             :    */</span>
-<span id="L213"><span class="lineNum">     213</span>                 :<span class="tlaGNC">           8 :   function nonces(address owner) public view override(IAToken, EIP712Base) returns (uint256) {</span></span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">          24 :     return super.nonces(owner);</span></span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :   function nonces(address owner) public view override(IAToken, EIP712Base) returns (uint256) {</span>
+<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC">        1008 :     return super.nonces(owner);</span></span>
 <span id="L215"><span class="lineNum">     215</span>                 :             :   }</span>
 <span id="L216"><span class="lineNum">     216</span>                 :             : </span>
 <span id="L217"><span class="lineNum">     217</span>                 :             :   /// @inheritdoc EIP712Base</span>
-<span id="L218"><span class="lineNum">     218</span>                 :<span class="tlaGNC">        3471 :   function _EIP712BaseId() internal view override returns (string memory) {</span></span>
-<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">       10413 :     return name();</span></span>
+<span id="L218"><span class="lineNum">     218</span>                 :             :   function _EIP712BaseId() internal view override returns (string memory) {</span>
+<span id="L219"><span class="lineNum">     219</span>                 :<span class="tlaGNC">      166698 :     return name();</span></span>
 <span id="L220"><span class="lineNum">     220</span>                 :             :   }</span>
 <span id="L221"><span class="lineNum">     221</span>                 :             : </span>
 <span id="L222"><span class="lineNum">     222</span>                 :             :   /// @inheritdoc IAToken</span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">           3 :   function rescueTokens(address token, address to, uint256 amount) external override onlyPoolAdmin {</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">           4 :     require(token != _underlyingAsset, Errors.UNDERLYING_CANNOT_BE_RESCUED);</span></span>
-<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">           2 :     IERC20(token).safeTransfer(to, amount);</span></span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :   function rescueTokens(address token, address to, uint256 amount) external override onlyPoolAdmin {</span>
+<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">           2 :     require(token != _underlyingAsset, Errors.UNDERLYING_CANNOT_BE_RESCUED);</span></span>
+<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">           1 :     IERC20(token).safeTransfer(to, amount);</span></span>
 <span id="L226"><span class="lineNum">     226</span>                 :             :   }</span>
 <span id="L227"><span class="lineNum">     227</span>                 :             : }</span>
         </pre>
@@ -303,8 +303,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func-c.html b/report/protocol/tokenization/VariableDebtToken.sol.func-c.html
similarity index 72%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func-c.html
rename to report/protocol/tokenization/VariableDebtToken.sol.func-c.html
index 967aa03f..455b50f7 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func-c.html
+++ b/report/protocol/tokenization/VariableDebtToken.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/VariableDebtToken.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (<a href="VariableDebtToken.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (<a href="VariableDebtToken.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">13</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VariableDebtToken.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="VariableDebtToken.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -116,42 +116,49 @@
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L85">VariableDebtToken.totalSupply</a></td>
               
-              <td class="coverFnHi">18</td>
+              <td class="coverFnHi">15</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L123">VariableDebtToken.UNDERLYING_ASSET_ADDRESS</a></td>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L75">VariableDebtToken.burn</a></td>
               
-              <td class="coverFnHi">1023</td>
+              <td class="coverFnHi">15035</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L90">VariableDebtToken._EIP712BaseId</a></td>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L30">VariableDebtToken.</a></td>
               
-              <td class="coverFnHi">3476</td>
+              <td class="coverFnHi">15193</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L62">VariableDebtToken.mint</a></td>
               
-              <td class="coverFnHi">9099</td>
+              <td class="coverFnHi">19091</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L75">VariableDebtToken.burn</a></td>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L51">VariableDebtToken.balanceOf</a></td>
               
-              <td class="coverFnHi">11041</td>
+              <td class="coverFnHi">30602</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L51">VariableDebtToken.balanceOf</a></td>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L123">VariableDebtToken.UNDERLYING_ASSET_ADDRESS</a></td>
+              
+              <td class="coverFnHi">51072</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L90">VariableDebtToken._EIP712BaseId</a></td>
               
-              <td class="coverFnHi">26403</td>
+              <td class="coverFnHi">172697</td>
               
               
             </tr>
@@ -159,8 +166,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func.html b/report/protocol/tokenization/VariableDebtToken.sol.func.html
similarity index 72%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func.html
rename to report/protocol/tokenization/VariableDebtToken.sol.func.html
index b9aff45d..479b2768 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.func.html
+++ b/report/protocol/tokenization/VariableDebtToken.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/VariableDebtToken.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (<a href="VariableDebtToken.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (<a href="VariableDebtToken.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">13</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VariableDebtToken.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="VariableDebtToken.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L30">VariableDebtToken.</a></td>
+              
+              <td class="coverFnHi">15193</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L123">VariableDebtToken.UNDERLYING_ASSET_ADDRESS</a></td>
               
-              <td class="coverFnHi">1023</td>
+              <td class="coverFnHi">51072</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L90">VariableDebtToken._EIP712BaseId</a></td>
               
-              <td class="coverFnHi">3476</td>
+              <td class="coverFnHi">172697</td>
               
               
             </tr>
@@ -102,14 +109,14 @@
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L51">VariableDebtToken.balanceOf</a></td>
               
-              <td class="coverFnHi">26403</td>
+              <td class="coverFnHi">30602</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L75">VariableDebtToken.burn</a></td>
               
-              <td class="coverFnHi">11041</td>
+              <td class="coverFnHi">15035</td>
               
               
             </tr>
@@ -130,14 +137,14 @@
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L62">VariableDebtToken.mint</a></td>
               
-              <td class="coverFnHi">9099</td>
+              <td class="coverFnHi">19091</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="VariableDebtToken.sol.gcov.html#L85">VariableDebtToken.totalSupply</a></td>
               
-              <td class="coverFnHi">18</td>
+              <td class="coverFnHi">15</td>
               
               
             </tr>
@@ -159,8 +166,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.gcov.html b/report/protocol/tokenization/VariableDebtToken.sol.gcov.html
similarity index 80%
rename from report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.gcov.html
rename to report/protocol/tokenization/VariableDebtToken.sol.gcov.html
index ffb1fe95..58832fd6 100644
--- a/report/core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol.gcov.html
+++ b/report/protocol/tokenization/VariableDebtToken.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization/VariableDebtToken.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/VariableDebtToken.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/src/core/contracts/protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (source / <a href="VariableDebtToken.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization">protocol/tokenization</a> - VariableDebtToken.sol<span style="font-size: 80%;"> (source / <a href="VariableDebtToken.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">12</td>
-            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">13</td>
+            <td class="headerCovTableEntry">13</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -74,7 +74,7 @@
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeCast} from '../../dependencies/openzeppelin/contracts/SafeCast.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {WadRayMath} from '../libraries/math/WadRayMath.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {Errors} from '../libraries/helpers/Errors.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {IPool} from '../../interfaces/IPool.sol';</span>
@@ -121,80 +121,80 @@
 <span id="L50"><span class="lineNum">      50</span>                 :             :   ) external virtual;</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             : </span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC tlaBgGNC">       26403 :   function balanceOf(address user) public view virtual override returns (uint256) {</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       79209 :     uint256 scaledBalance = super.balanceOf(user);</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :   function balanceOf(address user) public view virtual override returns (uint256) {</span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC tlaBgGNC">       30602 :     uint256 scaledBalance = super.balanceOf(user);</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">       52806 :     if (scaledBalance == 0) {</span></span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">        2418 :       return 0;</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">       30602 :     if (scaledBalance == 0) {</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">        1040 :       return 0;</span></span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :     }</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">       75582 :     return scaledBalance.rayMul(POOL.getReserveNormalizedVariableDebt(_underlyingAsset));</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">       29562 :     return scaledBalance.rayMul(POOL.getReserveNormalizedVariableDebt(_underlyingAsset));</span></span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   }</span>
 <span id="L62"><span class="lineNum">      62</span>                 :             : </span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :   /// @inheritdoc IVariableDebtToken</span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">        9099 :   function mint(</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   function mint(</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     address user,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     address onBehalfOf,</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :     uint256 amount,</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     uint256 index</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   ) external virtual override onlyPool returns (bool, uint256) {</span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">       18198 :     if (user != onBehalfOf) {</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           4 :       _decreaseBorrowAllowance(onBehalfOf, user, amount);</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">       19091 :     if (user != onBehalfOf) {</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">        1001 :       _decreaseBorrowAllowance(onBehalfOf, user, amount);</span></span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :     }</span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       18198 :     return (_mintScaled(user, onBehalfOf, amount, index), scaledTotalSupply());</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       19091 :     return (_mintScaled(user, onBehalfOf, amount, index), scaledTotalSupply());</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   }</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             : </span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   /// @inheritdoc IVariableDebtToken</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       11041 :   function burn(</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   function burn(</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :     address from,</span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :     uint256 amount,</span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :     uint256 index</span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :   ) external virtual override onlyPool returns (uint256) {</span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">       22082 :     _burnScaled(from, address(0), amount, index);</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">       33123 :     return scaledTotalSupply();</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">       15035 :     _burnScaled(from, address(0), amount, index);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">       15035 :     return scaledTotalSupply();</span></span>
 <span id="L84"><span class="lineNum">      84</span>                 :             :   }</span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : </span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">          18 :   function totalSupply() public view virtual override returns (uint256) {</span></span>
-<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          54 :     return super.totalSupply().rayMul(POOL.getReserveNormalizedVariableDebt(_underlyingAsset));</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :   function totalSupply() public view virtual override returns (uint256) {</span>
+<span id="L88"><span class="lineNum">      88</span>                 :<span class="tlaGNC">          15 :     return super.totalSupply().rayMul(POOL.getReserveNormalizedVariableDebt(_underlyingAsset));</span></span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   }</span>
 <span id="L90"><span class="lineNum">      90</span>                 :             : </span>
 <span id="L91"><span class="lineNum">      91</span>                 :             :   /// @inheritdoc EIP712Base</span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">        3476 :   function _EIP712BaseId() internal view override returns (string memory) {</span></span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">       10428 :     return name();</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   function _EIP712BaseId() internal view override returns (string memory) {</span>
+<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">      172697 :     return name();</span></span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :   }</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             : </span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   /**</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :    * @dev Being non transferrable, the debt token does not implement any of the</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :    * standard ERC20 functions for transfer and allowance.</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :    */</span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           1 :   function transfer(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   function transfer(address, uint256) external virtual override returns (bool) {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             : </span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">           1 :   function allowance(address, address) external view virtual override returns (uint256) {</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   function allowance(address, address) external view virtual override returns (uint256) {</span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L106"><span class="lineNum">     106</span>                 :             :   }</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             : </span>
-<span id="L108"><span class="lineNum">     108</span>                 :<span class="tlaGNC">           1 :   function approve(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   function approve(address, uint256) external virtual override returns (bool) {</span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
 <span id="L111"><span class="lineNum">     111</span>                 :             : </span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">           1 :   function transferFrom(address, address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :   function transferFrom(address, address, uint256) external virtual override returns (bool) {</span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L114"><span class="lineNum">     114</span>                 :             :   }</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             : </span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">           1 :   function increaseAllowance(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function increaseAllowance(address, uint256) external virtual override returns (bool) {</span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :   }</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             : </span>
-<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">           1 :   function decreaseAllowance(address, uint256) external virtual override returns (bool) {</span></span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           2 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :   function decreaseAllowance(address, uint256) external virtual override returns (bool) {</span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">           1 :     revert(Errors.OPERATION_NOT_SUPPORTED);</span></span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
 <span id="L123"><span class="lineNum">     123</span>                 :             : </span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IVariableDebtToken</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">        1023 :   function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">        2046 :     return _underlyingAsset;</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {</span>
+<span id="L126"><span class="lineNum">     126</span>                 :<span class="tlaGNC">       51072 :     return _underlyingAsset;</span></span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :   }</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             : }</span>
         </pre>
@@ -204,8 +204,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func-c.html b/report/protocol/tokenization/base/DebtTokenBase.sol.func-c.html
similarity index 66%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func-c.html
rename to report/protocol/tokenization/base/DebtTokenBase.sol.func-c.html
index 06a135db..f70d0811 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func-c.html
+++ b/report/protocol/tokenization/base/DebtTokenBase.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/DebtTokenBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (<a href="DebtTokenBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (<a href="DebtTokenBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,11 +37,11 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,56 +53,63 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="DebtTokenBase.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="DebtTokenBase.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L93">DebtTokenBase._decreaseBorrowAllowance</a></td>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L31">DebtTokenBase.</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L36">DebtTokenBase.approveDelegation</a></td>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L69">DebtTokenBase.borrowAllowance</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L69">DebtTokenBase.borrowAllowance</a></td>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L41">DebtTokenBase.delegationWithSig</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L82">DebtTokenBase._approveDelegation</a></td>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L93">DebtTokenBase._decreaseBorrowAllowance</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L41">DebtTokenBase.delegationWithSig</a></td>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L36">DebtTokenBase.approveDelegation</a></td>
+              
+              <td class="coverFnHi">1001</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L82">DebtTokenBase._approveDelegation</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func.html b/report/protocol/tokenization/base/DebtTokenBase.sol.func.html
similarity index 66%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func.html
rename to report/protocol/tokenization/base/DebtTokenBase.sol.func.html
index d0a60a25..60ac4de5 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.func.html
+++ b/report/protocol/tokenization/base/DebtTokenBase.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/DebtTokenBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (<a href="DebtTokenBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (<a href="DebtTokenBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,11 +37,11 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,56 +53,63 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="DebtTokenBase.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L31">DebtTokenBase.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="DebtTokenBase.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L82">DebtTokenBase._approveDelegation</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">1005</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L93">DebtTokenBase._decreaseBorrowAllowance</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L36">DebtTokenBase.approveDelegation</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">1001</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L69">DebtTokenBase.borrowAllowance</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="DebtTokenBase.sol.gcov.html#L41">DebtTokenBase.delegationWithSig</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.gcov.html b/report/protocol/tokenization/base/DebtTokenBase.sol.gcov.html
similarity index 83%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.gcov.html
rename to report/protocol/tokenization/base/DebtTokenBase.sol.gcov.html
index 55318c67..8f3fc231 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol.gcov.html
+++ b/report/protocol/tokenization/base/DebtTokenBase.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/DebtTokenBase.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (source / <a href="DebtTokenBase.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - DebtTokenBase.sol<span style="font-size: 80%;"> (source / <a href="DebtTokenBase.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,11 +37,11 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -74,14 +74,14 @@
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {Context} from '../../../dependencies/openzeppelin/contracts/Context.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {Errors} from '../../libraries/helpers/Errors.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {VersionedInitializable} from '../../libraries/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {VersionedInitializable} from '../../../misc/aave-upgradeability/VersionedInitializable.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {ICreditDelegationToken} from '../../../interfaces/ICreditDelegationToken.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {EIP712Base} from './EIP712Base.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : </span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : /**</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :  * @title DebtTokenBase</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             :  * @author Aave</span>
-<span id="L13"><span class="lineNum">      13</span>                 :             :  * @notice Base contract for different types of debt tokens, like StableDebtToken or VariableDebtToken</span>
+<span id="L13"><span class="lineNum">      13</span>                 :             :  * @notice Base contract for different types of debt tokens, like VariableDebtToken</span>
 <span id="L14"><span class="lineNum">      14</span>                 :             :  */</span>
 <span id="L15"><span class="lineNum">      15</span>                 :             : abstract contract DebtTokenBase is</span>
 <span id="L16"><span class="lineNum">      16</span>                 :             :   VersionedInitializable,</span>
@@ -106,12 +106,12 @@
 <span id="L35"><span class="lineNum">      35</span>                 :             :   }</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             : </span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :   /// @inheritdoc ICreditDelegationToken</span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC tlaBgGNC">           3 :   function approveDelegation(address delegatee, uint256 amount) external override {</span></span>
-<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC">           6 :     _approveDelegation(_msgSender(), delegatee, amount);</span></span>
+<span id="L38"><span class="lineNum">      38</span>                 :             :   function approveDelegation(address delegatee, uint256 amount) external override {</span>
+<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC tlaBgGNC">        1001 :     _approveDelegation(_msgSender(), delegatee, amount);</span></span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :   }</span>
 <span id="L41"><span class="lineNum">      41</span>                 :             : </span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   /// @inheritdoc ICreditDelegationToken</span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">          14 :   function delegationWithSig(</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :             :   function delegationWithSig(</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :     address delegator,</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :     address delegatee,</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :     uint256 value,</span>
@@ -120,11 +120,11 @@
 <span id="L49"><span class="lineNum">      49</span>                 :             :     bytes32 r,</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :     bytes32 s</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   ) external {</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">          28 :     require(delegator != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">           7 :     require(delegator != address(0), Errors.ZERO_ADDRESS_NOT_VALID);</span></span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :     //solium-disable-next-line</span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">          24 :     require(block.timestamp &lt;= deadline, Errors.INVALID_EXPIRATION);</span></span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">          20 :     uint256 currentValidNonce = _nonces[delegator];</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">          30 :     bytes32 digest = keccak256(</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">           6 :     require(block.timestamp &lt;= deadline, Errors.INVALID_EXPIRATION);</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           5 :     uint256 currentValidNonce = _nonces[delegator];</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           5 :     bytes32 digest = keccak256(</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :       abi.encodePacked(</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :         '\x19\x01',</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :         DOMAIN_SEPARATOR(),</span>
@@ -133,17 +133,17 @@
 <span id="L62"><span class="lineNum">      62</span>                 :             :         )</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :       )</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     );</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">          20 :     require(delegator == ecrecover(digest, v, r, s), Errors.INVALID_SIGNATURE);</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">          16 :     _nonces[delegator] = currentValidNonce + 1;</span></span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">          16 :     _approveDelegation(delegator, delegatee, value);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">           5 :     require(delegator == ecrecover(digest, v, r, s), Errors.INVALID_SIGNATURE);</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           4 :     _nonces[delegator] = currentValidNonce + 1;</span></span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           4 :     _approveDelegation(delegator, delegatee, value);</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :   }</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             : </span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :   /// @inheritdoc ICreditDelegationToken</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">          10 :   function borrowAllowance(</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   function borrowAllowance(</span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :     address fromUser,</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     address toUser</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :   ) external view override returns (uint256) {</span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">          20 :     return _borrowAllowances[fromUser][toUser];</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">           5 :     return _borrowAllowances[fromUser][toUser];</span></span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   }</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             : </span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :   /**</span>
@@ -152,9 +152,9 @@
 <span id="L81"><span class="lineNum">      81</span>                 :             :    * @param delegatee The address receiving the delegated borrowing power</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             :    * @param amount The allowance amount being delegated.</span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :    */</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">          11 :   function _approveDelegation(address delegator, address delegatee, uint256 amount) internal {</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">          22 :     _borrowAllowances[delegator][delegatee] = amount;</span></span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">          22 :     emit BorrowAllowanceDelegated(delegator, delegatee, _underlyingAsset, amount);</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :   function _approveDelegation(address delegator, address delegatee, uint256 amount) internal {</span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        1005 :     _borrowAllowances[delegator][delegatee] = amount;</span></span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">        1005 :     emit BorrowAllowanceDelegated(delegator, delegatee, _underlyingAsset, amount);</span></span>
 <span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
 <span id="L88"><span class="lineNum">      88</span>                 :             : </span>
 <span id="L89"><span class="lineNum">      89</span>                 :             :   /**</span>
@@ -163,12 +163,12 @@
 <span id="L92"><span class="lineNum">      92</span>                 :             :    * @param delegatee The address receiving the delegated borrowing power</span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :    * @param amount The amount to subtract from the current allowance</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :    */</span>
-<span id="L95"><span class="lineNum">      95</span>                 :<span class="tlaGNC">           2 :   function _decreaseBorrowAllowance(address delegator, address delegatee, uint256 amount) internal {</span></span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           6 :     uint256 newAllowance = _borrowAllowances[delegator][delegatee] - amount;</span></span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   function _decreaseBorrowAllowance(address delegator, address delegatee, uint256 amount) internal {</span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">        1001 :     uint256 newAllowance = _borrowAllowances[delegator][delegatee] - amount;</span></span>
 <span id="L97"><span class="lineNum">      97</span>                 :             : </span>
-<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">           4 :     _borrowAllowances[delegator][delegatee] = newAllowance;</span></span>
+<span id="L98"><span class="lineNum">      98</span>                 :<span class="tlaGNC">        1001 :     _borrowAllowances[delegator][delegatee] = newAllowance;</span></span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">           4 :     emit BorrowAllowanceDelegated(delegator, delegatee, _underlyingAsset, newAllowance);</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">        1001 :     emit BorrowAllowanceDelegated(delegator, delegatee, _underlyingAsset, newAllowance);</span></span>
 <span id="L101"><span class="lineNum">     101</span>                 :             :   }</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             : }</span>
         </pre>
@@ -178,8 +178,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func-c.html b/report/protocol/tokenization/base/EIP712Base.sol.func-c.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func-c.html
rename to report/protocol/tokenization/base/EIP712Base.sol.func-c.html
index 92a5be95..c8730717 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func-c.html
+++ b/report/protocol/tokenization/base/EIP712Base.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/EIP712Base.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (<a href="EIP712Base.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (<a href="EIP712Base.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td></td>
@@ -53,42 +53,49 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EIP712Base.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EIP712Base.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L42">EIP712Base.nonces</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1009</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L30">EIP712Base.DOMAIN_SEPARATOR</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">4016</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L21">EIP712Base.</a></td>
+              
+              <td class="coverFnHi">15145</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L50">EIP712Base._calculateDomainSeparator</a></td>
               
-              <td class="coverFnHi">10421</td>
+              <td class="coverFnHi">339395</td>
               
               
             </tr>
@@ -96,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func.html b/report/protocol/tokenization/base/EIP712Base.sol.func.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func.html
rename to report/protocol/tokenization/base/EIP712Base.sol.func.html
index 6eb42498..83e00732 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.func.html
+++ b/report/protocol/tokenization/base/EIP712Base.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/EIP712Base.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (<a href="EIP712Base.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (<a href="EIP712Base.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td></td>
@@ -53,42 +53,49 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EIP712Base.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EIP712Base.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L21">EIP712Base.</a></td>
+              
+              <td class="coverFnHi">15145</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L30">EIP712Base.DOMAIN_SEPARATOR</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">4016</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L50">EIP712Base._calculateDomainSeparator</a></td>
               
-              <td class="coverFnHi">10421</td>
+              <td class="coverFnHi">339395</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EIP712Base.sol.gcov.html#L42">EIP712Base.nonces</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1009</td>
               
               
             </tr>
@@ -96,8 +103,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.gcov.html b/report/protocol/tokenization/base/EIP712Base.sol.gcov.html
similarity index 82%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.gcov.html
rename to report/protocol/tokenization/base/EIP712Base.sol.gcov.html
index bbdf603a..6efe7901 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol.gcov.html
+++ b/report/protocol/tokenization/base/EIP712Base.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/EIP712Base.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/EIP712Base.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (source / <a href="EIP712Base.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - EIP712Base.sol<span style="font-size: 80%;"> (source / <a href="EIP712Base.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">7</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -92,7 +92,7 @@
 <span id="L21"><span class="lineNum">      21</span>                 :             :    * @dev Constructor.</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             :    */</span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :   constructor() {</span>
-<span id="L24"><span class="lineNum">      24</span>                 :             :     _chainId = block.chainid;</span>
+<span id="L24"><span class="lineNum">      24</span>                 :<span class="tlaGNC tlaBgGNC">       15145 :     _chainId = block.chainid;</span></span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   }</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             : </span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   /**</span>
@@ -100,11 +100,11 @@
 <span id="L29"><span class="lineNum">      29</span>                 :             :    * @dev Return cached value if chainId matches cache, otherwise recomputes separator</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :    * @return The domain separator of the token at current chain</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :    */</span>
-<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaGNC tlaBgGNC">          16 :   function DOMAIN_SEPARATOR() public view virtual returns (bytes32) {</span></span>
-<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">          52 :     if (block.chainid == _chainId) {</span></span>
-<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">          50 :       return _domainSeparator;</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :             :   function DOMAIN_SEPARATOR() public view virtual returns (bytes32) {</span>
+<span id="L33"><span class="lineNum">      33</span>                 :<span class="tlaGNC">        4021 :     if (block.chainid == _chainId) {</span></span>
+<span id="L34"><span class="lineNum">      34</span>                 :<span class="tlaGNC">        4020 :       return _domainSeparator;</span></span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :     }</span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">           3 :     return _calculateDomainSeparator();</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">           1 :     return _calculateDomainSeparator();</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :   }</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             : </span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   /**</span>
@@ -112,17 +112,17 @@
 <span id="L41"><span class="lineNum">      41</span>                 :             :    * @param owner The address for which the nonce is being returned</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :    * @return The nonce value for the input address`</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :    */</span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">          10 :   function nonces(address owner) public view virtual returns (uint256) {</span></span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">          20 :     return _nonces[owner];</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :   function nonces(address owner) public view virtual returns (uint256) {</span>
+<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">        1009 :     return _nonces[owner];</span></span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :   }</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             : </span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :   /**</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :    * @notice Compute the current domain separator</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :    * @return The domain separator for the token</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :    */</span>
-<span id="L52"><span class="lineNum">      52</span>                 :<span class="tlaGNC">       10421 :   function _calculateDomainSeparator() internal view returns (bytes32) {</span></span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">       20842 :     return</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       20842 :       keccak256(</span></span>
+<span id="L52"><span class="lineNum">      52</span>                 :             :   function _calculateDomainSeparator() internal view returns (bytes32) {</span>
+<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">      339395 :     return</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">      339395 :       keccak256(</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :         abi.encode(</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :           EIP712_DOMAIN,</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :           keccak256(bytes(_EIP712BaseId())),</span>
@@ -146,8 +146,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html b/report/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html
similarity index 57%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html
rename to report/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html
index b94eb953..8780bbb3 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html
+++ b/report/protocol/tokenization/base/IncentivizedERC20.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/IncentivizedERC20.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="IncentivizedERC20.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="IncentivizedERC20.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntry">44</td>
+            <td class="headerCovTableEntry">44</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">18</td>
-            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td></td>
@@ -53,147 +53,168 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="IncentivizedERC20.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="IncentivizedERC20.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L169">IncentivizedERC20.decreaseAllowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L168">IncentivizedERC20.decreaseAllowance</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L115">IncentivizedERC20.setIncentivesController</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L114">IncentivizedERC20.setIncentivesController</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L158">IncentivizedERC20.increaseAllowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L25">IncentivizedERC20.onlyPoolAdmin</a></td>
+              
+              <td class="coverFnHi">3</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L157">IncentivizedERC20.increaseAllowance</a></td>
               
               <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L135">IncentivizedERC20.approve</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L126">IncentivizedERC20.allowance</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">26</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L141">IncentivizedERC20.transferFrom</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L119">IncentivizedERC20.transfer</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">4018</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L127">IncentivizedERC20.allowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L69">IncentivizedERC20.</a></td>
               
-              <td class="coverFnHi">26</td>
+              <td class="coverFnHi">7197</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L134">IncentivizedERC20.approve</a></td>
+              
+              <td class="coverFnHi">12021</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L140">IncentivizedERC20.transferFrom</a></td>
+              
+              <td class="coverFnHi">15025</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L205">IncentivizedERC20._approve</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L182">IncentivizedERC20._transfer</a></td>
               
-              <td class="coverFnHi">51</td>
+              <td class="coverFnHi">25056</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L120">IncentivizedERC20.transfer</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L204">IncentivizedERC20._approve</a></td>
               
-              <td class="coverFnHi">1017</td>
+              <td class="coverFnHi">26061</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L84">IncentivizedERC20.symbol</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L34">IncentivizedERC20.onlyPool</a></td>
               
-              <td class="coverFnHi">3041</td>
+              <td class="coverFnHi">34199</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L107">IncentivizedERC20.getIncentivesController</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L106">IncentivizedERC20.getIncentivesController</a></td>
               
-              <td class="coverFnHi">3044</td>
+              <td class="coverFnHi">81148</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L89">IncentivizedERC20.decimals</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L88">IncentivizedERC20.decimals</a></td>
               
-              <td class="coverFnHi">3059</td>
+              <td class="coverFnHi">81163</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L79">IncentivizedERC20.name</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L83">IncentivizedERC20.symbol</a></td>
               
-              <td class="coverFnHi">3073</td>
+              <td class="coverFnHi">81379</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L183">IncentivizedERC20._transfer</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L78">IncentivizedERC20.name</a></td>
               
-              <td class="coverFnHi">7051</td>
+              <td class="coverFnHi">81404</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L230">IncentivizedERC20._setDecimals</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L93">IncentivizedERC20.totalSupply</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">151623</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L214">IncentivizedERC20._setName</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L98">IncentivizedERC20.balanceOf</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">339045</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L222">IncentivizedERC20._setSymbol</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L229">IncentivizedERC20._setDecimals</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L94">IncentivizedERC20.totalSupply</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L213">IncentivizedERC20._setName</a></td>
               
-              <td class="coverFnHi">82841</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L99">IncentivizedERC20.balanceOf</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L221">IncentivizedERC20._setSymbol</a></td>
               
-              <td class="coverFnHi">162500</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
@@ -201,8 +222,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func.html b/report/protocol/tokenization/base/IncentivizedERC20.sol.func.html
similarity index 57%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func.html
rename to report/protocol/tokenization/base/IncentivizedERC20.sol.func.html
index 9474a62e..784ef13b 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.func.html
+++ b/report/protocol/tokenization/base/IncentivizedERC20.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/IncentivizedERC20.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="IncentivizedERC20.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="IncentivizedERC20.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntry">44</td>
+            <td class="headerCovTableEntry">44</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">18</td>
-            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td></td>
@@ -53,147 +53,168 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="IncentivizedERC20.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="IncentivizedERC20.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L205">IncentivizedERC20._approve</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L69">IncentivizedERC20.</a></td>
               
-              <td class="coverFnHi">51</td>
+              <td class="coverFnHi">7197</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L230">IncentivizedERC20._setDecimals</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L204">IncentivizedERC20._approve</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">26061</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L214">IncentivizedERC20._setName</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L229">IncentivizedERC20._setDecimals</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L222">IncentivizedERC20._setSymbol</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L213">IncentivizedERC20._setName</a></td>
               
-              <td class="coverFnHi">10420</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L183">IncentivizedERC20._transfer</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L221">IncentivizedERC20._setSymbol</a></td>
               
-              <td class="coverFnHi">7051</td>
+              <td class="coverFnHi">339394</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L127">IncentivizedERC20.allowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L182">IncentivizedERC20._transfer</a></td>
+              
+              <td class="coverFnHi">25056</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L126">IncentivizedERC20.allowance</a></td>
               
               <td class="coverFnHi">26</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L135">IncentivizedERC20.approve</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L134">IncentivizedERC20.approve</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">12021</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L99">IncentivizedERC20.balanceOf</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L98">IncentivizedERC20.balanceOf</a></td>
               
-              <td class="coverFnHi">162500</td>
+              <td class="coverFnHi">339045</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L89">IncentivizedERC20.decimals</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L88">IncentivizedERC20.decimals</a></td>
               
-              <td class="coverFnHi">3059</td>
+              <td class="coverFnHi">81163</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L169">IncentivizedERC20.decreaseAllowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L168">IncentivizedERC20.decreaseAllowance</a></td>
               
               <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L107">IncentivizedERC20.getIncentivesController</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L106">IncentivizedERC20.getIncentivesController</a></td>
               
-              <td class="coverFnHi">3044</td>
+              <td class="coverFnHi">81148</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L158">IncentivizedERC20.increaseAllowance</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L157">IncentivizedERC20.increaseAllowance</a></td>
               
               <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L79">IncentivizedERC20.name</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L78">IncentivizedERC20.name</a></td>
+              
+              <td class="coverFnHi">81404</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L34">IncentivizedERC20.onlyPool</a></td>
+              
+              <td class="coverFnHi">34199</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L25">IncentivizedERC20.onlyPoolAdmin</a></td>
               
-              <td class="coverFnHi">3073</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L115">IncentivizedERC20.setIncentivesController</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L114">IncentivizedERC20.setIncentivesController</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L84">IncentivizedERC20.symbol</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L83">IncentivizedERC20.symbol</a></td>
               
-              <td class="coverFnHi">3041</td>
+              <td class="coverFnHi">81379</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L94">IncentivizedERC20.totalSupply</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L93">IncentivizedERC20.totalSupply</a></td>
               
-              <td class="coverFnHi">82841</td>
+              <td class="coverFnHi">151623</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L120">IncentivizedERC20.transfer</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L119">IncentivizedERC20.transfer</a></td>
               
-              <td class="coverFnHi">1017</td>
+              <td class="coverFnHi">4018</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L141">IncentivizedERC20.transferFrom</a></td>
+              <td class="coverFn"><a href="IncentivizedERC20.sol.gcov.html#L140">IncentivizedERC20.transferFrom</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">15025</td>
               
               
             </tr>
@@ -201,8 +222,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html b/report/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html
similarity index 80%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html
rename to report/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html
index 83390ab6..19da5541 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html
+++ b/report/protocol/tokenization/base/IncentivizedERC20.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/IncentivizedERC20.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (source / <a href="IncentivizedERC20.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - IncentivizedERC20.sol<span style="font-size: 80%;"> (source / <a href="IncentivizedERC20.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">36</td>
-            <td class="headerCovTableEntry">36</td>
+            <td class="headerCovTableEntry">44</td>
+            <td class="headerCovTableEntry">44</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">18</td>
-            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">21</td>
+            <td class="headerCovTableEntry">21</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -96,8 +96,8 @@
 <span id="L25"><span class="lineNum">      25</span>                 :             :    * @dev Only pool admin can call functions marked by this modifier.</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :    */</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   modifier onlyPoolAdmin() {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaGNC tlaBgGNC">           3 :     IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaGNC">           3 :     require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);</span></span>
 <span id="L30"><span class="lineNum">      30</span>                 :             :     _;</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :   }</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             : </span>
@@ -105,205 +105,204 @@
 <span id="L34"><span class="lineNum">      34</span>                 :             :    * @dev Only pool can call functions marked by this modifier.</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :    */</span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   modifier onlyPool() {</span>
-<span id="L37"><span class="lineNum">      37</span>                 :             :     require(_msgSender() == address(POOL), Errors.CALLER_MUST_BE_POOL);</span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">       34199 :     require(_msgSender() == address(POOL), Errors.CALLER_MUST_BE_POOL);</span></span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     _;</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /**</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :    * @dev UserState - additionalData is a flexible field.</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :    * ATokens and VariableDebtTokens use this field store the index of the</span>
-<span id="L44"><span class="lineNum">      44</span>                 :             :    * user's last supply/withdrawal/borrow/repayment. StableDebtTokens use</span>
-<span id="L45"><span class="lineNum">      45</span>                 :             :    * this field to store the user's stable rate.</span>
-<span id="L46"><span class="lineNum">      46</span>                 :             :    */</span>
-<span id="L47"><span class="lineNum">      47</span>                 :             :   struct UserState {</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :     uint128 balance;</span>
-<span id="L49"><span class="lineNum">      49</span>                 :             :     uint128 additionalData;</span>
-<span id="L50"><span class="lineNum">      50</span>                 :             :   }</span>
-<span id="L51"><span class="lineNum">      51</span>                 :             :   // Map of users address and their state data (userAddress =&gt; userStateData)</span>
-<span id="L52"><span class="lineNum">      52</span>                 :             :   mapping(address =&gt; UserState) internal _userState;</span>
-<span id="L53"><span class="lineNum">      53</span>                 :             : </span>
-<span id="L54"><span class="lineNum">      54</span>                 :             :   // Map of allowances (delegator =&gt; delegatee =&gt; allowanceAmount)</span>
-<span id="L55"><span class="lineNum">      55</span>                 :             :   mapping(address =&gt; mapping(address =&gt; uint256)) private _allowances;</span>
-<span id="L56"><span class="lineNum">      56</span>                 :             : </span>
-<span id="L57"><span class="lineNum">      57</span>                 :             :   uint256 internal _totalSupply;</span>
-<span id="L58"><span class="lineNum">      58</span>                 :             :   string private _name;</span>
-<span id="L59"><span class="lineNum">      59</span>                 :             :   string private _symbol;</span>
-<span id="L60"><span class="lineNum">      60</span>                 :             :   uint8 private _decimals;</span>
-<span id="L61"><span class="lineNum">      61</span>                 :             :   IAaveIncentivesController internal _incentivesController;</span>
-<span id="L62"><span class="lineNum">      62</span>                 :             :   IPoolAddressesProvider internal immutable _addressesProvider;</span>
-<span id="L63"><span class="lineNum">      63</span>                 :             :   IPool public immutable POOL;</span>
-<span id="L64"><span class="lineNum">      64</span>                 :             : </span>
-<span id="L65"><span class="lineNum">      65</span>                 :             :   /**</span>
-<span id="L66"><span class="lineNum">      66</span>                 :             :    * @dev Constructor.</span>
-<span id="L67"><span class="lineNum">      67</span>                 :             :    * @param pool The reference to the main Pool contract</span>
-<span id="L68"><span class="lineNum">      68</span>                 :             :    * @param name_ The name of the token</span>
-<span id="L69"><span class="lineNum">      69</span>                 :             :    * @param symbol_ The symbol of the token</span>
-<span id="L70"><span class="lineNum">      70</span>                 :             :    * @param decimals_ The number of decimals of the token</span>
-<span id="L71"><span class="lineNum">      71</span>                 :             :    */</span>
-<span id="L72"><span class="lineNum">      72</span>                 :             :   constructor(IPool pool, string memory name_, string memory symbol_, uint8 decimals_) {</span>
-<span id="L73"><span class="lineNum">      73</span>                 :             :     _addressesProvider = pool.ADDRESSES_PROVIDER();</span>
-<span id="L74"><span class="lineNum">      74</span>                 :             :     _name = name_;</span>
-<span id="L75"><span class="lineNum">      75</span>                 :             :     _symbol = symbol_;</span>
-<span id="L76"><span class="lineNum">      76</span>                 :             :     _decimals = decimals_;</span>
-<span id="L77"><span class="lineNum">      77</span>                 :             :     POOL = pool;</span>
-<span id="L78"><span class="lineNum">      78</span>                 :             :   }</span>
-<span id="L79"><span class="lineNum">      79</span>                 :             : </span>
-<span id="L80"><span class="lineNum">      80</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC tlaBgGNC">        3073 :   function name() public view override returns (string memory) {</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">       26988 :     return _name;</span></span>
-<span id="L83"><span class="lineNum">      83</span>                 :             :   }</span>
-<span id="L84"><span class="lineNum">      84</span>                 :             : </span>
-<span id="L85"><span class="lineNum">      85</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
-<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">        3041 :   function symbol() external view override returns (string memory) {</span></span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        6082 :     return _symbol;</span></span>
-<span id="L88"><span class="lineNum">      88</span>                 :             :   }</span>
-<span id="L89"><span class="lineNum">      89</span>                 :             : </span>
-<span id="L90"><span class="lineNum">      90</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">        3059 :   function decimals() external view override returns (uint8) {</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">        6118 :     return _decimals;</span></span>
-<span id="L93"><span class="lineNum">      93</span>                 :             :   }</span>
-<span id="L94"><span class="lineNum">      94</span>                 :             : </span>
-<span id="L95"><span class="lineNum">      95</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">       82841 :   function totalSupply() public view virtual override returns (uint256) {</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">      165682 :     return _totalSupply;</span></span>
-<span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
-<span id="L99"><span class="lineNum">      99</span>                 :             : </span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">      162500 :   function balanceOf(address account) public view virtual override returns (uint256) {</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">      325004 :     return _userState[account].balance;</span></span>
-<span id="L103"><span class="lineNum">     103</span>                 :             :   }</span>
-<span id="L104"><span class="lineNum">     104</span>                 :             : </span>
-<span id="L105"><span class="lineNum">     105</span>                 :             :   /**</span>
-<span id="L106"><span class="lineNum">     106</span>                 :             :    * @notice Returns the address of the Incentives Controller contract</span>
-<span id="L107"><span class="lineNum">     107</span>                 :             :    * @return The address of the Incentives Controller</span>
-<span id="L108"><span class="lineNum">     108</span>                 :             :    */</span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">        3044 :   function getIncentivesController() external view virtual returns (IAaveIncentivesController) {</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">        6088 :     return _incentivesController;</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :             :   }</span>
-<span id="L112"><span class="lineNum">     112</span>                 :             : </span>
-<span id="L113"><span class="lineNum">     113</span>                 :             :   /**</span>
-<span id="L114"><span class="lineNum">     114</span>                 :             :    * @notice Sets a new Incentives Controller</span>
-<span id="L115"><span class="lineNum">     115</span>                 :             :    * @param controller the new Incentives controller</span>
-<span id="L116"><span class="lineNum">     116</span>                 :             :    */</span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           2 :   function setIncentivesController(IAaveIncentivesController controller) external onlyPoolAdmin {</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">           2 :     _incentivesController = controller;</span></span>
-<span id="L119"><span class="lineNum">     119</span>                 :             :   }</span>
-<span id="L120"><span class="lineNum">     120</span>                 :             : </span>
-<span id="L121"><span class="lineNum">     121</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        1017 :   function transfer(address recipient, uint256 amount) external virtual override returns (bool) {</span></span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        3051 :     uint128 castAmount = amount.toUint128();</span></span>
-<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        2032 :     _transfer(_msgSender(), recipient, castAmount);</span></span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">        2030 :     return true;</span></span>
-<span id="L126"><span class="lineNum">     126</span>                 :             :   }</span>
-<span id="L127"><span class="lineNum">     127</span>                 :             : </span>
-<span id="L128"><span class="lineNum">     128</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L129"><span class="lineNum">     129</span>                 :<span class="tlaGNC">          26 :   function allowance(</span></span>
-<span id="L130"><span class="lineNum">     130</span>                 :             :     address owner,</span>
-<span id="L131"><span class="lineNum">     131</span>                 :             :     address spender</span>
-<span id="L132"><span class="lineNum">     132</span>                 :             :   ) external view virtual override returns (uint256) {</span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">          52 :     return _allowances[owner][spender];</span></span>
-<span id="L134"><span class="lineNum">     134</span>                 :             :   }</span>
-<span id="L135"><span class="lineNum">     135</span>                 :             : </span>
-<span id="L136"><span class="lineNum">     136</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">          16 :   function approve(address spender, uint256 amount) external virtual override returns (bool) {</span></span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">          32 :     _approve(_msgSender(), spender, amount);</span></span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">          32 :     return true;</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :             :   }</span>
-<span id="L141"><span class="lineNum">     141</span>                 :             : </span>
-<span id="L142"><span class="lineNum">     142</span>                 :             :   /// @inheritdoc IERC20</span>
-<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">          20 :   function transferFrom(</span></span>
-<span id="L144"><span class="lineNum">     144</span>                 :             :     address sender,</span>
-<span id="L145"><span class="lineNum">     145</span>                 :             :     address recipient,</span>
-<span id="L146"><span class="lineNum">     146</span>                 :             :     uint256 amount</span>
-<span id="L147"><span class="lineNum">     147</span>                 :             :   ) external virtual override returns (bool) {</span>
-<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">          60 :     uint128 castAmount = amount.toUint128();</span></span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">          40 :     _approve(sender, _msgSender(), _allowances[sender][_msgSender()] - castAmount);</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">          40 :     _transfer(sender, recipient, castAmount);</span></span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">          40 :     return true;</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :             :   }</span>
-<span id="L153"><span class="lineNum">     153</span>                 :             : </span>
-<span id="L154"><span class="lineNum">     154</span>                 :             :   /**</span>
-<span id="L155"><span class="lineNum">     155</span>                 :             :    * @notice Increases the allowance of spender to spend _msgSender() tokens</span>
-<span id="L156"><span class="lineNum">     156</span>                 :             :    * @param spender The user allowed to spend on behalf of _msgSender()</span>
-<span id="L157"><span class="lineNum">     157</span>                 :             :    * @param addedValue The amount being added to the allowance</span>
-<span id="L158"><span class="lineNum">     158</span>                 :             :    * @return `true`</span>
-<span id="L159"><span class="lineNum">     159</span>                 :             :    */</span>
-<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">           4 :   function increaseAllowance(address spender, uint256 addedValue) external virtual returns (bool) {</span></span>
-<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">           8 :     _approve(_msgSender(), spender, _allowances[_msgSender()][spender] + addedValue);</span></span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">           8 :     return true;</span></span>
-<span id="L163"><span class="lineNum">     163</span>                 :             :   }</span>
-<span id="L164"><span class="lineNum">     164</span>                 :             : </span>
-<span id="L165"><span class="lineNum">     165</span>                 :             :   /**</span>
-<span id="L166"><span class="lineNum">     166</span>                 :             :    * @notice Decreases the allowance of spender to spend _msgSender() tokens</span>
-<span id="L167"><span class="lineNum">     167</span>                 :             :    * @param spender The user allowed to spend on behalf of _msgSender()</span>
-<span id="L168"><span class="lineNum">     168</span>                 :             :    * @param subtractedValue The amount being subtracted to the allowance</span>
-<span id="L169"><span class="lineNum">     169</span>                 :             :    * @return `true`</span>
-<span id="L170"><span class="lineNum">     170</span>                 :             :    */</span>
-<span id="L171"><span class="lineNum">     171</span>                 :<span class="tlaGNC">           1 :   function decreaseAllowance(</span></span>
-<span id="L172"><span class="lineNum">     172</span>                 :             :     address spender,</span>
-<span id="L173"><span class="lineNum">     173</span>                 :             :     uint256 subtractedValue</span>
-<span id="L174"><span class="lineNum">     174</span>                 :             :   ) external virtual returns (bool) {</span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           2 :     _approve(_msgSender(), spender, _allowances[_msgSender()][spender] - subtractedValue);</span></span>
-<span id="L176"><span class="lineNum">     176</span>                 :<span class="tlaGNC">           2 :     return true;</span></span>
-<span id="L177"><span class="lineNum">     177</span>                 :             :   }</span>
-<span id="L178"><span class="lineNum">     178</span>                 :             : </span>
-<span id="L179"><span class="lineNum">     179</span>                 :             :   /**</span>
-<span id="L180"><span class="lineNum">     180</span>                 :             :    * @notice Transfers tokens between two users and apply incentives if defined.</span>
-<span id="L181"><span class="lineNum">     181</span>                 :             :    * @param sender The source address</span>
-<span id="L182"><span class="lineNum">     182</span>                 :             :    * @param recipient The destination address</span>
-<span id="L183"><span class="lineNum">     183</span>                 :             :    * @param amount The amount getting transferred</span>
-<span id="L184"><span class="lineNum">     184</span>                 :             :    */</span>
-<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">        7051 :   function _transfer(address sender, address recipient, uint128 amount) internal virtual {</span></span>
-<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">       14102 :     uint128 oldSenderBalance = _userState[sender].balance;</span></span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">       14102 :     _userState[sender].balance = oldSenderBalance - amount;</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       14102 :     uint128 oldRecipientBalance = _userState[recipient].balance;</span></span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">       14102 :     _userState[recipient].balance = oldRecipientBalance + amount;</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :             : </span>
-<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">       14102 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
-<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">       28204 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
-<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">       14100 :       uint256 currentTotalSupply = _totalSupply;</span></span>
-<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">       14100 :       incentivesControllerLocal.handleAction(sender, currentTotalSupply, oldSenderBalance);</span></span>
-<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">       14100 :       if (sender != recipient) {</span></span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">       14096 :         incentivesControllerLocal.handleAction(recipient, currentTotalSupply, oldRecipientBalance);</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :             :       }</span>
-<span id="L198"><span class="lineNum">     198</span>                 :             :     }</span>
-<span id="L199"><span class="lineNum">     199</span>                 :             :   }</span>
-<span id="L200"><span class="lineNum">     200</span>                 :             : </span>
-<span id="L201"><span class="lineNum">     201</span>                 :             :   /**</span>
-<span id="L202"><span class="lineNum">     202</span>                 :             :    * @notice Approve `spender` to use `amount` of `owner`s balance</span>
-<span id="L203"><span class="lineNum">     203</span>                 :             :    * @param owner The address owning the tokens</span>
-<span id="L204"><span class="lineNum">     204</span>                 :             :    * @param spender The address approved for spending</span>
-<span id="L205"><span class="lineNum">     205</span>                 :             :    * @param amount The amount of tokens to approve spending of</span>
-<span id="L206"><span class="lineNum">     206</span>                 :             :    */</span>
-<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">          51 :   function _approve(address owner, address spender, uint256 amount) internal virtual {</span></span>
-<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">         102 :     _allowances[owner][spender] = amount;</span></span>
-<span id="L209"><span class="lineNum">     209</span>                 :<span class="tlaGNC">         102 :     emit Approval(owner, spender, amount);</span></span>
-<span id="L210"><span class="lineNum">     210</span>                 :             :   }</span>
-<span id="L211"><span class="lineNum">     211</span>                 :             : </span>
-<span id="L212"><span class="lineNum">     212</span>                 :             :   /**</span>
-<span id="L213"><span class="lineNum">     213</span>                 :             :    * @notice Update the name of the token</span>
-<span id="L214"><span class="lineNum">     214</span>                 :             :    * @param newName The new name for the token</span>
-<span id="L215"><span class="lineNum">     215</span>                 :             :    */</span>
-<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">       10420 :   function _setName(string memory newName) internal {</span></span>
-<span id="L217"><span class="lineNum">     217</span>                 :<span class="tlaGNC">       20840 :     _name = newName;</span></span>
-<span id="L218"><span class="lineNum">     218</span>                 :             :   }</span>
-<span id="L219"><span class="lineNum">     219</span>                 :             : </span>
-<span id="L220"><span class="lineNum">     220</span>                 :             :   /**</span>
-<span id="L221"><span class="lineNum">     221</span>                 :             :    * @notice Update the symbol for the token</span>
-<span id="L222"><span class="lineNum">     222</span>                 :             :    * @param newSymbol The new symbol for the token</span>
-<span id="L223"><span class="lineNum">     223</span>                 :             :    */</span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">       10420 :   function _setSymbol(string memory newSymbol) internal {</span></span>
-<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">       20840 :     _symbol = newSymbol;</span></span>
-<span id="L226"><span class="lineNum">     226</span>                 :             :   }</span>
-<span id="L227"><span class="lineNum">     227</span>                 :             : </span>
-<span id="L228"><span class="lineNum">     228</span>                 :             :   /**</span>
-<span id="L229"><span class="lineNum">     229</span>                 :             :    * @notice Update the number of decimals for the token</span>
-<span id="L230"><span class="lineNum">     230</span>                 :             :    * @param newDecimals The new number of decimals for the token</span>
-<span id="L231"><span class="lineNum">     231</span>                 :             :    */</span>
-<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">       10420 :   function _setDecimals(uint8 newDecimals) internal {</span></span>
-<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">       20840 :     _decimals = newDecimals;</span></span>
-<span id="L234"><span class="lineNum">     234</span>                 :             :   }</span>
-<span id="L235"><span class="lineNum">     235</span>                 :             : }</span>
+<span id="L44"><span class="lineNum">      44</span>                 :             :    * user's last supply/withdrawal/borrow/repayment.</span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :    */</span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   struct UserState {</span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :     uint128 balance;</span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :     uint128 additionalData;</span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   }</span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   // Map of users address and their state data (userAddress =&gt; userStateData)</span>
+<span id="L51"><span class="lineNum">      51</span>                 :             :   mapping(address =&gt; UserState) internal _userState;</span>
+<span id="L52"><span class="lineNum">      52</span>                 :             : </span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :   // Map of allowances (delegator =&gt; delegatee =&gt; allowanceAmount)</span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   mapping(address =&gt; mapping(address =&gt; uint256)) private _allowances;</span>
+<span id="L55"><span class="lineNum">      55</span>                 :             : </span>
+<span id="L56"><span class="lineNum">      56</span>                 :             :   uint256 internal _totalSupply;</span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   string private _name;</span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :   string private _symbol;</span>
+<span id="L59"><span class="lineNum">      59</span>                 :             :   uint8 private _decimals;</span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   IAaveIncentivesController internal _incentivesController;</span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :   IPoolAddressesProvider internal immutable _addressesProvider;</span>
+<span id="L62"><span class="lineNum">      62</span>                 :             :   IPool public immutable POOL;</span>
+<span id="L63"><span class="lineNum">      63</span>                 :             : </span>
+<span id="L64"><span class="lineNum">      64</span>                 :             :   /**</span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :    * @dev Constructor.</span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :    * @param pool The reference to the main Pool contract</span>
+<span id="L67"><span class="lineNum">      67</span>                 :             :    * @param name_ The name of the token</span>
+<span id="L68"><span class="lineNum">      68</span>                 :             :    * @param symbol_ The symbol of the token</span>
+<span id="L69"><span class="lineNum">      69</span>                 :             :    * @param decimals_ The number of decimals of the token</span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :    */</span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   constructor(IPool pool, string memory name_, string memory symbol_, uint8 decimals_) {</span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">        7197 :     _addressesProvider = pool.ADDRESSES_PROVIDER();</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       15179 :     _name = name_;</span></span>
+<span id="L74"><span class="lineNum">      74</span>                 :<span class="tlaGNC">        7139 :     _symbol = symbol_;</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">        7154 :     _decimals = decimals_;</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       15111 :     POOL = pool;</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
+<span id="L78"><span class="lineNum">      78</span>                 :             : </span>
+<span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function name() public view override returns (string memory) {</span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">      420799 :     return _name;</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :             :   }</span>
+<span id="L83"><span class="lineNum">      83</span>                 :             : </span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
+<span id="L85"><span class="lineNum">      85</span>                 :             :   function symbol() external view override returns (string memory) {</span>
+<span id="L86"><span class="lineNum">      86</span>                 :<span class="tlaGNC">       81379 :     return _symbol;</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :             :   }</span>
+<span id="L88"><span class="lineNum">      88</span>                 :             : </span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :   /// @inheritdoc IERC20Detailed</span>
+<span id="L90"><span class="lineNum">      90</span>                 :             :   function decimals() external view override returns (uint8) {</span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">       81163 :     return _decimals;</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :             :   }</span>
+<span id="L93"><span class="lineNum">      93</span>                 :             : </span>
+<span id="L94"><span class="lineNum">      94</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L95"><span class="lineNum">      95</span>                 :             :   function totalSupply() public view virtual override returns (uint256) {</span>
+<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">      151623 :     return _totalSupply;</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :             :   }</span>
+<span id="L98"><span class="lineNum">      98</span>                 :             : </span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   function balanceOf(address account) public view virtual override returns (uint256) {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">      339047 :     return _userState[account].balance;</span></span>
+<span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
+<span id="L103"><span class="lineNum">     103</span>                 :             : </span>
+<span id="L104"><span class="lineNum">     104</span>                 :             :   /**</span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :    * @notice Returns the address of the Incentives Controller contract</span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :    * @return The address of the Incentives Controller</span>
+<span id="L107"><span class="lineNum">     107</span>                 :             :    */</span>
+<span id="L108"><span class="lineNum">     108</span>                 :             :   function getIncentivesController() external view virtual returns (IAaveIncentivesController) {</span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       81148 :     return _incentivesController;</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :             :   }</span>
+<span id="L111"><span class="lineNum">     111</span>                 :             : </span>
+<span id="L112"><span class="lineNum">     112</span>                 :             :   /**</span>
+<span id="L113"><span class="lineNum">     113</span>                 :             :    * @notice Sets a new Incentives Controller</span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :    * @param controller the new Incentives controller</span>
+<span id="L115"><span class="lineNum">     115</span>                 :             :    */</span>
+<span id="L116"><span class="lineNum">     116</span>                 :             :   function setIncentivesController(IAaveIncentivesController controller) external onlyPoolAdmin {</span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">           1 :     _incentivesController = controller;</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :   }</span>
+<span id="L119"><span class="lineNum">     119</span>                 :             : </span>
+<span id="L120"><span class="lineNum">     120</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L121"><span class="lineNum">     121</span>                 :             :   function transfer(address recipient, uint256 amount) external virtual override returns (bool) {</span>
+<span id="L122"><span class="lineNum">     122</span>                 :<span class="tlaGNC">        4018 :     uint128 castAmount = amount.toUint128();</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        4017 :     _transfer(_msgSender(), recipient, castAmount);</span></span>
+<span id="L124"><span class="lineNum">     124</span>                 :<span class="tlaGNC">        4016 :     return true;</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   }</span>
+<span id="L126"><span class="lineNum">     126</span>                 :             : </span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L128"><span class="lineNum">     128</span>                 :             :   function allowance(</span>
+<span id="L129"><span class="lineNum">     129</span>                 :             :     address owner,</span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :     address spender</span>
+<span id="L131"><span class="lineNum">     131</span>                 :             :   ) external view virtual override returns (uint256) {</span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">          26 :     return _allowances[owner][spender];</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :             :   }</span>
+<span id="L134"><span class="lineNum">     134</span>                 :             : </span>
+<span id="L135"><span class="lineNum">     135</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L136"><span class="lineNum">     136</span>                 :             :   function approve(address spender, uint256 amount) external virtual override returns (bool) {</span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">       12021 :     _approve(_msgSender(), spender, amount);</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">       12021 :     return true;</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :             :   }</span>
+<span id="L140"><span class="lineNum">     140</span>                 :             : </span>
+<span id="L141"><span class="lineNum">     141</span>                 :             :   /// @inheritdoc IERC20</span>
+<span id="L142"><span class="lineNum">     142</span>                 :             :   function transferFrom(</span>
+<span id="L143"><span class="lineNum">     143</span>                 :             :     address sender,</span>
+<span id="L144"><span class="lineNum">     144</span>                 :             :     address recipient,</span>
+<span id="L145"><span class="lineNum">     145</span>                 :             :     uint256 amount</span>
+<span id="L146"><span class="lineNum">     146</span>                 :             :   ) external virtual override returns (bool) {</span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">       15025 :     uint128 castAmount = amount.toUint128();</span></span>
+<span id="L148"><span class="lineNum">     148</span>                 :<span class="tlaGNC">       15025 :     _approve(sender, _msgSender(), _allowances[sender][_msgSender()] - castAmount);</span></span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       13025 :     _transfer(sender, recipient, castAmount);</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">       13025 :     return true;</span></span>
+<span id="L151"><span class="lineNum">     151</span>                 :             :   }</span>
+<span id="L152"><span class="lineNum">     152</span>                 :             : </span>
+<span id="L153"><span class="lineNum">     153</span>                 :             :   /**</span>
+<span id="L154"><span class="lineNum">     154</span>                 :             :    * @notice Increases the allowance of spender to spend _msgSender() tokens</span>
+<span id="L155"><span class="lineNum">     155</span>                 :             :    * @param spender The user allowed to spend on behalf of _msgSender()</span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :    * @param addedValue The amount being added to the allowance</span>
+<span id="L157"><span class="lineNum">     157</span>                 :             :    * @return `true`</span>
+<span id="L158"><span class="lineNum">     158</span>                 :             :    */</span>
+<span id="L159"><span class="lineNum">     159</span>                 :             :   function increaseAllowance(address spender, uint256 addedValue) external virtual returns (bool) {</span>
+<span id="L160"><span class="lineNum">     160</span>                 :<span class="tlaGNC">           4 :     _approve(_msgSender(), spender, _allowances[_msgSender()][spender] + addedValue);</span></span>
+<span id="L161"><span class="lineNum">     161</span>                 :<span class="tlaGNC">           4 :     return true;</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :   }</span>
+<span id="L163"><span class="lineNum">     163</span>                 :             : </span>
+<span id="L164"><span class="lineNum">     164</span>                 :             :   /**</span>
+<span id="L165"><span class="lineNum">     165</span>                 :             :    * @notice Decreases the allowance of spender to spend _msgSender() tokens</span>
+<span id="L166"><span class="lineNum">     166</span>                 :             :    * @param spender The user allowed to spend on behalf of _msgSender()</span>
+<span id="L167"><span class="lineNum">     167</span>                 :             :    * @param subtractedValue The amount being subtracted to the allowance</span>
+<span id="L168"><span class="lineNum">     168</span>                 :             :    * @return `true`</span>
+<span id="L169"><span class="lineNum">     169</span>                 :             :    */</span>
+<span id="L170"><span class="lineNum">     170</span>                 :             :   function decreaseAllowance(</span>
+<span id="L171"><span class="lineNum">     171</span>                 :             :     address spender,</span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :     uint256 subtractedValue</span>
+<span id="L173"><span class="lineNum">     173</span>                 :             :   ) external virtual returns (bool) {</span>
+<span id="L174"><span class="lineNum">     174</span>                 :<span class="tlaGNC">           1 :     _approve(_msgSender(), spender, _allowances[_msgSender()][spender] - subtractedValue);</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           1 :     return true;</span></span>
+<span id="L176"><span class="lineNum">     176</span>                 :             :   }</span>
+<span id="L177"><span class="lineNum">     177</span>                 :             : </span>
+<span id="L178"><span class="lineNum">     178</span>                 :             :   /**</span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :    * @notice Transfers tokens between two users and apply incentives if defined.</span>
+<span id="L180"><span class="lineNum">     180</span>                 :             :    * @param sender The source address</span>
+<span id="L181"><span class="lineNum">     181</span>                 :             :    * @param recipient The destination address</span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :    * @param amount The amount getting transferred</span>
+<span id="L183"><span class="lineNum">     183</span>                 :             :    */</span>
+<span id="L184"><span class="lineNum">     184</span>                 :             :   function _transfer(address sender, address recipient, uint128 amount) internal virtual {</span>
+<span id="L185"><span class="lineNum">     185</span>                 :<span class="tlaGNC">       25056 :     uint128 oldSenderBalance = _userState[sender].balance;</span></span>
+<span id="L186"><span class="lineNum">     186</span>                 :<span class="tlaGNC">       25056 :     _userState[sender].balance = oldSenderBalance - amount;</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">       25056 :     uint128 oldRecipientBalance = _userState[recipient].balance;</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">       25056 :     _userState[recipient].balance = oldRecipientBalance + amount;</span></span>
+<span id="L189"><span class="lineNum">     189</span>                 :             : </span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">       25056 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">       25056 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">       25055 :       uint256 currentTotalSupply = _totalSupply;</span></span>
+<span id="L193"><span class="lineNum">     193</span>                 :<span class="tlaGNC">       25055 :       incentivesControllerLocal.handleAction(sender, currentTotalSupply, oldSenderBalance);</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">       25055 :       if (sender != recipient) {</span></span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">       25053 :         incentivesControllerLocal.handleAction(recipient, currentTotalSupply, oldRecipientBalance);</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :             :       }</span>
+<span id="L197"><span class="lineNum">     197</span>                 :             :     }</span>
+<span id="L198"><span class="lineNum">     198</span>                 :             :   }</span>
+<span id="L199"><span class="lineNum">     199</span>                 :             : </span>
+<span id="L200"><span class="lineNum">     200</span>                 :             :   /**</span>
+<span id="L201"><span class="lineNum">     201</span>                 :             :    * @notice Approve `spender` to use `amount` of `owner`s balance</span>
+<span id="L202"><span class="lineNum">     202</span>                 :             :    * @param owner The address owning the tokens</span>
+<span id="L203"><span class="lineNum">     203</span>                 :             :    * @param spender The address approved for spending</span>
+<span id="L204"><span class="lineNum">     204</span>                 :             :    * @param amount The amount of tokens to approve spending of</span>
+<span id="L205"><span class="lineNum">     205</span>                 :             :    */</span>
+<span id="L206"><span class="lineNum">     206</span>                 :             :   function _approve(address owner, address spender, uint256 amount) internal virtual {</span>
+<span id="L207"><span class="lineNum">     207</span>                 :<span class="tlaGNC">       26061 :     _allowances[owner][spender] = amount;</span></span>
+<span id="L208"><span class="lineNum">     208</span>                 :<span class="tlaGNC">       26061 :     emit Approval(owner, spender, amount);</span></span>
+<span id="L209"><span class="lineNum">     209</span>                 :             :   }</span>
+<span id="L210"><span class="lineNum">     210</span>                 :             : </span>
+<span id="L211"><span class="lineNum">     211</span>                 :             :   /**</span>
+<span id="L212"><span class="lineNum">     212</span>                 :             :    * @notice Update the name of the token</span>
+<span id="L213"><span class="lineNum">     213</span>                 :             :    * @param newName The new name for the token</span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :    */</span>
+<span id="L215"><span class="lineNum">     215</span>                 :             :   function _setName(string memory newName) internal {</span>
+<span id="L216"><span class="lineNum">     216</span>                 :<span class="tlaGNC">      339394 :     _name = newName;</span></span>
+<span id="L217"><span class="lineNum">     217</span>                 :             :   }</span>
+<span id="L218"><span class="lineNum">     218</span>                 :             : </span>
+<span id="L219"><span class="lineNum">     219</span>                 :             :   /**</span>
+<span id="L220"><span class="lineNum">     220</span>                 :             :    * @notice Update the symbol for the token</span>
+<span id="L221"><span class="lineNum">     221</span>                 :             :    * @param newSymbol The new symbol for the token</span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :    */</span>
+<span id="L223"><span class="lineNum">     223</span>                 :             :   function _setSymbol(string memory newSymbol) internal {</span>
+<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">      339394 :     _symbol = newSymbol;</span></span>
+<span id="L225"><span class="lineNum">     225</span>                 :             :   }</span>
+<span id="L226"><span class="lineNum">     226</span>                 :             : </span>
+<span id="L227"><span class="lineNum">     227</span>                 :             :   /**</span>
+<span id="L228"><span class="lineNum">     228</span>                 :             :    * @notice Update the number of decimals for the token</span>
+<span id="L229"><span class="lineNum">     229</span>                 :             :    * @param newDecimals The new number of decimals for the token</span>
+<span id="L230"><span class="lineNum">     230</span>                 :             :    */</span>
+<span id="L231"><span class="lineNum">     231</span>                 :             :   function _setDecimals(uint8 newDecimals) internal {</span>
+<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">      339394 :     _decimals = newDecimals;</span></span>
+<span id="L233"><span class="lineNum">     233</span>                 :             :   }</span>
+<span id="L234"><span class="lineNum">     234</span>                 :             : }</span>
         </pre>
               </td>
             </tr>
@@ -311,8 +310,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html
similarity index 64%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html
rename to report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html
index ad293ab2..3dcb41c6 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html
+++ b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/MintableIncentivizedERC20.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="MintableIncentivizedERC20.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="MintableIncentivizedERC20.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="MintableIncentivizedERC20.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L19">MintableIncentivizedERC20.</a></td>
+              
+              <td class="coverFnHi">15169</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L51">MintableIncentivizedERC20._burn</a></td>
               
-              <td class="coverFnHi">18094</td>
+              <td class="coverFnHi">26087</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L33">MintableIncentivizedERC20._mint</a></td>
               
-              <td class="coverFnHi">21696</td>
+              <td class="coverFnHi">62621</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html
similarity index 64%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html
rename to report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html
index 593e7ecc..d43afe23 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html
+++ b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/MintableIncentivizedERC20.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="MintableIncentivizedERC20.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (<a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,35 +53,42 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="MintableIncentivizedERC20.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="MintableIncentivizedERC20.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L19">MintableIncentivizedERC20.</a></td>
+              
+              <td class="coverFnHi">15169</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L51">MintableIncentivizedERC20._burn</a></td>
               
-              <td class="coverFnHi">18094</td>
+              <td class="coverFnHi">26087</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="MintableIncentivizedERC20.sol.gcov.html#L33">MintableIncentivizedERC20._mint</a></td>
               
-              <td class="coverFnHi">21696</td>
+              <td class="coverFnHi">62621</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html
similarity index 80%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html
rename to report/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html
index 965f6679..842e74c0 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html
+++ b/report/protocol/tokenization/base/MintableIncentivizedERC20.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/MintableIncentivizedERC20.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (source / <a href="MintableIncentivizedERC20.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - MintableIncentivizedERC20.sol<span style="font-size: 80%;"> (source / <a href="MintableIncentivizedERC20.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -103,16 +103,16 @@
 <span id="L32"><span class="lineNum">      32</span>                 :             :    * @param account The address receiving tokens</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :    * @param amount The amount of tokens to mint</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :    */</span>
-<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC tlaBgGNC">       21696 :   function _mint(address account, uint128 amount) internal virtual {</span></span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC">       43392 :     uint256 oldTotalSupply = _totalSupply;</span></span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">       43392 :     _totalSupply = oldTotalSupply + amount;</span></span>
+<span id="L35"><span class="lineNum">      35</span>                 :             :   function _mint(address account, uint128 amount) internal virtual {</span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC tlaBgGNC">       62621 :     uint256 oldTotalSupply = _totalSupply;</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC">       62621 :     _totalSupply = oldTotalSupply + amount;</span></span>
 <span id="L38"><span class="lineNum">      38</span>                 :             : </span>
-<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC">       43392 :     uint128 oldAccountBalance = _userState[account].balance;</span></span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">       43392 :     _userState[account].balance = oldAccountBalance + amount;</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC">       62621 :     uint128 oldAccountBalance = _userState[account].balance;</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">       62621 :     _userState[account].balance = oldAccountBalance + amount;</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             : </span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">       43392 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">       86784 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
-<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">       43392 :       incentivesControllerLocal.handleAction(account, oldTotalSupply, oldAccountBalance);</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">       62621 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">       62621 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
+<span id="L44"><span class="lineNum">      44</span>                 :<span class="tlaGNC">       62621 :       incentivesControllerLocal.handleAction(account, oldTotalSupply, oldAccountBalance);</span></span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :     }</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :   }</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             : </span>
@@ -121,17 +121,17 @@
 <span id="L50"><span class="lineNum">      50</span>                 :             :    * @param account The account whose tokens are burnt</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :    * @param amount The amount of tokens to burn</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :    */</span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">       18094 :   function _burn(address account, uint128 amount) internal virtual {</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       36188 :     uint256 oldTotalSupply = _totalSupply;</span></span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">       36188 :     _totalSupply = oldTotalSupply - amount;</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :   function _burn(address account, uint128 amount) internal virtual {</span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">       26087 :     uint256 oldTotalSupply = _totalSupply;</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">       26087 :     _totalSupply = oldTotalSupply - amount;</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">       36188 :     uint128 oldAccountBalance = _userState[account].balance;</span></span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       36188 :     _userState[account].balance = oldAccountBalance - amount;</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">       26087 :     uint128 oldAccountBalance = _userState[account].balance;</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">       26087 :     _userState[account].balance = oldAccountBalance - amount;</span></span>
 <span id="L59"><span class="lineNum">      59</span>                 :             : </span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">       36186 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">       26086 :     IAaveIncentivesController incentivesControllerLocal = _incentivesController;</span></span>
 <span id="L61"><span class="lineNum">      61</span>                 :             : </span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">       72372 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       36186 :       incentivesControllerLocal.handleAction(account, oldTotalSupply, oldAccountBalance);</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">       26086 :     if (address(incentivesControllerLocal) != address(0)) {</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       26086 :       incentivesControllerLocal.handleAction(account, oldTotalSupply, oldAccountBalance);</span></span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     }</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             : }</span>
@@ -142,8 +142,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html
similarity index 68%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html
rename to report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html
index ec6d699a..81fbdfc5 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html
+++ b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/ScaledBalanceTokenBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (<a href="ScaledBalanceTokenBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (<a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ScaledBalanceTokenBase.sol.func.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="ScaledBalanceTokenBase.sol.func.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -84,39 +84,46 @@
               <td class="coverFnHi">39</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L25">ScaledBalanceTokenBase.</a></td>
+              
+              <td class="coverFnHi">15136</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L128">ScaledBalanceTokenBase._transfer</a></td>
               
-              <td class="coverFnHi">7051</td>
+              <td class="coverFnHi">25056</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L97">ScaledBalanceTokenBase._burnScaled</a></td>
               
-              <td class="coverFnHi">18095</td>
+              <td class="coverFnHi">26088</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L64">ScaledBalanceTokenBase._mintScaled</a></td>
               
-              <td class="coverFnHi">21697</td>
+              <td class="coverFnHi">62622</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L47">ScaledBalanceTokenBase.scaledTotalSupply</a></td>
+              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L35">ScaledBalanceTokenBase.scaledBalanceOf</a></td>
               
-              <td class="coverFnHi">51717</td>
+              <td class="coverFnHi">88301</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L35">ScaledBalanceTokenBase.scaledBalanceOf</a></td>
+              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L47">ScaledBalanceTokenBase.scaledTotalSupply</a></td>
               
-              <td class="coverFnHi">52893</td>
+              <td class="coverFnHi">99324</td>
               
               
             </tr>
@@ -124,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html
similarity index 69%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html
rename to report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html
index b9f719d3..97d165d5 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html
+++ b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/ScaledBalanceTokenBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (<a href="ScaledBalanceTokenBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (<a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,42 +53,49 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ScaledBalanceTokenBase.sol.func-c.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="ScaledBalanceTokenBase.sol.func-c.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L25">ScaledBalanceTokenBase.</a></td>
+              
+              <td class="coverFnHi">15136</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L97">ScaledBalanceTokenBase._burnScaled</a></td>
               
-              <td class="coverFnHi">18095</td>
+              <td class="coverFnHi">26088</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L64">ScaledBalanceTokenBase._mintScaled</a></td>
               
-              <td class="coverFnHi">21697</td>
+              <td class="coverFnHi">62622</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L128">ScaledBalanceTokenBase._transfer</a></td>
               
-              <td class="coverFnHi">7051</td>
+              <td class="coverFnHi">25056</td>
               
               
             </tr>
@@ -109,14 +116,14 @@
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L35">ScaledBalanceTokenBase.scaledBalanceOf</a></td>
               
-              <td class="coverFnHi">52893</td>
+              <td class="coverFnHi">88301</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="ScaledBalanceTokenBase.sol.gcov.html#L47">ScaledBalanceTokenBase.scaledTotalSupply</a></td>
               
-              <td class="coverFnHi">51717</td>
+              <td class="coverFnHi">99324</td>
               
               
             </tr>
@@ -124,8 +131,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html
similarity index 80%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html
rename to report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html
index 6cfe5084..bc1b261d 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html
+++ b/report/protocol/tokenization/base/ScaledBalanceTokenBase.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base/ScaledBalanceTokenBase.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - <a href="index.html">core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (source / <a href="ScaledBalanceTokenBase.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory protocol/tokenization/base">protocol/tokenization/base</a> - ScaledBalanceTokenBase.sol<span style="font-size: 80%;"> (source / <a href="ScaledBalanceTokenBase.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -37,12 +37,12 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">7</td>
-            <td class="headerCovTableEntry">7</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -105,25 +105,25 @@
 <span id="L34"><span class="lineNum">      34</span>                 :             :   }</span>
 <span id="L35"><span class="lineNum">      35</span>                 :             : </span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   /// @inheritdoc IScaledBalanceToken</span>
-<span id="L37"><span class="lineNum">      37</span>                 :<span class="tlaGNC tlaBgGNC">       52893 :   function scaledBalanceOf(address user) external view override returns (uint256) {</span></span>
-<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC">      158679 :     return super.balanceOf(user);</span></span>
+<span id="L37"><span class="lineNum">      37</span>                 :             :   function scaledBalanceOf(address user) external view override returns (uint256) {</span>
+<span id="L38"><span class="lineNum">      38</span>                 :<span class="tlaGNC tlaBgGNC">       88301 :     return super.balanceOf(user);</span></span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   }</span>
 <span id="L40"><span class="lineNum">      40</span>                 :             : </span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :   /// @inheritdoc IScaledBalanceToken</span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">          21 :   function getScaledUserBalanceAndSupply(</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :             :   function getScaledUserBalanceAndSupply(</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :     address user</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   ) external view override returns (uint256, uint256) {</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">          42 :     return (super.balanceOf(user), super.totalSupply());</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">          21 :     return (super.balanceOf(user), super.totalSupply());</span></span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :   }</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             : </span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :   /// @inheritdoc IScaledBalanceToken</span>
-<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">       51717 :   function scaledTotalSupply() public view virtual override returns (uint256) {</span></span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">      215571 :     return super.totalSupply();</span></span>
+<span id="L49"><span class="lineNum">      49</span>                 :             :   function scaledTotalSupply() public view virtual override returns (uint256) {</span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">      133450 :     return super.totalSupply();</span></span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   }</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             : </span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :   /// @inheritdoc IScaledBalanceToken</span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">          39 :   function getPreviousIndex(address user) external view virtual override returns (uint256) {</span></span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">          78 :     return _userState[user].additionalData;</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   function getPreviousIndex(address user) external view virtual override returns (uint256) {</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">          39 :     return _userState[user].additionalData;</span></span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   }</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             : </span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :   /**</span>
@@ -134,28 +134,28 @@
 <span id="L63"><span class="lineNum">      63</span>                 :             :    * @param index The next liquidity index of the reserve</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :    * @return `true` if the the previous balance of the user was 0</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :    */</span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">       21697 :   function _mintScaled(</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   function _mintScaled(</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :     address caller,</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :     address onBehalfOf,</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :     uint256 amount,</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :     uint256 index</span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :   ) internal returns (bool) {</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       65091 :     uint256 amountScaled = amount.rayDiv(index);</span></span>
-<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       43394 :     require(amountScaled != 0, Errors.INVALID_MINT_AMOUNT);</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">       62622 :     uint256 amountScaled = amount.rayDiv(index);</span></span>
+<span id="L73"><span class="lineNum">      73</span>                 :<span class="tlaGNC">       62622 :     require(amountScaled != 0, Errors.INVALID_MINT_AMOUNT);</span></span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
-<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       65088 :     uint256 scaledBalance = super.balanceOf(onBehalfOf);</span></span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       86784 :     uint256 balanceIncrease = scaledBalance.rayMul(index) -</span></span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       43392 :       scaledBalance.rayMul(_userState[onBehalfOf].additionalData);</span></span>
+<span id="L75"><span class="lineNum">      75</span>                 :<span class="tlaGNC">       62621 :     uint256 scaledBalance = super.balanceOf(onBehalfOf);</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">       62621 :     uint256 balanceIncrease = scaledBalance.rayMul(index) -</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">       62621 :       scaledBalance.rayMul(_userState[onBehalfOf].additionalData);</span></span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       43392 :     _userState[onBehalfOf].additionalData = index.toUint128();</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">       62621 :     _userState[onBehalfOf].additionalData = index.toUint128();</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             : </span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       43392 :     _mint(onBehalfOf, amountScaled.toUint128());</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">       62621 :     _mint(onBehalfOf, amountScaled.toUint128());</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             : </span>
-<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">       65088 :     uint256 amountToMint = amount + balanceIncrease;</span></span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">       43392 :     emit Transfer(address(0), onBehalfOf, amountToMint);</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">       43392 :     emit Mint(caller, onBehalfOf, amountToMint, balanceIncrease, index);</span></span>
+<span id="L83"><span class="lineNum">      83</span>                 :<span class="tlaGNC">       62621 :     uint256 amountToMint = amount + balanceIncrease;</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">       62621 :     emit Transfer(address(0), onBehalfOf, amountToMint);</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">       62621 :     emit Mint(caller, onBehalfOf, amountToMint, balanceIncrease, index);</span></span>
 <span id="L86"><span class="lineNum">      86</span>                 :             : </span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">       43392 :     return (scaledBalance == 0);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">       62621 :     return (scaledBalance == 0);</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :   }</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             : </span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :   /**</span>
@@ -167,26 +167,26 @@
 <span id="L96"><span class="lineNum">      96</span>                 :             :    * @param amount The amount getting burned</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :    * @param index The variable debt index of the reserve</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :    */</span>
-<span id="L99"><span class="lineNum">      99</span>                 :<span class="tlaGNC">       18095 :   function _burnScaled(address user, address target, uint256 amount, uint256 index) internal {</span></span>
-<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">       54285 :     uint256 amountScaled = amount.rayDiv(index);</span></span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">       36190 :     require(amountScaled != 0, Errors.INVALID_BURN_AMOUNT);</span></span>
+<span id="L99"><span class="lineNum">      99</span>                 :             :   function _burnScaled(address user, address target, uint256 amount, uint256 index) internal {</span>
+<span id="L100"><span class="lineNum">     100</span>                 :<span class="tlaGNC">       26088 :     uint256 amountScaled = amount.rayDiv(index);</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">       26088 :     require(amountScaled != 0, Errors.INVALID_BURN_AMOUNT);</span></span>
 <span id="L102"><span class="lineNum">     102</span>                 :             : </span>
-<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">       54282 :     uint256 scaledBalance = super.balanceOf(user);</span></span>
-<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">       72376 :     uint256 balanceIncrease = scaledBalance.rayMul(index) -</span></span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">       36188 :       scaledBalance.rayMul(_userState[user].additionalData);</span></span>
+<span id="L103"><span class="lineNum">     103</span>                 :<span class="tlaGNC">       26087 :     uint256 scaledBalance = super.balanceOf(user);</span></span>
+<span id="L104"><span class="lineNum">     104</span>                 :<span class="tlaGNC">       26087 :     uint256 balanceIncrease = scaledBalance.rayMul(index) -</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">       26087 :       scaledBalance.rayMul(_userState[user].additionalData);</span></span>
 <span id="L106"><span class="lineNum">     106</span>                 :             : </span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       36188 :     _userState[user].additionalData = index.toUint128();</span></span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">       26087 :     _userState[user].additionalData = index.toUint128();</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             : </span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       36188 :     _burn(user, amountScaled.toUint128());</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       26087 :     _burn(user, amountScaled.toUint128());</span></span>
 <span id="L110"><span class="lineNum">     110</span>                 :             : </span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       36186 :     if (balanceIncrease &gt; amount) {</span></span>
-<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">        4416 :       uint256 amountToMint = balanceIncrease - amount;</span></span>
-<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">        2944 :       emit Transfer(address(0), user, amountToMint);</span></span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">        2944 :       emit Mint(user, user, amountToMint, balanceIncrease, index);</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">       26086 :     if (balanceIncrease &gt; amount) {</span></span>
+<span id="L112"><span class="lineNum">     112</span>                 :<span class="tlaGNC">        1560 :       uint256 amountToMint = balanceIncrease - amount;</span></span>
+<span id="L113"><span class="lineNum">     113</span>                 :<span class="tlaGNC">        1560 :       emit Transfer(address(0), user, amountToMint);</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">        1560 :       emit Mint(user, user, amountToMint, balanceIncrease, index);</span></span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :     } else {</span>
-<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">       49863 :       uint256 amountToBurn = amount - balanceIncrease;</span></span>
-<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">       33242 :       emit Transfer(user, address(0), amountToBurn);</span></span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">       33242 :       emit Burn(user, target, amountToBurn, balanceIncrease, index);</span></span>
+<span id="L116"><span class="lineNum">     116</span>                 :<span class="tlaGNC">       24526 :       uint256 amountToBurn = amount - balanceIncrease;</span></span>
+<span id="L117"><span class="lineNum">     117</span>                 :<span class="tlaGNC">       24526 :       emit Transfer(user, address(0), amountToBurn);</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">       24526 :       emit Burn(user, target, amountToBurn, balanceIncrease, index);</span></span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :     }</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :   }</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             : </span>
@@ -198,31 +198,31 @@
 <span id="L127"><span class="lineNum">     127</span>                 :             :    * @param amount The amount getting transferred</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :    * @param index The next liquidity index of the reserve</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :    */</span>
-<span id="L130"><span class="lineNum">     130</span>                 :<span class="tlaGNC">        7051 :   function _transfer(address sender, address recipient, uint256 amount, uint256 index) internal {</span></span>
-<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">       21153 :     uint256 senderScaledBalance = super.balanceOf(sender);</span></span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">       28204 :     uint256 senderBalanceIncrease = senderScaledBalance.rayMul(index) -</span></span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">       14102 :       senderScaledBalance.rayMul(_userState[sender].additionalData);</span></span>
+<span id="L130"><span class="lineNum">     130</span>                 :             :   function _transfer(address sender, address recipient, uint256 amount, uint256 index) internal {</span>
+<span id="L131"><span class="lineNum">     131</span>                 :<span class="tlaGNC">       25056 :     uint256 senderScaledBalance = super.balanceOf(sender);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">       25056 :     uint256 senderBalanceIncrease = senderScaledBalance.rayMul(index) -</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">       25056 :       senderScaledBalance.rayMul(_userState[sender].additionalData);</span></span>
 <span id="L134"><span class="lineNum">     134</span>                 :             : </span>
-<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">       21153 :     uint256 recipientScaledBalance = super.balanceOf(recipient);</span></span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       28204 :     uint256 recipientBalanceIncrease = recipientScaledBalance.rayMul(index) -</span></span>
-<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">       14102 :       recipientScaledBalance.rayMul(_userState[recipient].additionalData);</span></span>
+<span id="L135"><span class="lineNum">     135</span>                 :<span class="tlaGNC">       25056 :     uint256 recipientScaledBalance = super.balanceOf(recipient);</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">       25056 :     uint256 recipientBalanceIncrease = recipientScaledBalance.rayMul(index) -</span></span>
+<span id="L137"><span class="lineNum">     137</span>                 :<span class="tlaGNC">       25056 :       recipientScaledBalance.rayMul(_userState[recipient].additionalData);</span></span>
 <span id="L138"><span class="lineNum">     138</span>                 :             : </span>
-<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">       14102 :     _userState[sender].additionalData = index.toUint128();</span></span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">       14102 :     _userState[recipient].additionalData = index.toUint128();</span></span>
+<span id="L139"><span class="lineNum">     139</span>                 :<span class="tlaGNC">       25056 :     _userState[sender].additionalData = index.toUint128();</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">       25056 :     _userState[recipient].additionalData = index.toUint128();</span></span>
 <span id="L141"><span class="lineNum">     141</span>                 :             : </span>
-<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">       14102 :     super._transfer(sender, recipient, amount.rayDiv(index).toUint128());</span></span>
+<span id="L142"><span class="lineNum">     142</span>                 :<span class="tlaGNC">       25056 :     super._transfer(sender, recipient, amount.rayDiv(index).toUint128());</span></span>
 <span id="L143"><span class="lineNum">     143</span>                 :             : </span>
-<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">       14102 :     if (senderBalanceIncrease &gt; 0) {</span></span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">        2006 :       emit Transfer(address(0), sender, senderBalanceIncrease);</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">        2006 :       emit Mint(_msgSender(), sender, senderBalanceIncrease, senderBalanceIncrease, index);</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">       25056 :     if (senderBalanceIncrease &gt; 0) {</span></span>
+<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">        1003 :       emit Transfer(address(0), sender, senderBalanceIncrease);</span></span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">        1003 :       emit Mint(_msgSender(), sender, senderBalanceIncrease, senderBalanceIncrease, index);</span></span>
 <span id="L147"><span class="lineNum">     147</span>                 :             :     }</span>
 <span id="L148"><span class="lineNum">     148</span>                 :             : </span>
-<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       28202 :     if (sender != recipient &amp;&amp; recipientBalanceIncrease &gt; 0) {</span></span>
-<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">           2 :       emit Transfer(address(0), recipient, recipientBalanceIncrease);</span></span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           2 :       emit Mint(_msgSender(), recipient, recipientBalanceIncrease, recipientBalanceIncrease, index);</span></span>
+<span id="L149"><span class="lineNum">     149</span>                 :<span class="tlaGNC">       25056 :     if (sender != recipient &amp;&amp; recipientBalanceIncrease &gt; 0) {</span></span>
+<span id="L150"><span class="lineNum">     150</span>                 :<span class="tlaGNC">           1 :       emit Transfer(address(0), recipient, recipientBalanceIncrease);</span></span>
+<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           1 :       emit Mint(_msgSender(), recipient, recipientBalanceIncrease, recipientBalanceIncrease, index);</span></span>
 <span id="L152"><span class="lineNum">     152</span>                 :             :     }</span>
 <span id="L153"><span class="lineNum">     153</span>                 :             : </span>
-<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">       14102 :     emit Transfer(sender, recipient, amount);</span></span>
+<span id="L154"><span class="lineNum">     154</span>                 :<span class="tlaGNC">       25056 :     emit Transfer(sender, recipient, amount);</span></span>
 <span id="L155"><span class="lineNum">     155</span>                 :             :   }</span>
 <span id="L156"><span class="lineNum">     156</span>                 :             : }</span>
         </pre>
@@ -232,8 +232,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-b.html b/report/protocol/tokenization/base/index-sort-b.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-b.html
rename to report/protocol/tokenization/base/index-sort-b.html
index 29cd7fa4..7e154b07 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-b.html
+++ b/report/protocol/tokenization/base/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization/base</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">115</td>
-            <td class="headerCovTableEntry">115</td>
+            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">124</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">35</td>
-            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
+            <td class="headerCovTableEntry">42</td>
+            <td class="headerCovTableEntry">41</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html">DebtTokenBase.sol</a></td>
+              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/DebtTokenBase.sol">DebtTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -106,44 +106,44 @@
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EIP712Base.sol.gcov.html">EIP712Base.sol</a></td>
+              <td class="coverFile"><a href="EIP712Base.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/EIP712Base.sol">EIP712Base.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html">IncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol">IncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverNumDflt">44</td>
+              <td class="coverNumDflt">44</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">21</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html">MintableIncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol">MintableIncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -152,13 +152,13 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html">ScaledBalanceTokenBase.sol</a></td>
+              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol">ScaledBalanceTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">45</td>
@@ -167,16 +167,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-f.html b/report/protocol/tokenization/base/index-sort-f.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-f.html
rename to report/protocol/tokenization/base/index-sort-f.html
index 2e83cf55..33cceeb2 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-f.html
+++ b/report/protocol/tokenization/base/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization/base</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">115</td>
-            <td class="headerCovTableEntry">115</td>
+            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">124</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">35</td>
-            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
+            <td class="headerCovTableEntry">42</td>
+            <td class="headerCovTableEntry">41</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html">MintableIncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/DebtTokenBase.sol">DebtTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -106,18 +106,18 @@
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EIP712Base.sol.gcov.html">EIP712Base.sol</a></td>
+              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol">MintableIncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">14</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
@@ -126,24 +126,24 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html">DebtTokenBase.sol</a></td>
+              <td class="coverFile"><a href="EIP712Base.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/EIP712Base.sol">EIP712Base.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">14</td>
-              <td class="coverNumDflt">14</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html">ScaledBalanceTokenBase.sol</a></td>
+              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol">ScaledBalanceTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">45</td>
@@ -152,31 +152,31 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html">IncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol">IncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverNumDflt">44</td>
+              <td class="coverNumDflt">44</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">21</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-l.html b/report/protocol/tokenization/base/index-sort-l.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-l.html
rename to report/protocol/tokenization/base/index-sort-l.html
index 0eea4c33..73d52925 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index-sort-l.html
+++ b/report/protocol/tokenization/base/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization/base</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">115</td>
-            <td class="headerCovTableEntry">115</td>
+            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">124</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">35</td>
-            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
+            <td class="headerCovTableEntry">42</td>
+            <td class="headerCovTableEntry">41</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EIP712Base.sol.gcov.html">EIP712Base.sol</a></td>
+              <td class="coverFile"><a href="EIP712Base.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/EIP712Base.sol">EIP712Base.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html">DebtTokenBase.sol</a></td>
+              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/DebtTokenBase.sol">DebtTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -121,14 +121,14 @@
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html">MintableIncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol">MintableIncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -137,28 +137,28 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html">IncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol">IncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverNumDflt">44</td>
+              <td class="coverNumDflt">44</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">21</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html">ScaledBalanceTokenBase.sol</a></td>
+              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol">ScaledBalanceTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">45</td>
@@ -167,16 +167,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html b/report/protocol/tokenization/base/index.html
similarity index 62%
rename from report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html
rename to report/protocol/tokenization/base/index.html
index 4296bf54..96058176 100644
--- a/report/core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base/index.html
+++ b/report/protocol/tokenization/base/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization/base</title>
+  <link rel="stylesheet" type="text/css" href="../../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../../../index.html">top level</a> - core/contracts/protocol/tokenization/base/src/core/contracts/protocol/tokenization/base</td>
+            <td width="10%" class="headerValue"><a href="../../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization/base</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">115</td>
-            <td class="headerCovTableEntry">115</td>
+            <td class="headerCovTableEntry">124</td>
+            <td class="headerCovTableEntry">124</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">35</td>
-            <td class="headerCovTableEntry">35</td>
+            <td class="headerCovTableEntryHi">97.6&nbsp;%</td>
+            <td class="headerCovTableEntry">42</td>
+            <td class="headerCovTableEntry">41</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,9 +96,9 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html">DebtTokenBase.sol</a></td>
+              <td class="coverFile"><a href="DebtTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/DebtTokenBase.sol">DebtTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -106,44 +106,44 @@
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EIP712Base.sol.gcov.html">EIP712Base.sol</a></td>
+              <td class="coverFile"><a href="EIP712Base.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/EIP712Base.sol">EIP712Base.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">7</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html">IncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="IncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol">IncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">36</td>
-              <td class="coverNumDflt">36</td>
+              <td class="coverNumDflt">44</td>
+              <td class="coverNumDflt">44</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">18</td>
-              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">21</td>
+              <td class="coverNumDflt">21</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html">MintableIncentivizedERC20.sol</a></td>
+              <td class="coverFile"><a href="MintableIncentivizedERC20.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol">MintableIncentivizedERC20.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">14</td>
@@ -152,13 +152,13 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html">ScaledBalanceTokenBase.sol</a></td>
+              <td class="coverFile"><a href="ScaledBalanceTokenBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol">ScaledBalanceTokenBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">45</td>
@@ -167,16 +167,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">7</td>
-              <td class="coverNumDflt">7</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/index-sort-b.html b/report/protocol/tokenization/index-sort-b.html
similarity index 59%
rename from report/core/contracts/misc/src/core/contracts/misc/index-sort-b.html
rename to report/protocol/tokenization/index-sort-b.html
index 7d93d509..5b0ce9c8 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/index-sort-b.html
+++ b/report/protocol/tokenization/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - core/contracts/misc/src/core/contracts/misc</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">93</td>
-            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntry">55</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">30</td>
+            <td class="headerCovTableEntry">30</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,42 +96,42 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveOracle.sol.gcov.html">AaveOracle.sol</a></td>
+              <td class="coverFile"><a href="AToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/AToken.sol">AToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">25</td>
-              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">37</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="L2Encoder.sol.gcov.html">L2Encoder.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/VariableDebtToken.sol">VariableDebtToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">68</td>
-              <td class="coverNumDflt">68</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">13</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/index-sort-f.html b/report/protocol/tokenization/index-sort-f.html
similarity index 59%
rename from report/core/contracts/misc/src/core/contracts/misc/index-sort-f.html
rename to report/protocol/tokenization/index-sort-f.html
index a99df311..11806bda 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/index-sort-f.html
+++ b/report/protocol/tokenization/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - core/contracts/misc/src/core/contracts/misc</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">93</td>
-            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntry">55</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">30</td>
+            <td class="headerCovTableEntry">30</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,42 +96,42 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveOracle.sol.gcov.html">AaveOracle.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/VariableDebtToken.sol">VariableDebtToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">25</td>
-              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">13</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="L2Encoder.sol.gcov.html">L2Encoder.sol</a></td>
+              <td class="coverFile"><a href="AToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/AToken.sol">AToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">68</td>
-              <td class="coverNumDflt">68</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">37</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/index-sort-l.html b/report/protocol/tokenization/index-sort-l.html
similarity index 59%
rename from report/core/contracts/misc/src/core/contracts/misc/index-sort-l.html
rename to report/protocol/tokenization/index-sort-l.html
index 3464dc07..59ef346b 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/index-sort-l.html
+++ b/report/protocol/tokenization/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - core/contracts/misc/src/core/contracts/misc</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">93</td>
-            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntry">55</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">30</td>
+            <td class="headerCovTableEntry">30</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,42 +96,42 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveOracle.sol.gcov.html">AaveOracle.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/VariableDebtToken.sol">VariableDebtToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">25</td>
-              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">13</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="L2Encoder.sol.gcov.html">L2Encoder.sol</a></td>
+              <td class="coverFile"><a href="AToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/AToken.sol">AToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">68</td>
-              <td class="coverNumDflt">68</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">37</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/core/contracts/misc/src/core/contracts/misc/index.html b/report/protocol/tokenization/index.html
similarity index 59%
rename from report/core/contracts/misc/src/core/contracts/misc/index.html
rename to report/protocol/tokenization/index.html
index 1fd42a0a..6f6015ee 100644
--- a/report/core/contracts/misc/src/core/contracts/misc/index.html
+++ b/report/protocol/tokenization/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - core/contracts/misc/src/core/contracts/misc</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - protocol/tokenization</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - core/contracts/misc/src/core/contracts/misc</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - protocol/tokenization</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">93</td>
-            <td class="headerCovTableEntry">93</td>
+            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntry">55</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">20</td>
-            <td class="headerCovTableEntry">20</td>
+            <td class="headerCovTableEntry">30</td>
+            <td class="headerCovTableEntry">30</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,42 +96,42 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="AaveOracle.sol.gcov.html">AaveOracle.sol</a></td>
+              <td class="coverFile"><a href="AToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/AToken.sol">AToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">25</td>
-              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">37</td>
+              <td class="coverNumDflt">37</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">9</td>
-              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">17</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="L2Encoder.sol.gcov.html">L2Encoder.sol</a></td>
+              <td class="coverFile"><a href="VariableDebtToken.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/protocol/tokenization/VariableDebtToken.sol">VariableDebtToken.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">68</td>
-              <td class="coverNumDflt">68</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">11</td>
-              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">13</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func-c.html b/report/rewards/EmissionManager.sol.func-c.html
similarity index 68%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func-c.html
rename to report/rewards/EmissionManager.sol.func-c.html
index da53ffae..7861551c 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func-c.html
+++ b/report/rewards/EmissionManager.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/EmissionManager.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (<a href="EmissionManager.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (<a href="EmissionManager.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">18</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EmissionManager.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="EmissionManager.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -77,6 +77,13 @@
               <td class="coverFnHi">2</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L23">EmissionManager.onlyEmissionAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L61">EmissionManager.setDistributionEnd</a></td>
@@ -107,37 +114,44 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L82">EmissionManager.setClaimer</a></td>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L104">EmissionManager.getEmissionAdmin</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L104">EmissionManager.getEmissionAdmin</a></td>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L87">EmissionManager.setEmissionAdmin</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">41</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L37">EmissionManager.configureAssets</a></td>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L32">EmissionManager.</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">238</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L87">EmissionManager.setEmissionAdmin</a></td>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L94">EmissionManager.setRewardsController</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">680</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L94">EmissionManager.setRewardsController</a></td>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L82">EmissionManager.setClaimer</a></td>
+              
+              <td class="coverFnHi">1004</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L37">EmissionManager.configureAssets</a></td>
               
-              <td class="coverFnHi">606</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
@@ -145,8 +159,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func.html b/report/rewards/EmissionManager.sol.func.html
similarity index 68%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func.html
rename to report/rewards/EmissionManager.sol.func.html
index 3493873d..fefade3f 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.func.html
+++ b/report/rewards/EmissionManager.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/EmissionManager.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (<a href="EmissionManager.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (<a href="EmissionManager.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">18</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td></td>
@@ -53,28 +53,35 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EmissionManager.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="EmissionManager.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L32">EmissionManager.</a></td>
+              
+              <td class="coverFnHi">238</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L37">EmissionManager.configureAssets</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
@@ -91,11 +98,18 @@
               <td class="coverFnHi">2</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L23">EmissionManager.onlyEmissionAdmin</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L82">EmissionManager.setClaimer</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1004</td>
               
               
             </tr>
@@ -109,7 +123,7 @@
             <tr>
               <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L87">EmissionManager.setEmissionAdmin</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">41</td>
               
               
             </tr>
@@ -130,7 +144,7 @@
             <tr>
               <td class="coverFn"><a href="EmissionManager.sol.gcov.html#L94">EmissionManager.setRewardsController</a></td>
               
-              <td class="coverFnHi">606</td>
+              <td class="coverFnHi">680</td>
               
               
             </tr>
@@ -145,8 +159,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.gcov.html b/report/rewards/EmissionManager.sol.gcov.html
similarity index 78%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.gcov.html
rename to report/rewards/EmissionManager.sol.gcov.html
index 3acc4377..e1acb304 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol.gcov.html
+++ b/report/rewards/EmissionManager.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/EmissionManager.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/EmissionManager.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (source / <a href="EmissionManager.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - EmissionManager.sol<span style="font-size: 80%;"> (source / <a href="EmissionManager.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntry">18</td>
+            <td class="headerCovTableEntry">18</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntry">12</td>
+            <td class="headerCovTableEntry">12</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,8 +72,8 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IEACAggregatorProxy} from '../misc/interfaces/IEACAggregatorProxy.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IEACAggregatorProxy} from '../helpers/interfaces/IEACAggregatorProxy.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {IEmissionManager} from './interfaces/IEmissionManager.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {ITransferStrategyBase} from './interfaces/ITransferStrategyBase.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {IRewardsController} from './interfaces/IRewardsController.sol';</span>
@@ -94,7 +94,7 @@
 <span id="L23"><span class="lineNum">      23</span>                 :             :    * @dev Only emission admin of the given reward can call functions marked by this modifier.</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :    **/</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   modifier onlyEmissionAdmin(address reward) {</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :     require(msg.sender == _emissionAdmins[reward], 'ONLY_EMISSION_ADMIN');</span>
+<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     require(msg.sender == _emissionAdmins[reward], 'ONLY_EMISSION_ADMIN');</span></span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :     _;</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :   }</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             : </span>
@@ -103,79 +103,79 @@
 <span id="L32"><span class="lineNum">      32</span>                 :             :    * @param owner The address of the owner</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :    */</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   constructor(address owner) {</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     transferOwnership(owner);</span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC">          91 :     transferOwnership(owner);</span></span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :   }</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             : </span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L39"><span class="lineNum">      39</span>                 :<span class="tlaGNC tlaBgGNC">          20 :   function configureAssets(RewardsDataTypes.RewardsConfigInput[] memory config) external override {</span></span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">         100 :     for (uint256 i = 0; i &lt; config.length; i++) {</span></span>
-<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">          40 :       require(_emissionAdmins[config[i].reward] == msg.sender, 'ONLY_EMISSION_ADMIN');</span></span>
+<span id="L39"><span class="lineNum">      39</span>                 :             :   function configureAssets(RewardsDataTypes.RewardsConfigInput[] memory config) external override {</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">        9023 :     for (uint256 i = 0; i &lt; config.length; i++) {</span></span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">        9023 :       require(_emissionAdmins[config[i].reward] == msg.sender, 'ONLY_EMISSION_ADMIN');</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :     }</span>
-<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">          40 :     _rewardsController.configureAssets(config);</span></span>
+<span id="L43"><span class="lineNum">      43</span>                 :<span class="tlaGNC">        9023 :     _rewardsController.configureAssets(config);</span></span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   }</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             : </span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           2 :   function setTransferStrategy(</span></span>
+<span id="L47"><span class="lineNum">      47</span>                 :             :   function setTransferStrategy(</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :     address reward,</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :     ITransferStrategyBase transferStrategy</span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :   ) external override onlyEmissionAdmin(reward) {</span>
-<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           4 :     _rewardsController.setTransferStrategy(reward, transferStrategy);</span></span>
+<span id="L51"><span class="lineNum">      51</span>                 :<span class="tlaGNC">           2 :     _rewardsController.setTransferStrategy(reward, transferStrategy);</span></span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :   }</span>
 <span id="L53"><span class="lineNum">      53</span>                 :             : </span>
 <span id="L54"><span class="lineNum">      54</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           2 :   function setRewardOracle(</span></span>
+<span id="L55"><span class="lineNum">      55</span>                 :             :   function setRewardOracle(</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :     address reward,</span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :     IEACAggregatorProxy rewardOracle</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :   ) external override onlyEmissionAdmin(reward) {</span>
-<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           4 :     _rewardsController.setRewardOracle(reward, rewardOracle);</span></span>
+<span id="L59"><span class="lineNum">      59</span>                 :<span class="tlaGNC">           2 :     _rewardsController.setRewardOracle(reward, rewardOracle);</span></span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :   }</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             : </span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           2 :   function setDistributionEnd(</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :             :   function setDistributionEnd(</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :     address asset,</span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :     address reward,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :     uint32 newDistributionEnd</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   ) external override onlyEmissionAdmin(reward) {</span>
-<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           4 :     _rewardsController.setDistributionEnd(asset, reward, newDistributionEnd);</span></span>
+<span id="L68"><span class="lineNum">      68</span>                 :<span class="tlaGNC">           2 :     _rewardsController.setDistributionEnd(asset, reward, newDistributionEnd);</span></span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   }</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           2 :   function setEmissionPerSecond(</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   function setEmissionPerSecond(</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     address asset,</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :     address[] calldata rewards,</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :     uint88[] calldata newEmissionsPerSecond</span>
 <span id="L76"><span class="lineNum">      76</span>                 :             :   ) external override {</span>
-<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">          10 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
-<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           4 :       require(_emissionAdmins[rewards[i]] == msg.sender, 'ONLY_EMISSION_ADMIN');</span></span>
+<span id="L77"><span class="lineNum">      77</span>                 :<span class="tlaGNC">           2 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
+<span id="L78"><span class="lineNum">      78</span>                 :<span class="tlaGNC">           2 :       require(_emissionAdmins[rewards[i]] == msg.sender, 'ONLY_EMISSION_ADMIN');</span></span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :     }</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           4 :     _rewardsController.setEmissionPerSecond(asset, rewards, newEmissionsPerSecond);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">           2 :     _rewardsController.setEmissionPerSecond(asset, rewards, newEmissionsPerSecond);</span></span>
 <span id="L81"><span class="lineNum">      81</span>                 :             :   }</span>
 <span id="L82"><span class="lineNum">      82</span>                 :             : </span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">           4 :   function setClaimer(address user, address claimer) external override onlyOwner {</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">           8 :     _rewardsController.setClaimer(user, claimer);</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :             :   function setClaimer(address user, address claimer) external override onlyOwner {</span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        1004 :     _rewardsController.setClaimer(user, claimer);</span></span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :   }</span>
 <span id="L87"><span class="lineNum">      87</span>                 :             : </span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">          25 :   function setEmissionAdmin(address reward, address admin) external override onlyOwner {</span></span>
-<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">          50 :     address oldAdmin = _emissionAdmins[reward];</span></span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">          50 :     _emissionAdmins[reward] = admin;</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">          50 :     emit EmissionAdminUpdated(reward, oldAdmin, admin);</span></span>
+<span id="L89"><span class="lineNum">      89</span>                 :             :   function setEmissionAdmin(address reward, address admin) external override onlyOwner {</span>
+<span id="L90"><span class="lineNum">      90</span>                 :<span class="tlaGNC">          41 :     address oldAdmin = _emissionAdmins[reward];</span></span>
+<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">          41 :     _emissionAdmins[reward] = admin;</span></span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">          41 :     emit EmissionAdminUpdated(reward, oldAdmin, admin);</span></span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :   }</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             : </span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">         606 :   function setRewardsController(address controller) external override onlyOwner {</span></span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">        1212 :     _rewardsController = IRewardsController(controller);</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   function setRewardsController(address controller) external override onlyOwner {</span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">         680 :     _rewardsController = IRewardsController(controller);</span></span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : </span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           2 :   function getRewardsController() external view override returns (IRewardsController) {</span></span>
-<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           4 :     return _rewardsController;</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :   function getRewardsController() external view override returns (IRewardsController) {</span>
+<span id="L102"><span class="lineNum">     102</span>                 :<span class="tlaGNC">           2 :     return _rewardsController;</span></span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :   }</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             : </span>
 <span id="L105"><span class="lineNum">     105</span>                 :             :   /// @inheritdoc IEmissionManager</span>
-<span id="L106"><span class="lineNum">     106</span>                 :<span class="tlaGNC">           6 :   function getEmissionAdmin(address reward) external view override returns (address) {</span></span>
-<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">          12 :     return _emissionAdmins[reward];</span></span>
+<span id="L106"><span class="lineNum">     106</span>                 :             :   function getEmissionAdmin(address reward) external view override returns (address) {</span>
+<span id="L107"><span class="lineNum">     107</span>                 :<span class="tlaGNC">           6 :     return _emissionAdmins[reward];</span></span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :   }</span>
 <span id="L109"><span class="lineNum">     109</span>                 :             : }</span>
         </pre>
@@ -185,8 +185,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func-c.html b/report/rewards/RewardsController.sol.func-c.html
similarity index 74%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func-c.html
rename to report/rewards/RewardsController.sol.func-c.html
index 352a1250..162f744e 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func-c.html
+++ b/report/rewards/RewardsController.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsController.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (<a href="RewardsController.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (<a href="RewardsController.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.8&nbsp;%</td>
+            <td class="headerCovTableEntry">80</td>
             <td class="headerCovTableEntry">79</td>
-            <td class="headerCovTableEntry">78</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">23</td>
-            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntryHi">96.0&nbsp;%</td>
+            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="RewardsController.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="RewardsController.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L42">RewardsController.</a></td>
+              
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -121,9 +128,9 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L51">RewardsController.getClaimer</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L37">RewardsController.onlyAuthorizedClaimers</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">1</td>
               
               
             </tr>
@@ -149,86 +156,93 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L112">RewardsController.claimRewards</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L177">RewardsController.setClaimer</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1004</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L177">RewardsController.setClaimer</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L59">RewardsController.getRevision</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1387</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L212">RewardsController._claimRewards</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L48">RewardsController.initialize</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">1387</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L298">RewardsController._transferRewards</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">1902</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L188">RewardsController._getUserAssetBalances</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L51">RewardsController.getClaimer</a></td>
               
-              <td class="coverFnHi">19</td>
+              <td class="coverFnHi">2002</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L74">RewardsController.configureAssets</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L112">RewardsController.claimRewards</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">2521</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L329">RewardsController._installTransferStrategy</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L212">RewardsController._claimRewards</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">2523</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L311">RewardsController._isContract</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L188">RewardsController._getUserAssetBalances</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">3537</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L348">RewardsController._setRewardOracle</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L74">RewardsController.configureAssets</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L59">RewardsController.getRevision</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L329">RewardsController._installTransferStrategy</a></td>
               
-              <td class="coverFnHi">1231</td>
+              <td class="coverFnHi">9025</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L48">RewardsController.initialize</a></td>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L311">RewardsController._isContract</a></td>
+              
+              <td class="coverFnHi">9025</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L348">RewardsController._setRewardOracle</a></td>
               
-              <td class="coverFnHi">1231</td>
+              <td class="coverFnHi">9025</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L107">RewardsController.handleAction</a></td>
               
-              <td class="coverFnHi">53887</td>
+              <td class="coverFnHi">138815</td>
               
               
             </tr>
@@ -236,8 +250,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func.html b/report/rewards/RewardsController.sol.func.html
similarity index 74%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func.html
rename to report/rewards/RewardsController.sol.func.html
index 81283855..88712b4e 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.func.html
+++ b/report/rewards/RewardsController.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsController.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (<a href="RewardsController.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (<a href="RewardsController.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.8&nbsp;%</td>
+            <td class="headerCovTableEntry">80</td>
             <td class="headerCovTableEntry">79</td>
-            <td class="headerCovTableEntry">78</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">23</td>
-            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntryHi">96.0&nbsp;%</td>
+            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="RewardsController.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="RewardsController.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L42">RewardsController.</a></td>
+              
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -81,42 +88,42 @@
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L212">RewardsController._claimRewards</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">2523</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L188">RewardsController._getUserAssetBalances</a></td>
               
-              <td class="coverFnHi">19</td>
+              <td class="coverFnHi">3537</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L329">RewardsController._installTransferStrategy</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">9025</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L311">RewardsController._isContract</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">9025</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L348">RewardsController._setRewardOracle</a></td>
               
-              <td class="coverFnHi">22</td>
+              <td class="coverFnHi">9025</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L298">RewardsController._transferRewards</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">1902</td>
               
               
             </tr>
@@ -144,7 +151,7 @@
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L112">RewardsController.claimRewards</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">2521</td>
               
               
             </tr>
@@ -165,21 +172,21 @@
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L74">RewardsController.configureAssets</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L51">RewardsController.getClaimer</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">2002</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L59">RewardsController.getRevision</a></td>
               
-              <td class="coverFnHi">1231</td>
+              <td class="coverFnHi">1387</td>
               
               
             </tr>
@@ -200,21 +207,28 @@
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L107">RewardsController.handleAction</a></td>
               
-              <td class="coverFnHi">53887</td>
+              <td class="coverFnHi">138815</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L48">RewardsController.initialize</a></td>
               
-              <td class="coverFnHi">1231</td>
+              <td class="coverFnHi">1387</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsController.sol.gcov.html#L37">RewardsController.onlyAuthorizedClaimers</a></td>
+              
+              <td class="coverFnHi">1</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsController.sol.gcov.html#L177">RewardsController.setClaimer</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">1004</td>
               
               
             </tr>
@@ -236,8 +250,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.gcov.html b/report/rewards/RewardsController.sol.gcov.html
similarity index 82%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.gcov.html
rename to report/rewards/RewardsController.sol.gcov.html
index 67e5d544..2d62f326 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol.gcov.html
+++ b/report/rewards/RewardsController.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsController.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsController.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (source / <a href="RewardsController.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsController.sol<span style="font-size: 80%;"> (source / <a href="RewardsController.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">98.7&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.8&nbsp;%</td>
+            <td class="headerCovTableEntry">80</td>
             <td class="headerCovTableEntry">79</td>
-            <td class="headerCovTableEntry">78</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">23</td>
-            <td class="headerCovTableEntry">23</td>
+            <td class="headerCovTableEntryHi">96.0&nbsp;%</td>
+            <td class="headerCovTableEntry">25</td>
+            <td class="headerCovTableEntry">24</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,14 +72,14 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from 'aave-v3-core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeCast} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IScaledBalanceToken} from 'aave-v3-core/contracts/interfaces/IScaledBalanceToken.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {VersionedInitializable} from '../misc/aave-upgradeability/VersionedInitializable.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {SafeCast} from '../dependencies/openzeppelin/contracts/SafeCast.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IScaledBalanceToken} from '../interfaces/IScaledBalanceToken.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {RewardsDistributor} from './RewardsDistributor.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {IRewardsController} from './interfaces/IRewardsController.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : import {ITransferStrategyBase} from './interfaces/ITransferStrategyBase.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : import {RewardsDataTypes} from './libraries/RewardsDataTypes.sol';</span>
-<span id="L11"><span class="lineNum">      11</span>                 :             : import {IEACAggregatorProxy} from '../misc/interfaces/IEACAggregatorProxy.sol';</span>
+<span id="L11"><span class="lineNum">      11</span>                 :             : import {IEACAggregatorProxy} from '../helpers/interfaces/IEACAggregatorProxy.sol';</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             : </span>
 <span id="L13"><span class="lineNum">      13</span>                 :             : /**</span>
 <span id="L14"><span class="lineNum">      14</span>                 :             :  * @title RewardsController</span>
@@ -108,7 +108,7 @@
 <span id="L37"><span class="lineNum">      37</span>                 :             :   mapping(address =&gt; IEACAggregatorProxy) internal _rewardOracle;</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             : </span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   modifier onlyAuthorizedClaimers(address claimer, address user) {</span>
-<span id="L40"><span class="lineNum">      40</span>                 :             :     require(_authorizedClaimers[user] == claimer, 'CLAIMER_UNAUTHORIZED');</span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC tlaBgGNC">           1 :     require(_authorizedClaimers[user] == claimer, 'CLAIMER_UNAUTHORIZED');</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             :     _;</span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
@@ -118,113 +118,113 @@
 <span id="L47"><span class="lineNum">      47</span>                 :             :    * @dev Initialize for RewardsController</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :    * @dev It expects an address as argument since its initialized via PoolAddressesProvider._updateImpl()</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :    **/</span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC tlaBgGNC">        1231 :   function initialize(address) external initializer {}</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :             :   function initialize(address) external initializer {}</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             : </span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L53"><span class="lineNum">      53</span>                 :<span class="tlaGNC">           2 :   function getClaimer(address user) external view override returns (address) {</span></span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">           4 :     return _authorizedClaimers[user];</span></span>
+<span id="L53"><span class="lineNum">      53</span>                 :             :   function getClaimer(address user) external view override returns (address) {</span>
+<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">        2002 :     return _authorizedClaimers[user];</span></span>
 <span id="L55"><span class="lineNum">      55</span>                 :             :   }</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   /**</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :    * @dev Returns the revision of the implementation contract</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :    * @return uint256, current revision version</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :    */</span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">        1231 :   function getRevision() internal pure override returns (uint256) {</span></span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">        2462 :     return REVISION;</span></span>
+<span id="L61"><span class="lineNum">      61</span>                 :             :   function getRevision() internal pure override returns (uint256) {</span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">        1387 :     return REVISION;</span></span>
 <span id="L63"><span class="lineNum">      63</span>                 :             :   }</span>
 <span id="L64"><span class="lineNum">      64</span>                 :             : </span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           1 :   function getRewardOracle(address reward) external view override returns (address) {</span></span>
-<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           3 :     return address(_rewardOracle[reward]);</span></span>
+<span id="L66"><span class="lineNum">      66</span>                 :             :   function getRewardOracle(address reward) external view override returns (address) {</span>
+<span id="L67"><span class="lineNum">      67</span>                 :<span class="tlaGNC">           1 :     return address(_rewardOracle[reward]);</span></span>
 <span id="L68"><span class="lineNum">      68</span>                 :             :   }</span>
 <span id="L69"><span class="lineNum">      69</span>                 :             : </span>
 <span id="L70"><span class="lineNum">      70</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           1 :   function getTransferStrategy(address reward) external view override returns (address) {</span></span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           3 :     return address(_transferStrategy[reward]);</span></span>
+<span id="L71"><span class="lineNum">      71</span>                 :             :   function getTransferStrategy(address reward) external view override returns (address) {</span>
+<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           1 :     return address(_transferStrategy[reward]);</span></span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :   }</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             : </span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">          20 :   function configureAssets(</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :             :   function configureAssets(</span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :     RewardsDataTypes.RewardsConfigInput[] memory config</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             :   ) external override onlyEmissionManager {</span>
-<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">         100 :     for (uint256 i = 0; i &lt; config.length; i++) {</span></span>
+<span id="L79"><span class="lineNum">      79</span>                 :<span class="tlaGNC">        9023 :     for (uint256 i = 0; i &lt; config.length; i++) {</span></span>
 <span id="L80"><span class="lineNum">      80</span>                 :             :       // Get the current Scaled Total Supply of AToken or Debt token</span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">          40 :       config[i].totalSupply = IScaledBalanceToken(config[i].asset).scaledTotalSupply();</span></span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">        9023 :       config[i].totalSupply = IScaledBalanceToken(config[i].asset).scaledTotalSupply();</span></span>
 <span id="L82"><span class="lineNum">      82</span>                 :             : </span>
 <span id="L83"><span class="lineNum">      83</span>                 :             :       // Install TransferStrategy logic at IncentivesController</span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">          40 :       _installTransferStrategy(config[i].reward, config[i].transferStrategy);</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        9023 :       _installTransferStrategy(config[i].reward, config[i].transferStrategy);</span></span>
 <span id="L85"><span class="lineNum">      85</span>                 :             : </span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :       // Set reward oracle, enforces input oracle to have latestPrice function</span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">          40 :       _setRewardOracle(config[i].reward, config[i].rewardOracle);</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        9023 :       _setRewardOracle(config[i].reward, config[i].rewardOracle);</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :     }</span>
-<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">          40 :     _configureAssets(config);</span></span>
+<span id="L89"><span class="lineNum">      89</span>                 :<span class="tlaGNC">        9023 :     _configureAssets(config);</span></span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :   }</span>
 <span id="L91"><span class="lineNum">      91</span>                 :             : </span>
 <span id="L92"><span class="lineNum">      92</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L93"><span class="lineNum">      93</span>                 :<span class="tlaGNC">           2 :   function setTransferStrategy(</span></span>
+<span id="L93"><span class="lineNum">      93</span>                 :             :   function setTransferStrategy(</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             :     address reward,</span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :     ITransferStrategyBase transferStrategy</span>
 <span id="L96"><span class="lineNum">      96</span>                 :             :   ) external onlyEmissionManager {</span>
-<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           4 :     _installTransferStrategy(reward, transferStrategy);</span></span>
+<span id="L97"><span class="lineNum">      97</span>                 :<span class="tlaGNC">           2 :     _installTransferStrategy(reward, transferStrategy);</span></span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :   }</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             : </span>
 <span id="L100"><span class="lineNum">     100</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           2 :   function setRewardOracle(</span></span>
+<span id="L101"><span class="lineNum">     101</span>                 :             :   function setRewardOracle(</span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :     address reward,</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             :     IEACAggregatorProxy rewardOracle</span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :   ) external onlyEmissionManager {</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           4 :     _setRewardOracle(reward, rewardOracle);</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           2 :     _setRewardOracle(reward, rewardOracle);</span></span>
 <span id="L106"><span class="lineNum">     106</span>                 :             :   }</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             : </span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">       53887 :   function handleAction(address user, uint256 totalSupply, uint256 userBalance) external override {</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">      107774 :     _updateData(msg.sender, user, userBalance, totalSupply);</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :             :   function handleAction(address user, uint256 totalSupply, uint256 userBalance) external override {</span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">      138815 :     _updateData(msg.sender, user, userBalance, totalSupply);</span></span>
 <span id="L111"><span class="lineNum">     111</span>                 :             :   }</span>
 <span id="L112"><span class="lineNum">     112</span>                 :             : </span>
 <span id="L113"><span class="lineNum">     113</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">           4 :   function claimRewards(</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :             :   function claimRewards(</span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :     address[] calldata assets,</span>
 <span id="L116"><span class="lineNum">     116</span>                 :             :     uint256 amount,</span>
 <span id="L117"><span class="lineNum">     117</span>                 :             :     address to,</span>
 <span id="L118"><span class="lineNum">     118</span>                 :             :     address reward</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :   ) external override returns (uint256) {</span>
-<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">           8 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
-<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">          12 :     return _claimRewards(assets, amount, msg.sender, msg.sender, to, reward);</span></span>
+<span id="L120"><span class="lineNum">     120</span>                 :<span class="tlaGNC">        2521 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
+<span id="L121"><span class="lineNum">     121</span>                 :<span class="tlaGNC">        2521 :     return _claimRewards(assets, amount, msg.sender, msg.sender, to, reward);</span></span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   }</span>
 <span id="L123"><span class="lineNum">     123</span>                 :             : </span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L125"><span class="lineNum">     125</span>                 :<span class="tlaGNC">           1 :   function claimRewardsOnBehalf(</span></span>
+<span id="L125"><span class="lineNum">     125</span>                 :             :   function claimRewardsOnBehalf(</span>
 <span id="L126"><span class="lineNum">     126</span>                 :             :     address[] calldata assets,</span>
 <span id="L127"><span class="lineNum">     127</span>                 :             :     uint256 amount,</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     address user,</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :     address to,</span>
 <span id="L130"><span class="lineNum">     130</span>                 :             :     address reward</span>
 <span id="L131"><span class="lineNum">     131</span>                 :             :   ) external override onlyAuthorizedClaimers(msg.sender, user) returns (uint256) {</span>
-<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           2 :     require(user != address(0), 'INVALID_USER_ADDRESS');</span></span>
-<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">           2 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
-<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           3 :     return _claimRewards(assets, amount, msg.sender, user, to, reward);</span></span>
+<span id="L132"><span class="lineNum">     132</span>                 :<span class="tlaGNC">           1 :     require(user != address(0), 'INVALID_USER_ADDRESS');</span></span>
+<span id="L133"><span class="lineNum">     133</span>                 :<span class="tlaGNC">           1 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
+<span id="L134"><span class="lineNum">     134</span>                 :<span class="tlaGNC">           1 :     return _claimRewards(assets, amount, msg.sender, user, to, reward);</span></span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :   }</span>
 <span id="L136"><span class="lineNum">     136</span>                 :             : </span>
 <span id="L137"><span class="lineNum">     137</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L138"><span class="lineNum">     138</span>                 :<span class="tlaGNC">           1 :   function claimRewardsToSelf(</span></span>
+<span id="L138"><span class="lineNum">     138</span>                 :             :   function claimRewardsToSelf(</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             :     address[] calldata assets,</span>
 <span id="L140"><span class="lineNum">     140</span>                 :             :     uint256 amount,</span>
 <span id="L141"><span class="lineNum">     141</span>                 :             :     address reward</span>
 <span id="L142"><span class="lineNum">     142</span>                 :             :   ) external override returns (uint256) {</span>
-<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           3 :     return _claimRewards(assets, amount, msg.sender, msg.sender, msg.sender, reward);</span></span>
+<span id="L143"><span class="lineNum">     143</span>                 :<span class="tlaGNC">           1 :     return _claimRewards(assets, amount, msg.sender, msg.sender, msg.sender, reward);</span></span>
 <span id="L144"><span class="lineNum">     144</span>                 :             :   }</span>
 <span id="L145"><span class="lineNum">     145</span>                 :             : </span>
 <span id="L146"><span class="lineNum">     146</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           1 :   function claimAllRewards(</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :             :   function claimAllRewards(</span>
 <span id="L148"><span class="lineNum">     148</span>                 :             :     address[] calldata assets,</span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :     address to</span>
 <span id="L150"><span class="lineNum">     150</span>                 :             :   ) external override returns (address[] memory rewardsList, uint256[] memory claimedAmounts) {</span>
-<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           2 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           3 :     return _claimAllRewards(assets, msg.sender, msg.sender, to);</span></span>
+<span id="L151"><span class="lineNum">     151</span>                 :<span class="tlaGNC">           1 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           1 :     return _claimAllRewards(assets, msg.sender, msg.sender, to);</span></span>
 <span id="L153"><span class="lineNum">     153</span>                 :             :   }</span>
 <span id="L154"><span class="lineNum">     154</span>                 :             : </span>
 <span id="L155"><span class="lineNum">     155</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L156"><span class="lineNum">     156</span>                 :<span class="tlaGNC">           1 :   function claimAllRewardsOnBehalf(</span></span>
+<span id="L156"><span class="lineNum">     156</span>                 :             :   function claimAllRewardsOnBehalf(</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             :     address[] calldata assets,</span>
 <span id="L158"><span class="lineNum">     158</span>                 :             :     address user,</span>
 <span id="L159"><span class="lineNum">     159</span>                 :             :     address to</span>
@@ -234,22 +234,22 @@
 <span id="L163"><span class="lineNum">     163</span>                 :             :     onlyAuthorizedClaimers(msg.sender, user)</span>
 <span id="L164"><span class="lineNum">     164</span>                 :             :     returns (address[] memory rewardsList, uint256[] memory claimedAmounts)</span>
 <span id="L165"><span class="lineNum">     165</span>                 :             :   {</span>
-<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">           2 :     require(user != address(0), 'INVALID_USER_ADDRESS');</span></span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           2 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           3 :     return _claimAllRewards(assets, msg.sender, user, to);</span></span>
+<span id="L166"><span class="lineNum">     166</span>                 :<span class="tlaGNC">           1 :     require(user != address(0), 'INVALID_USER_ADDRESS');</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           1 :     require(to != address(0), 'INVALID_TO_ADDRESS');</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           1 :     return _claimAllRewards(assets, msg.sender, user, to);</span></span>
 <span id="L169"><span class="lineNum">     169</span>                 :             :   }</span>
 <span id="L170"><span class="lineNum">     170</span>                 :             : </span>
 <span id="L171"><span class="lineNum">     171</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L172"><span class="lineNum">     172</span>                 :<span class="tlaGNC">           1 :   function claimAllRewardsToSelf(</span></span>
+<span id="L172"><span class="lineNum">     172</span>                 :             :   function claimAllRewardsToSelf(</span>
 <span id="L173"><span class="lineNum">     173</span>                 :             :     address[] calldata assets</span>
 <span id="L174"><span class="lineNum">     174</span>                 :             :   ) external override returns (address[] memory rewardsList, uint256[] memory claimedAmounts) {</span>
-<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           3 :     return _claimAllRewards(assets, msg.sender, msg.sender, msg.sender);</span></span>
+<span id="L175"><span class="lineNum">     175</span>                 :<span class="tlaGNC">           1 :     return _claimAllRewards(assets, msg.sender, msg.sender, msg.sender);</span></span>
 <span id="L176"><span class="lineNum">     176</span>                 :             :   }</span>
 <span id="L177"><span class="lineNum">     177</span>                 :             : </span>
 <span id="L178"><span class="lineNum">     178</span>                 :             :   /// @inheritdoc IRewardsController</span>
-<span id="L179"><span class="lineNum">     179</span>                 :<span class="tlaGNC">           4 :   function setClaimer(address user, address caller) external override onlyEmissionManager {</span></span>
-<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">           8 :     _authorizedClaimers[user] = caller;</span></span>
-<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">           8 :     emit ClaimerSet(user, caller);</span></span>
+<span id="L179"><span class="lineNum">     179</span>                 :             :   function setClaimer(address user, address caller) external override onlyEmissionManager {</span>
+<span id="L180"><span class="lineNum">     180</span>                 :<span class="tlaGNC">        1004 :     _authorizedClaimers[user] = caller;</span></span>
+<span id="L181"><span class="lineNum">     181</span>                 :<span class="tlaGNC">        1004 :     emit ClaimerSet(user, caller);</span></span>
 <span id="L182"><span class="lineNum">     182</span>                 :             :   }</span>
 <span id="L183"><span class="lineNum">     183</span>                 :             : </span>
 <span id="L184"><span class="lineNum">     184</span>                 :             :   /**</span>
@@ -258,14 +258,14 @@
 <span id="L187"><span class="lineNum">     187</span>                 :             :    * @param user Address of the user</span>
 <span id="L188"><span class="lineNum">     188</span>                 :             :    * @return userAssetBalances contains a list of structs with user balance and total supply of the given assets</span>
 <span id="L189"><span class="lineNum">     189</span>                 :             :    */</span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">          19 :   function _getUserAssetBalances(</span></span>
+<span id="L190"><span class="lineNum">     190</span>                 :             :   function _getUserAssetBalances(</span>
 <span id="L191"><span class="lineNum">     191</span>                 :             :     address[] calldata assets,</span>
 <span id="L192"><span class="lineNum">     192</span>                 :             :     address user</span>
 <span id="L193"><span class="lineNum">     193</span>                 :             :   ) internal view override returns (RewardsDataTypes.UserAssetBalance[] memory userAssetBalances) {</span>
-<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">          38 :     userAssetBalances = new RewardsDataTypes.UserAssetBalance[](assets.length);</span></span>
-<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">          95 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">          38 :       userAssetBalances[i].asset = assets[i];</span></span>
-<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">          38 :       (userAssetBalances[i].userBalance, userAssetBalances[i].totalSupply) = IScaledBalanceToken(</span></span>
+<span id="L194"><span class="lineNum">     194</span>                 :<span class="tlaGNC">        3537 :     userAssetBalances = new RewardsDataTypes.UserAssetBalance[](assets.length);</span></span>
+<span id="L195"><span class="lineNum">     195</span>                 :<span class="tlaGNC">        3537 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L196"><span class="lineNum">     196</span>                 :<span class="tlaGNC">        3537 :       userAssetBalances[i].asset = assets[i];</span></span>
+<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">        3537 :       (userAssetBalances[i].userBalance, userAssetBalances[i].totalSupply) = IScaledBalanceToken(</span></span>
 <span id="L198"><span class="lineNum">     198</span>                 :             :         assets[i]</span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :       ).getScaledUserBalanceAndSupply(user);</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             :     }</span>
@@ -282,7 +282,7 @@
 <span id="L211"><span class="lineNum">     211</span>                 :             :    * @param reward Address of the reward token</span>
 <span id="L212"><span class="lineNum">     212</span>                 :             :    * @return Rewards claimed</span>
 <span id="L213"><span class="lineNum">     213</span>                 :             :    **/</span>
-<span id="L214"><span class="lineNum">     214</span>                 :<span class="tlaGNC tlaBgGNC">           6 :   function _claimRewards(</span></span>
+<span id="L214"><span class="lineNum">     214</span>                 :             :   function _claimRewards(</span>
 <span id="L215"><span class="lineNum">     215</span>                 :             :     address[] calldata assets,</span>
 <span id="L216"><span class="lineNum">     216</span>                 :             :     uint256 amount,</span>
 <span id="L217"><span class="lineNum">     217</span>                 :             :     address claimer,</span>
@@ -290,34 +290,34 @@
 <span id="L219"><span class="lineNum">     219</span>                 :             :     address to,</span>
 <span id="L220"><span class="lineNum">     220</span>                 :             :     address reward</span>
 <span id="L221"><span class="lineNum">     221</span>                 :             :   ) internal returns (uint256) {</span>
-<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">          12 :     if (amount == 0) {</span></span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">           2 :       return 0;</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC tlaBgGNC">        2523 :     if (amount == 0) {</span></span>
+<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">           1 :       return 0;</span></span>
 <span id="L224"><span class="lineNum">     224</span>                 :             :     }</span>
-<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">          10 :     uint256 totalRewards;</span></span>
+<span id="L225"><span class="lineNum">     225</span>                 :<span class="tlaGNC">        2522 :     uint256 totalRewards;</span></span>
 <span id="L226"><span class="lineNum">     226</span>                 :             : </span>
-<span id="L227"><span class="lineNum">     227</span>                 :<span class="tlaGNC">          10 :     _updateDataMultiple(user, _getUserAssetBalances(assets, user));</span></span>
-<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">          23 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">          10 :       address asset = assets[i];</span></span>
-<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">          10 :       totalRewards += _assets[asset].rewards[reward].usersData[user].accrued;</span></span>
+<span id="L227"><span class="lineNum">     227</span>                 :<span class="tlaGNC">        2522 :     _updateDataMultiple(user, _getUserAssetBalances(assets, user));</span></span>
+<span id="L228"><span class="lineNum">     228</span>                 :<span class="tlaGNC">        2522 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">        2522 :       address asset = assets[i];</span></span>
+<span id="L230"><span class="lineNum">     230</span>                 :<span class="tlaGNC">        2522 :       totalRewards += _assets[asset].rewards[reward].usersData[user].accrued;</span></span>
 <span id="L231"><span class="lineNum">     231</span>                 :             : </span>
-<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">          10 :       if (totalRewards &lt;= amount) {</span></span>
-<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">           8 :         _assets[asset].rewards[reward].usersData[user].accrued = 0;</span></span>
+<span id="L232"><span class="lineNum">     232</span>                 :<span class="tlaGNC">        2522 :       if (totalRewards &lt;= amount) {</span></span>
+<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">        2521 :         _assets[asset].rewards[reward].usersData[user].accrued = 0;</span></span>
 <span id="L234"><span class="lineNum">     234</span>                 :             :       } else {</span>
-<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">           3 :         uint256 difference = totalRewards - amount;</span></span>
-<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">           2 :         totalRewards -= difference;</span></span>
-<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           2 :         _assets[asset].rewards[reward].usersData[user].accrued = difference.toUint128();</span></span>
-<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">           2 :         break;</span></span>
+<span id="L235"><span class="lineNum">     235</span>                 :<span class="tlaGNC">           1 :         uint256 difference = totalRewards - amount;</span></span>
+<span id="L236"><span class="lineNum">     236</span>                 :<span class="tlaGNC">           1 :         totalRewards -= difference;</span></span>
+<span id="L237"><span class="lineNum">     237</span>                 :<span class="tlaGNC">           1 :         _assets[asset].rewards[reward].usersData[user].accrued = difference.toUint128();</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">           1 :         break;</span></span>
 <span id="L239"><span class="lineNum">     239</span>                 :             :       }</span>
 <span id="L240"><span class="lineNum">     240</span>                 :             :     }</span>
 <span id="L241"><span class="lineNum">     241</span>                 :             : </span>
-<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">          10 :     if (totalRewards == 0) {</span></span>
-<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">           2 :       return 0;</span></span>
+<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">        2522 :     if (totalRewards == 0) {</span></span>
+<span id="L243"><span class="lineNum">     243</span>                 :<span class="tlaGNC">         623 :       return 0;</span></span>
 <span id="L244"><span class="lineNum">     244</span>                 :             :     }</span>
 <span id="L245"><span class="lineNum">     245</span>                 :             : </span>
-<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">           8 :     _transferRewards(to, reward, totalRewards);</span></span>
-<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">           8 :     emit RewardsClaimed(user, reward, to, claimer, totalRewards);</span></span>
+<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">        1899 :     _transferRewards(to, reward, totalRewards);</span></span>
+<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">        1899 :     emit RewardsClaimed(user, reward, to, claimer, totalRewards);</span></span>
 <span id="L248"><span class="lineNum">     248</span>                 :             : </span>
-<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">           8 :     return totalRewards;</span></span>
+<span id="L249"><span class="lineNum">     249</span>                 :<span class="tlaGNC">        1899 :     return totalRewards;</span></span>
 <span id="L250"><span class="lineNum">     250</span>                 :             :   }</span>
 <span id="L251"><span class="lineNum">     251</span>                 :             : </span>
 <span id="L252"><span class="lineNum">     252</span>                 :             :   /**</span>
@@ -330,36 +330,36 @@
 <span id="L259"><span class="lineNum">     259</span>                 :             :    *   rewardsList List of reward addresses</span>
 <span id="L260"><span class="lineNum">     260</span>                 :             :    *   claimedAmount List of claimed amounts, follows &quot;rewardsList&quot; items order</span>
 <span id="L261"><span class="lineNum">     261</span>                 :             :    **/</span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">           3 :   function _claimAllRewards(</span></span>
+<span id="L262"><span class="lineNum">     262</span>                 :             :   function _claimAllRewards(</span>
 <span id="L263"><span class="lineNum">     263</span>                 :             :     address[] calldata assets,</span>
 <span id="L264"><span class="lineNum">     264</span>                 :             :     address claimer,</span>
 <span id="L265"><span class="lineNum">     265</span>                 :             :     address user,</span>
 <span id="L266"><span class="lineNum">     266</span>                 :             :     address to</span>
 <span id="L267"><span class="lineNum">     267</span>                 :             :   ) internal returns (address[] memory rewardsList, uint256[] memory claimedAmounts) {</span>
-<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">           6 :     uint256 rewardsListLength = _rewardsList.length;</span></span>
-<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">           6 :     rewardsList = new address[](rewardsListLength);</span></span>
-<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">           6 :     claimedAmounts = new uint256[](rewardsListLength);</span></span>
+<span id="L268"><span class="lineNum">     268</span>                 :<span class="tlaGNC">           3 :     uint256 rewardsListLength = _rewardsList.length;</span></span>
+<span id="L269"><span class="lineNum">     269</span>                 :<span class="tlaGNC">           3 :     rewardsList = new address[](rewardsListLength);</span></span>
+<span id="L270"><span class="lineNum">     270</span>                 :<span class="tlaGNC">           3 :     claimedAmounts = new uint256[](rewardsListLength);</span></span>
 <span id="L271"><span class="lineNum">     271</span>                 :             : </span>
-<span id="L272"><span class="lineNum">     272</span>                 :<span class="tlaGNC">           6 :     _updateDataMultiple(user, _getUserAssetBalances(assets, user));</span></span>
+<span id="L272"><span class="lineNum">     272</span>                 :<span class="tlaGNC">           3 :     _updateDataMultiple(user, _getUserAssetBalances(assets, user));</span></span>
 <span id="L273"><span class="lineNum">     273</span>                 :             : </span>
-<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">          15 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
-<span id="L275"><span class="lineNum">     275</span>                 :<span class="tlaGNC">           6 :       address asset = assets[i];</span></span>
-<span id="L276"><span class="lineNum">     276</span>                 :<span class="tlaGNC">          15 :       for (uint256 j = 0; j &lt; rewardsListLength; j++) {</span></span>
-<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">           9 :         if (rewardsList[j] == address(0)) {</span></span>
-<span id="L278"><span class="lineNum">     278</span>                 :<span class="tlaGNC">           6 :           rewardsList[j] = _rewardsList[j];</span></span>
+<span id="L274"><span class="lineNum">     274</span>                 :<span class="tlaGNC">           3 :     for (uint256 i = 0; i &lt; assets.length; i++) {</span></span>
+<span id="L275"><span class="lineNum">     275</span>                 :<span class="tlaGNC">           3 :       address asset = assets[i];</span></span>
+<span id="L276"><span class="lineNum">     276</span>                 :<span class="tlaGNC">           3 :       for (uint256 j = 0; j &lt; rewardsListLength; j++) {</span></span>
+<span id="L277"><span class="lineNum">     277</span>                 :<span class="tlaGNC">           3 :         if (rewardsList[j] == address(0)) {</span></span>
+<span id="L278"><span class="lineNum">     278</span>                 :<span class="tlaGNC">           3 :           rewardsList[j] = _rewardsList[j];</span></span>
 <span id="L279"><span class="lineNum">     279</span>                 :             :         }</span>
-<span id="L280"><span class="lineNum">     280</span>                 :<span class="tlaGNC">           6 :         uint256 rewardAmount = _assets[asset].rewards[rewardsList[j]].usersData[user].accrued;</span></span>
-<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">           6 :         if (rewardAmount != 0) {</span></span>
-<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">           6 :           claimedAmounts[j] += rewardAmount;</span></span>
-<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">           6 :           _assets[asset].rewards[rewardsList[j]].usersData[user].accrued = 0;</span></span>
+<span id="L280"><span class="lineNum">     280</span>                 :<span class="tlaGNC">           3 :         uint256 rewardAmount = _assets[asset].rewards[rewardsList[j]].usersData[user].accrued;</span></span>
+<span id="L281"><span class="lineNum">     281</span>                 :<span class="tlaGNC">           3 :         if (rewardAmount != 0) {</span></span>
+<span id="L282"><span class="lineNum">     282</span>                 :<span class="tlaGNC">           3 :           claimedAmounts[j] += rewardAmount;</span></span>
+<span id="L283"><span class="lineNum">     283</span>                 :<span class="tlaGNC">           3 :           _assets[asset].rewards[rewardsList[j]].usersData[user].accrued = 0;</span></span>
 <span id="L284"><span class="lineNum">     284</span>                 :             :         }</span>
 <span id="L285"><span class="lineNum">     285</span>                 :             :       }</span>
 <span id="L286"><span class="lineNum">     286</span>                 :             :     }</span>
-<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">          15 :     for (uint256 i = 0; i &lt; rewardsListLength; i++) {</span></span>
-<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">           6 :       _transferRewards(to, rewardsList[i], claimedAmounts[i]);</span></span>
-<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">           6 :       emit RewardsClaimed(user, rewardsList[i], to, claimer, claimedAmounts[i]);</span></span>
+<span id="L287"><span class="lineNum">     287</span>                 :<span class="tlaGNC">           3 :     for (uint256 i = 0; i &lt; rewardsListLength; i++) {</span></span>
+<span id="L288"><span class="lineNum">     288</span>                 :<span class="tlaGNC">           3 :       _transferRewards(to, rewardsList[i], claimedAmounts[i]);</span></span>
+<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">           3 :       emit RewardsClaimed(user, rewardsList[i], to, claimer, claimedAmounts[i]);</span></span>
 <span id="L290"><span class="lineNum">     290</span>                 :             :     }</span>
-<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">           6 :     return (rewardsList, claimedAmounts);</span></span>
+<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">           3 :     return (rewardsList, claimedAmounts);</span></span>
 <span id="L292"><span class="lineNum">     292</span>                 :             :   }</span>
 <span id="L293"><span class="lineNum">     293</span>                 :             : </span>
 <span id="L294"><span class="lineNum">     294</span>                 :             :   /**</span>
@@ -368,12 +368,12 @@
 <span id="L297"><span class="lineNum">     297</span>                 :             :    * @param reward Address of the reward token</span>
 <span id="L298"><span class="lineNum">     298</span>                 :             :    * @param amount Amount of rewards to transfer</span>
 <span id="L299"><span class="lineNum">     299</span>                 :             :    */</span>
-<span id="L300"><span class="lineNum">     300</span>                 :<span class="tlaGNC">           7 :   function _transferRewards(address to, address reward, uint256 amount) internal {</span></span>
-<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">          14 :     ITransferStrategyBase transferStrategy = _transferStrategy[reward];</span></span>
+<span id="L300"><span class="lineNum">     300</span>                 :             :   function _transferRewards(address to, address reward, uint256 amount) internal {</span>
+<span id="L301"><span class="lineNum">     301</span>                 :<span class="tlaGNC">        1902 :     ITransferStrategyBase transferStrategy = _transferStrategy[reward];</span></span>
 <span id="L302"><span class="lineNum">     302</span>                 :             : </span>
-<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">          21 :     bool success = transferStrategy.performTransfer(to, reward, amount);</span></span>
+<span id="L303"><span class="lineNum">     303</span>                 :<span class="tlaGNC">        1902 :     bool success = transferStrategy.performTransfer(to, reward, amount);</span></span>
 <span id="L304"><span class="lineNum">     304</span>                 :             : </span>
-<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">          14 :     require(success == true, 'TRANSFER_ERROR');</span></span>
+<span id="L305"><span class="lineNum">     305</span>                 :<span class="tlaGNC">        1902 :     require(success == true, 'TRANSFER_ERROR');</span></span>
 <span id="L306"><span class="lineNum">     306</span>                 :             :   }</span>
 <span id="L307"><span class="lineNum">     307</span>                 :             : </span>
 <span id="L308"><span class="lineNum">     308</span>                 :             :   /**</span>
@@ -381,17 +381,17 @@
 <span id="L310"><span class="lineNum">     310</span>                 :             :    * @param account The address of the account</span>
 <span id="L311"><span class="lineNum">     311</span>                 :             :    * @return bool, true if contract, false otherwise</span>
 <span id="L312"><span class="lineNum">     312</span>                 :             :    */</span>
-<span id="L313"><span class="lineNum">     313</span>                 :<span class="tlaGNC">          22 :   function _isContract(address account) internal view returns (bool) {</span></span>
+<span id="L313"><span class="lineNum">     313</span>                 :             :   function _isContract(address account) internal view returns (bool) {</span>
 <span id="L314"><span class="lineNum">     314</span>                 :             :     // This method relies on extcodesize, which returns 0 for contracts in</span>
 <span id="L315"><span class="lineNum">     315</span>                 :             :     // construction, since the code is only stored at the end of the</span>
 <span id="L316"><span class="lineNum">     316</span>                 :             :     // constructor execution.</span>
 <span id="L317"><span class="lineNum">     317</span>                 :             : </span>
-<span id="L318"><span class="lineNum">     318</span>                 :<span class="tlaGNC">          44 :     uint256 size;</span></span>
+<span id="L318"><span class="lineNum">     318</span>                 :<span class="tlaGNC">        9025 :     uint256 size;</span></span>
 <span id="L319"><span class="lineNum">     319</span>                 :             :     // solhint-disable-next-line no-inline-assembly</span>
 <span id="L320"><span class="lineNum">     320</span>                 :             :     assembly {</span>
-<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">          44 :       size := extcodesize(account)</span></span>
+<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">        9025 :       size := extcodesize(account)</span></span>
 <span id="L322"><span class="lineNum">     322</span>                 :             :     }</span>
-<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">          66 :     return size &gt; 0;</span></span>
+<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">        9025 :     return size &gt; 0;</span></span>
 <span id="L324"><span class="lineNum">     324</span>                 :             :   }</span>
 <span id="L325"><span class="lineNum">     325</span>                 :             : </span>
 <span id="L326"><span class="lineNum">     326</span>                 :             :   /**</span>
@@ -399,16 +399,16 @@
 <span id="L328"><span class="lineNum">     328</span>                 :             :    * @param reward The address of the reward token</span>
 <span id="L329"><span class="lineNum">     329</span>                 :             :    * @param transferStrategy The address of the reward TransferStrategy</span>
 <span id="L330"><span class="lineNum">     330</span>                 :             :    */</span>
-<span id="L331"><span class="lineNum">     331</span>                 :<span class="tlaGNC">          22 :   function _installTransferStrategy(</span></span>
+<span id="L331"><span class="lineNum">     331</span>                 :             :   function _installTransferStrategy(</span>
 <span id="L332"><span class="lineNum">     332</span>                 :             :     address reward,</span>
 <span id="L333"><span class="lineNum">     333</span>                 :             :     ITransferStrategyBase transferStrategy</span>
 <span id="L334"><span class="lineNum">     334</span>                 :             :   ) internal {</span>
-<span id="L335"><span class="lineNum">     335</span>                 :<span class="tlaGNC">          44 :     require(address(transferStrategy) != address(0), 'STRATEGY_CAN_NOT_BE_ZERO');</span></span>
-<span id="L336"><span class="lineNum">     336</span>                 :<span class="tlaGNC">          44 :     require(_isContract(address(transferStrategy)) == true, 'STRATEGY_MUST_BE_CONTRACT');</span></span>
+<span id="L335"><span class="lineNum">     335</span>                 :<span class="tlaGNC">        9025 :     require(address(transferStrategy) != address(0), 'STRATEGY_CAN_NOT_BE_ZERO');</span></span>
+<span id="L336"><span class="lineNum">     336</span>                 :<span class="tlaGNC">        9025 :     require(_isContract(address(transferStrategy)) == true, 'STRATEGY_MUST_BE_CONTRACT');</span></span>
 <span id="L337"><span class="lineNum">     337</span>                 :             : </span>
-<span id="L338"><span class="lineNum">     338</span>                 :<span class="tlaGNC">          44 :     _transferStrategy[reward] = transferStrategy;</span></span>
+<span id="L338"><span class="lineNum">     338</span>                 :<span class="tlaGNC">        9025 :     _transferStrategy[reward] = transferStrategy;</span></span>
 <span id="L339"><span class="lineNum">     339</span>                 :             : </span>
-<span id="L340"><span class="lineNum">     340</span>                 :<span class="tlaGNC">          44 :     emit TransferStrategyInstalled(reward, address(transferStrategy));</span></span>
+<span id="L340"><span class="lineNum">     340</span>                 :<span class="tlaGNC">        9025 :     emit TransferStrategyInstalled(reward, address(transferStrategy));</span></span>
 <span id="L341"><span class="lineNum">     341</span>                 :             :   }</span>
 <span id="L342"><span class="lineNum">     342</span>                 :             : </span>
 <span id="L343"><span class="lineNum">     343</span>                 :             :   /**</span>
@@ -418,10 +418,10 @@
 <span id="L347"><span class="lineNum">     347</span>                 :             :    * @param rewardOracle The address of the price oracle</span>
 <span id="L348"><span class="lineNum">     348</span>                 :             :    */</span>
 <span id="L349"><span class="lineNum">     349</span>                 :             : </span>
-<span id="L350"><span class="lineNum">     350</span>                 :<span class="tlaGNC">          22 :   function _setRewardOracle(address reward, IEACAggregatorProxy rewardOracle) internal {</span></span>
-<span id="L351"><span class="lineNum">     351</span>                 :<span class="tlaGNC">          44 :     require(rewardOracle.latestAnswer() &gt; 0, 'ORACLE_MUST_RETURN_PRICE');</span></span>
-<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">          44 :     _rewardOracle[reward] = rewardOracle;</span></span>
-<span id="L353"><span class="lineNum">     353</span>                 :<span class="tlaGNC">          44 :     emit RewardOracleUpdated(reward, address(rewardOracle));</span></span>
+<span id="L350"><span class="lineNum">     350</span>                 :             :   function _setRewardOracle(address reward, IEACAggregatorProxy rewardOracle) internal {</span>
+<span id="L351"><span class="lineNum">     351</span>                 :<span class="tlaGNC">        9025 :     require(rewardOracle.latestAnswer() &gt; 0, 'ORACLE_MUST_RETURN_PRICE');</span></span>
+<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">        9025 :     _rewardOracle[reward] = rewardOracle;</span></span>
+<span id="L353"><span class="lineNum">     353</span>                 :<span class="tlaGNC">        9025 :     emit RewardOracleUpdated(reward, address(rewardOracle));</span></span>
 <span id="L354"><span class="lineNum">     354</span>                 :             :   }</span>
 <span id="L355"><span class="lineNum">     355</span>                 :             : }</span>
         </pre>
@@ -431,8 +431,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func-c.html b/report/rewards/RewardsDistributor.sol.func-c.html
similarity index 73%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func-c.html
rename to report/rewards/RewardsDistributor.sol.func-c.html
index db9103f1..fb18b19d 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func-c.html
+++ b/report/rewards/RewardsDistributor.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsDistributor.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (<a href="RewardsDistributor.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (<a href="RewardsDistributor.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.2&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
             <td class="headerCovTableEntry">119</td>
-            <td class="headerCovTableEntry">118</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntryHi">95.8&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,33 +53,33 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="RewardsDistributor.sol.func.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="RewardsDistributor.sol.func.html"><img src="../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L125">RewardsDistributor.getAllUserRewards</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L38">RewardsDistributor.</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L56">RewardsDistributor.getAssetIndex</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L125">RewardsDistributor.getAllUserRewards</a></td>
               
               <td class="coverFnHi">1</td>
               
@@ -112,6 +112,13 @@
               <td class="coverFnHi">2</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L33">RewardsDistributor.onlyEmissionManager</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L160">RewardsDistributor.setDistributionEnd</a></td>
@@ -128,100 +135,107 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L532">RewardsDistributor.getEmissionManager</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L43">RewardsDistributor.getRewardsData</a></td>
               
               <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L43">RewardsDistributor.getRewardsData</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L532">RewardsDistributor.getEmissionManager</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L387">RewardsDistributor._updateDataMultiple</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L89">RewardsDistributor.getRewardsList</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">30</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L437">RewardsDistributor._getPendingRewards</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">1009</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L408">RewardsDistributor._getUserReward</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L116">RewardsDistributor.getUserRewards</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L465">RewardsDistributor._getRewards</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L387">RewardsDistributor._updateDataMultiple</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">2525</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L312">RewardsDistributor._updateUserData</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">2533</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L465">RewardsDistributor._getRewards</a></td>
+              
+              <td class="coverFnHi">2912</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L220">RewardsDistributor._configureAssets</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L78">RewardsDistributor.getRewardsByAsset</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">9118</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L89">RewardsDistributor.getRewardsList</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L282">RewardsDistributor._updateRewardData</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">11558</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L282">RewardsDistributor._updateRewardData</a></td>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L56">RewardsDistributor.getAssetIndex</a></td>
               
-              <td class="coverFnHi">39</td>
+              <td class="coverFnHi">37954</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L485">RewardsDistributor._getAssetIndex</a></td>
               
-              <td class="coverFnHi">49</td>
+              <td class="coverFnHi">50521</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L341">RewardsDistributor._updateData</a></td>
               
-              <td class="coverFnHi">53895</td>
+              <td class="coverFnHi">141340</td>
               
               
             </tr>
@@ -229,8 +243,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func.html b/report/rewards/RewardsDistributor.sol.func.html
similarity index 73%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func.html
rename to report/rewards/RewardsDistributor.sol.func.html
index cf5b1b7f..0cafab95 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.func.html
+++ b/report/rewards/RewardsDistributor.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsDistributor.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (<a href="RewardsDistributor.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (<a href="RewardsDistributor.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.2&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
             <td class="headerCovTableEntry">119</td>
-            <td class="headerCovTableEntry">118</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntryHi">95.8&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,84 +53,91 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="RewardsDistributor.sol.func-c.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="RewardsDistributor.sol.func-c.html"><img src="../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L38">RewardsDistributor.</a></td>
+              
+              <td class="coverFnLo">0</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L220">RewardsDistributor._configureAssets</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">9023</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L485">RewardsDistributor._getAssetIndex</a></td>
               
-              <td class="coverFnHi">49</td>
+              <td class="coverFnHi">50521</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L437">RewardsDistributor._getPendingRewards</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">1009</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L465">RewardsDistributor._getRewards</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">2912</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L408">RewardsDistributor._getUserReward</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L341">RewardsDistributor._updateData</a></td>
               
-              <td class="coverFnHi">53895</td>
+              <td class="coverFnHi">141340</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L387">RewardsDistributor._updateDataMultiple</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">2525</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L282">RewardsDistributor._updateRewardData</a></td>
               
-              <td class="coverFnHi">39</td>
+              <td class="coverFnHi">11558</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L312">RewardsDistributor._updateUserData</a></td>
               
-              <td class="coverFnHi">17</td>
+              <td class="coverFnHi">2533</td>
               
               
             </tr>
@@ -151,7 +158,7 @@
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L56">RewardsDistributor.getAssetIndex</a></td>
               
-              <td class="coverFnHi">1</td>
+              <td class="coverFnHi">37954</td>
               
               
             </tr>
@@ -165,14 +172,14 @@
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L532">RewardsDistributor.getEmissionManager</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L78">RewardsDistributor.getRewardsByAsset</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">9118</td>
               
               
             </tr>
@@ -207,7 +214,14 @@
             <tr>
               <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L116">RewardsDistributor.getUserRewards</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">1011</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="RewardsDistributor.sol.gcov.html#L33">RewardsDistributor.onlyEmissionManager</a></td>
+              
+              <td class="coverFnHi">2</td>
               
               
             </tr>
@@ -229,8 +243,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.gcov.html b/report/rewards/RewardsDistributor.sol.gcov.html
similarity index 84%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.gcov.html
rename to report/rewards/RewardsDistributor.sol.gcov.html
index dcb78dba..af1d21c0 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol.gcov.html
+++ b/report/rewards/RewardsDistributor.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards/RewardsDistributor.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/RewardsDistributor.sol</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/src/periphery/contracts/rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (source / <a href="RewardsDistributor.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards">rewards</a> - RewardsDistributor.sol<span style="font-size: 80%;"> (source / <a href="RewardsDistributor.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.2&nbsp;%</td>
+            <td class="headerCovTableEntryHi">98.3&nbsp;%</td>
+            <td class="headerCovTableEntry">121</td>
             <td class="headerCovTableEntry">119</td>
-            <td class="headerCovTableEntry">118</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">22</td>
-            <td class="headerCovTableEntry">22</td>
+            <td class="headerCovTableEntryHi">95.8&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -72,9 +72,9 @@
 <span id="L1"><span class="lineNum">       1</span>                 :             : // SPDX-License-Identifier: BUSL-1.1</span>
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
-<span id="L4"><span class="lineNum">       4</span>                 :             : import {IScaledBalanceToken} from 'aave-v3-core/contracts/interfaces/IScaledBalanceToken.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {SafeCast} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';</span>
+<span id="L4"><span class="lineNum">       4</span>                 :             : import {IScaledBalanceToken} from '../interfaces/IScaledBalanceToken.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {IERC20Detailed} from '../dependencies/openzeppelin/contracts/IERC20Detailed.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {SafeCast} from '../dependencies/openzeppelin/contracts/SafeCast.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {IRewardsDistributor} from './interfaces/IRewardsDistributor.sol';</span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : import {RewardsDataTypes} from './libraries/RewardsDataTypes.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : </span>
@@ -104,20 +104,20 @@
 <span id="L33"><span class="lineNum">      33</span>                 :             :   address[] internal _assetsList;</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             : </span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :   modifier onlyEmissionManager() {</span>
-<span id="L36"><span class="lineNum">      36</span>                 :             :     require(msg.sender == EMISSION_MANAGER, 'ONLY_EMISSION_MANAGER');</span>
+<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC tlaBgGNC">           2 :     require(msg.sender == EMISSION_MANAGER, 'ONLY_EMISSION_MANAGER');</span></span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :     _;</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :   }</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             : </span>
 <span id="L40"><span class="lineNum">      40</span>                 :             :   constructor(address emissionManager) {</span>
-<span id="L41"><span class="lineNum">      41</span>                 :             :     EMISSION_MANAGER = emissionManager;</span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     EMISSION_MANAGER = emissionManager;</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC tlaBgGNC">           3 :   function getRewardsData(</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function getRewardsData(</span>
 <span id="L46"><span class="lineNum">      46</span>                 :             :     address asset,</span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :     address reward</span>
-<span id="L48"><span class="lineNum">      48</span>                 :             :   ) public view override returns (uint256, uint256, uint256, uint256) {</span>
-<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC">           6 :     return (</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :             :   ) external view override returns (uint256, uint256, uint256, uint256) {</span>
+<span id="L49"><span class="lineNum">      49</span>                 :<span class="tlaGNC tlaBgGNC">           3 :     return (</span></span>
 <span id="L50"><span class="lineNum">      50</span>                 :             :       _assets[asset].rewards[reward].index,</span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :       _assets[asset].rewards[reward].emissionPerSecond,</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             :       _assets[asset].rewards[reward].lastUpdateTimestamp,</span>
@@ -126,13 +126,13 @@
 <span id="L55"><span class="lineNum">      55</span>                 :             :   }</span>
 <span id="L56"><span class="lineNum">      56</span>                 :             : </span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L58"><span class="lineNum">      58</span>                 :<span class="tlaGNC">           1 :   function getAssetIndex(</span></span>
+<span id="L58"><span class="lineNum">      58</span>                 :             :   function getAssetIndex(</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :     address asset,</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :     address reward</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   ) external view override returns (uint256, uint256) {</span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           2 :     RewardsDataTypes.RewardData storage rewardData = _assets[asset].rewards[reward];</span></span>
-<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">           2 :     return</span></span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           2 :       _getAssetIndex(</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">       37954 :     RewardsDataTypes.RewardData storage rewardData = _assets[asset].rewards[reward];</span></span>
+<span id="L63"><span class="lineNum">      63</span>                 :<span class="tlaGNC">       37954 :     return</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">       37954 :       _getAssetIndex(</span></span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :         rewardData,</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             :         IScaledBalanceToken(asset).scaledTotalSupply(),</span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :         10 ** _assets[asset].decimals</span>
@@ -140,62 +140,62 @@
 <span id="L69"><span class="lineNum">      69</span>                 :             :   }</span>
 <span id="L70"><span class="lineNum">      70</span>                 :             : </span>
 <span id="L71"><span class="lineNum">      71</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L72"><span class="lineNum">      72</span>                 :<span class="tlaGNC">           1 :   function getDistributionEnd(</span></span>
+<span id="L72"><span class="lineNum">      72</span>                 :             :   function getDistributionEnd(</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             :     address asset,</span>
 <span id="L74"><span class="lineNum">      74</span>                 :             :     address reward</span>
 <span id="L75"><span class="lineNum">      75</span>                 :             :   ) external view override returns (uint256) {</span>
-<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           2 :     return _assets[asset].rewards[reward].distributionEnd;</span></span>
+<span id="L76"><span class="lineNum">      76</span>                 :<span class="tlaGNC">           1 :     return _assets[asset].rewards[reward].distributionEnd;</span></span>
 <span id="L77"><span class="lineNum">      77</span>                 :             :   }</span>
 <span id="L78"><span class="lineNum">      78</span>                 :             : </span>
 <span id="L79"><span class="lineNum">      79</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L80"><span class="lineNum">      80</span>                 :<span class="tlaGNC">          30 :   function getRewardsByAsset(address asset) external view override returns (address[] memory) {</span></span>
-<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">          60 :     uint128 rewardsCount = _assets[asset].availableRewardsCount;</span></span>
-<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">          90 :     address[] memory availableRewards = new address[](rewardsCount);</span></span>
+<span id="L80"><span class="lineNum">      80</span>                 :             :   function getRewardsByAsset(address asset) external view override returns (address[] memory) {</span>
+<span id="L81"><span class="lineNum">      81</span>                 :<span class="tlaGNC">        9118 :     uint128 rewardsCount = _assets[asset].availableRewardsCount;</span></span>
+<span id="L82"><span class="lineNum">      82</span>                 :<span class="tlaGNC">        9118 :     address[] memory availableRewards = new address[](rewardsCount);</span></span>
 <span id="L83"><span class="lineNum">      83</span>                 :             : </span>
-<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">         150 :     for (uint128 i = 0; i &lt; rewardsCount; i++) {</span></span>
-<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">          60 :       availableRewards[i] = _assets[asset].availableRewards[i];</span></span>
+<span id="L84"><span class="lineNum">      84</span>                 :<span class="tlaGNC">        9118 :     for (uint128 i = 0; i &lt; rewardsCount; i++) {</span></span>
+<span id="L85"><span class="lineNum">      85</span>                 :<span class="tlaGNC">        9033 :       availableRewards[i] = _assets[asset].availableRewards[i];</span></span>
 <span id="L86"><span class="lineNum">      86</span>                 :             :     }</span>
-<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">          60 :     return availableRewards;</span></span>
+<span id="L87"><span class="lineNum">      87</span>                 :<span class="tlaGNC">        9118 :     return availableRewards;</span></span>
 <span id="L88"><span class="lineNum">      88</span>                 :             :   }</span>
 <span id="L89"><span class="lineNum">      89</span>                 :             : </span>
 <span id="L90"><span class="lineNum">      90</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L91"><span class="lineNum">      91</span>                 :<span class="tlaGNC">          30 :   function getRewardsList() external view override returns (address[] memory) {</span></span>
-<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">          60 :     return _rewardsList;</span></span>
+<span id="L91"><span class="lineNum">      91</span>                 :             :   function getRewardsList() external view override returns (address[] memory) {</span>
+<span id="L92"><span class="lineNum">      92</span>                 :<span class="tlaGNC">          30 :     return _rewardsList;</span></span>
 <span id="L93"><span class="lineNum">      93</span>                 :             :   }</span>
 <span id="L94"><span class="lineNum">      94</span>                 :             : </span>
 <span id="L95"><span class="lineNum">      95</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L96"><span class="lineNum">      96</span>                 :<span class="tlaGNC">           1 :   function getUserAssetIndex(</span></span>
+<span id="L96"><span class="lineNum">      96</span>                 :             :   function getUserAssetIndex(</span>
 <span id="L97"><span class="lineNum">      97</span>                 :             :     address user,</span>
 <span id="L98"><span class="lineNum">      98</span>                 :             :     address asset,</span>
 <span id="L99"><span class="lineNum">      99</span>                 :             :     address reward</span>
-<span id="L100"><span class="lineNum">     100</span>                 :             :   ) public view override returns (uint256) {</span>
-<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           2 :     return _assets[asset].rewards[reward].usersData[user].index;</span></span>
+<span id="L100"><span class="lineNum">     100</span>                 :             :   ) external view override returns (uint256) {</span>
+<span id="L101"><span class="lineNum">     101</span>                 :<span class="tlaGNC">           1 :     return _assets[asset].rewards[reward].usersData[user].index;</span></span>
 <span id="L102"><span class="lineNum">     102</span>                 :             :   }</span>
 <span id="L103"><span class="lineNum">     103</span>                 :             : </span>
 <span id="L104"><span class="lineNum">     104</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L105"><span class="lineNum">     105</span>                 :<span class="tlaGNC">           1 :   function getUserAccruedRewards(</span></span>
+<span id="L105"><span class="lineNum">     105</span>                 :             :   function getUserAccruedRewards(</span>
 <span id="L106"><span class="lineNum">     106</span>                 :             :     address user,</span>
 <span id="L107"><span class="lineNum">     107</span>                 :             :     address reward</span>
 <span id="L108"><span class="lineNum">     108</span>                 :             :   ) external view override returns (uint256) {</span>
-<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           2 :     uint256 totalAccrued;</span></span>
-<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           5 :     for (uint256 i = 0; i &lt; _assetsList.length; i++) {</span></span>
-<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           2 :       totalAccrued += _assets[_assetsList[i]].rewards[reward].usersData[user].accrued;</span></span>
+<span id="L109"><span class="lineNum">     109</span>                 :<span class="tlaGNC">           1 :     uint256 totalAccrued;</span></span>
+<span id="L110"><span class="lineNum">     110</span>                 :<span class="tlaGNC">           1 :     for (uint256 i = 0; i &lt; _assetsList.length; i++) {</span></span>
+<span id="L111"><span class="lineNum">     111</span>                 :<span class="tlaGNC">           1 :       totalAccrued += _assets[_assetsList[i]].rewards[reward].usersData[user].accrued;</span></span>
 <span id="L112"><span class="lineNum">     112</span>                 :             :     }</span>
 <span id="L113"><span class="lineNum">     113</span>                 :             : </span>
-<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">           2 :     return totalAccrued;</span></span>
+<span id="L114"><span class="lineNum">     114</span>                 :<span class="tlaGNC">           1 :     return totalAccrued;</span></span>
 <span id="L115"><span class="lineNum">     115</span>                 :             :   }</span>
 <span id="L116"><span class="lineNum">     116</span>                 :             : </span>
 <span id="L117"><span class="lineNum">     117</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L118"><span class="lineNum">     118</span>                 :<span class="tlaGNC">          10 :   function getUserRewards(</span></span>
+<span id="L118"><span class="lineNum">     118</span>                 :             :   function getUserRewards(</span>
 <span id="L119"><span class="lineNum">     119</span>                 :             :     address[] calldata assets,</span>
 <span id="L120"><span class="lineNum">     120</span>                 :             :     address user,</span>
 <span id="L121"><span class="lineNum">     121</span>                 :             :     address reward</span>
 <span id="L122"><span class="lineNum">     122</span>                 :             :   ) external view override returns (uint256) {</span>
-<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">          30 :     return _getUserReward(user, reward, _getUserAssetBalances(assets, user));</span></span>
+<span id="L123"><span class="lineNum">     123</span>                 :<span class="tlaGNC">        1011 :     return _getUserReward(user, reward, _getUserAssetBalances(assets, user));</span></span>
 <span id="L124"><span class="lineNum">     124</span>                 :             :   }</span>
 <span id="L125"><span class="lineNum">     125</span>                 :             : </span>
 <span id="L126"><span class="lineNum">     126</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L127"><span class="lineNum">     127</span>                 :<span class="tlaGNC">           1 :   function getAllUserRewards(</span></span>
+<span id="L127"><span class="lineNum">     127</span>                 :             :   function getAllUserRewards(</span>
 <span id="L128"><span class="lineNum">     128</span>                 :             :     address[] calldata assets,</span>
 <span id="L129"><span class="lineNum">     129</span>                 :             :     address user</span>
 <span id="L130"><span class="lineNum">     130</span>                 :             :   )</span>
@@ -204,41 +204,41 @@
 <span id="L133"><span class="lineNum">     133</span>                 :             :     override</span>
 <span id="L134"><span class="lineNum">     134</span>                 :             :     returns (address[] memory rewardsList, uint256[] memory unclaimedAmounts)</span>
 <span id="L135"><span class="lineNum">     135</span>                 :             :   {</span>
-<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           3 :     RewardsDataTypes.UserAssetBalance[] memory userAssetBalances = _getUserAssetBalances(</span></span>
+<span id="L136"><span class="lineNum">     136</span>                 :<span class="tlaGNC">           1 :     RewardsDataTypes.UserAssetBalance[] memory userAssetBalances = _getUserAssetBalances(</span></span>
 <span id="L137"><span class="lineNum">     137</span>                 :             :       assets,</span>
 <span id="L138"><span class="lineNum">     138</span>                 :             :       user</span>
 <span id="L139"><span class="lineNum">     139</span>                 :             :     );</span>
-<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           2 :     rewardsList = new address[](_rewardsList.length);</span></span>
-<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           2 :     unclaimedAmounts = new uint256[](rewardsList.length);</span></span>
+<span id="L140"><span class="lineNum">     140</span>                 :<span class="tlaGNC">           1 :     rewardsList = new address[](_rewardsList.length);</span></span>
+<span id="L141"><span class="lineNum">     141</span>                 :<span class="tlaGNC">           1 :     unclaimedAmounts = new uint256[](rewardsList.length);</span></span>
 <span id="L142"><span class="lineNum">     142</span>                 :             : </span>
 <span id="L143"><span class="lineNum">     143</span>                 :             :     // Add unrealized rewards from user to unclaimedRewards</span>
-<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">           5 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
-<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           5 :       for (uint256 r = 0; r &lt; rewardsList.length; r++) {</span></span>
-<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">           2 :         rewardsList[r] = _rewardsList[r];</span></span>
-<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           2 :         unclaimedAmounts[r] += _assets[userAssetBalances[i].asset]</span></span>
+<span id="L144"><span class="lineNum">     144</span>                 :<span class="tlaGNC">           1 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
+<span id="L145"><span class="lineNum">     145</span>                 :<span class="tlaGNC">           1 :       for (uint256 r = 0; r &lt; rewardsList.length; r++) {</span></span>
+<span id="L146"><span class="lineNum">     146</span>                 :<span class="tlaGNC">           1 :         rewardsList[r] = _rewardsList[r];</span></span>
+<span id="L147"><span class="lineNum">     147</span>                 :<span class="tlaGNC">           1 :         unclaimedAmounts[r] += _assets[userAssetBalances[i].asset]</span></span>
 <span id="L148"><span class="lineNum">     148</span>                 :             :           .rewards[rewardsList[r]]</span>
 <span id="L149"><span class="lineNum">     149</span>                 :             :           .usersData[user]</span>
 <span id="L150"><span class="lineNum">     150</span>                 :             :           .accrued;</span>
 <span id="L151"><span class="lineNum">     151</span>                 :             : </span>
-<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           2 :         if (userAssetBalances[i].userBalance == 0) {</span></span>
-<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">           2 :           continue;</span></span>
+<span id="L152"><span class="lineNum">     152</span>                 :<span class="tlaGNC">           1 :         if (userAssetBalances[i].userBalance == 0) {</span></span>
+<span id="L153"><span class="lineNum">     153</span>                 :<span class="tlaGNC">           1 :           continue;</span></span>
 <span id="L154"><span class="lineNum">     154</span>                 :             :         }</span>
-<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">           2 :         unclaimedAmounts[r] += _getPendingRewards(user, rewardsList[r], userAssetBalances[i]);</span></span>
+<span id="L155"><span class="lineNum">     155</span>                 :<span class="tlaGNC">           1 :         unclaimedAmounts[r] += _getPendingRewards(user, rewardsList[r], userAssetBalances[i]);</span></span>
 <span id="L156"><span class="lineNum">     156</span>                 :             :       }</span>
 <span id="L157"><span class="lineNum">     157</span>                 :             :     }</span>
-<span id="L158"><span class="lineNum">     158</span>                 :<span class="tlaGNC">           2 :     return (rewardsList, unclaimedAmounts);</span></span>
+<span id="L158"><span class="lineNum">     158</span>                 :<span class="tlaGNC">           1 :     return (rewardsList, unclaimedAmounts);</span></span>
 <span id="L159"><span class="lineNum">     159</span>                 :             :   }</span>
 <span id="L160"><span class="lineNum">     160</span>                 :             : </span>
 <span id="L161"><span class="lineNum">     161</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L162"><span class="lineNum">     162</span>                 :<span class="tlaGNC">           2 :   function setDistributionEnd(</span></span>
+<span id="L162"><span class="lineNum">     162</span>                 :             :   function setDistributionEnd(</span>
 <span id="L163"><span class="lineNum">     163</span>                 :             :     address asset,</span>
 <span id="L164"><span class="lineNum">     164</span>                 :             :     address reward,</span>
 <span id="L165"><span class="lineNum">     165</span>                 :             :     uint32 newDistributionEnd</span>
 <span id="L166"><span class="lineNum">     166</span>                 :             :   ) external override onlyEmissionManager {</span>
-<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           4 :     uint256 oldDistributionEnd = _assets[asset].rewards[reward].distributionEnd;</span></span>
-<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           4 :     _assets[asset].rewards[reward].distributionEnd = newDistributionEnd;</span></span>
+<span id="L167"><span class="lineNum">     167</span>                 :<span class="tlaGNC">           2 :     uint256 oldDistributionEnd = _assets[asset].rewards[reward].distributionEnd;</span></span>
+<span id="L168"><span class="lineNum">     168</span>                 :<span class="tlaGNC">           2 :     _assets[asset].rewards[reward].distributionEnd = newDistributionEnd;</span></span>
 <span id="L169"><span class="lineNum">     169</span>                 :             : </span>
-<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           4 :     emit AssetConfigUpdated(</span></span>
+<span id="L170"><span class="lineNum">     170</span>                 :<span class="tlaGNC">           2 :     emit AssetConfigUpdated(</span></span>
 <span id="L171"><span class="lineNum">     171</span>                 :             :       asset,</span>
 <span id="L172"><span class="lineNum">     172</span>                 :             :       reward,</span>
 <span id="L173"><span class="lineNum">     173</span>                 :             :       _assets[asset].rewards[reward].emissionPerSecond,</span>
@@ -250,31 +250,31 @@
 <span id="L179"><span class="lineNum">     179</span>                 :             :   }</span>
 <span id="L180"><span class="lineNum">     180</span>                 :             : </span>
 <span id="L181"><span class="lineNum">     181</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L182"><span class="lineNum">     182</span>                 :<span class="tlaGNC">           2 :   function setEmissionPerSecond(</span></span>
+<span id="L182"><span class="lineNum">     182</span>                 :             :   function setEmissionPerSecond(</span>
 <span id="L183"><span class="lineNum">     183</span>                 :             :     address asset,</span>
 <span id="L184"><span class="lineNum">     184</span>                 :             :     address[] calldata rewards,</span>
 <span id="L185"><span class="lineNum">     185</span>                 :             :     uint88[] calldata newEmissionsPerSecond</span>
 <span id="L186"><span class="lineNum">     186</span>                 :             :   ) external override onlyEmissionManager {</span>
-<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           4 :     require(rewards.length == newEmissionsPerSecond.length, 'INVALID_INPUT');</span></span>
-<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">          10 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
-<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">           4 :       RewardsDataTypes.AssetData storage assetConfig = _assets[asset];</span></span>
-<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">           4 :       RewardsDataTypes.RewardData storage rewardConfig = _assets[asset].rewards[rewards[i]];</span></span>
-<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">           4 :       uint256 decimals = assetConfig.decimals;</span></span>
-<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">           4 :       require(</span></span>
+<span id="L187"><span class="lineNum">     187</span>                 :<span class="tlaGNC">           2 :     require(rewards.length == newEmissionsPerSecond.length, 'INVALID_INPUT');</span></span>
+<span id="L188"><span class="lineNum">     188</span>                 :<span class="tlaGNC">           2 :     for (uint256 i = 0; i &lt; rewards.length; i++) {</span></span>
+<span id="L189"><span class="lineNum">     189</span>                 :<span class="tlaGNC">           2 :       RewardsDataTypes.AssetData storage assetConfig = _assets[asset];</span></span>
+<span id="L190"><span class="lineNum">     190</span>                 :<span class="tlaGNC">           2 :       RewardsDataTypes.RewardData storage rewardConfig = _assets[asset].rewards[rewards[i]];</span></span>
+<span id="L191"><span class="lineNum">     191</span>                 :<span class="tlaGNC">           2 :       uint256 decimals = assetConfig.decimals;</span></span>
+<span id="L192"><span class="lineNum">     192</span>                 :<span class="tlaGNC">           2 :       require(</span></span>
 <span id="L193"><span class="lineNum">     193</span>                 :             :         decimals != 0 &amp;&amp; rewardConfig.lastUpdateTimestamp != 0,</span>
 <span id="L194"><span class="lineNum">     194</span>                 :             :         'DISTRIBUTION_DOES_NOT_EXIST'</span>
 <span id="L195"><span class="lineNum">     195</span>                 :             :       );</span>
 <span id="L196"><span class="lineNum">     196</span>                 :             : </span>
-<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">           6 :       (uint256 newIndex, ) = _updateRewardData(</span></span>
+<span id="L197"><span class="lineNum">     197</span>                 :<span class="tlaGNC">           2 :       (uint256 newIndex, ) = _updateRewardData(</span></span>
 <span id="L198"><span class="lineNum">     198</span>                 :             :         rewardConfig,</span>
 <span id="L199"><span class="lineNum">     199</span>                 :             :         IScaledBalanceToken(asset).scaledTotalSupply(),</span>
 <span id="L200"><span class="lineNum">     200</span>                 :             :         10 ** decimals</span>
 <span id="L201"><span class="lineNum">     201</span>                 :             :       );</span>
 <span id="L202"><span class="lineNum">     202</span>                 :             : </span>
-<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">           4 :       uint256 oldEmissionPerSecond = rewardConfig.emissionPerSecond;</span></span>
-<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">           4 :       rewardConfig.emissionPerSecond = newEmissionsPerSecond[i];</span></span>
+<span id="L203"><span class="lineNum">     203</span>                 :<span class="tlaGNC">           2 :       uint256 oldEmissionPerSecond = rewardConfig.emissionPerSecond;</span></span>
+<span id="L204"><span class="lineNum">     204</span>                 :<span class="tlaGNC">           2 :       rewardConfig.emissionPerSecond = newEmissionsPerSecond[i];</span></span>
 <span id="L205"><span class="lineNum">     205</span>                 :             : </span>
-<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           4 :       emit AssetConfigUpdated(</span></span>
+<span id="L206"><span class="lineNum">     206</span>                 :<span class="tlaGNC">           2 :       emit AssetConfigUpdated(</span></span>
 <span id="L207"><span class="lineNum">     207</span>                 :             :         asset,</span>
 <span id="L208"><span class="lineNum">     208</span>                 :             :         rewards[i],</span>
 <span id="L209"><span class="lineNum">     209</span>                 :             :         oldEmissionPerSecond,</span>
@@ -290,49 +290,49 @@
 <span id="L219"><span class="lineNum">     219</span>                 :             :    * @dev Configure the _assets for a specific emission</span>
 <span id="L220"><span class="lineNum">     220</span>                 :             :    * @param rewardsInput The array of each asset configuration</span>
 <span id="L221"><span class="lineNum">     221</span>                 :             :    **/</span>
-<span id="L222"><span class="lineNum">     222</span>                 :<span class="tlaGNC">          20 :   function _configureAssets(RewardsDataTypes.RewardsConfigInput[] memory rewardsInput) internal {</span></span>
-<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">         100 :     for (uint256 i = 0; i &lt; rewardsInput.length; i++) {</span></span>
-<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">          40 :       if (_assets[rewardsInput[i].asset].decimals == 0) {</span></span>
+<span id="L222"><span class="lineNum">     222</span>                 :             :   function _configureAssets(RewardsDataTypes.RewardsConfigInput[] memory rewardsInput) internal {</span>
+<span id="L223"><span class="lineNum">     223</span>                 :<span class="tlaGNC">        9023 :     for (uint256 i = 0; i &lt; rewardsInput.length; i++) {</span></span>
+<span id="L224"><span class="lineNum">     224</span>                 :<span class="tlaGNC">        9023 :       if (_assets[rewardsInput[i].asset].decimals == 0) {</span></span>
 <span id="L225"><span class="lineNum">     225</span>                 :             :         //never initialized before, adding to the list of assets</span>
-<span id="L226"><span class="lineNum">     226</span>                 :<span class="tlaGNC">          40 :         _assetsList.push(rewardsInput[i].asset);</span></span>
+<span id="L226"><span class="lineNum">     226</span>                 :<span class="tlaGNC">        9023 :         _assetsList.push(rewardsInput[i].asset);</span></span>
 <span id="L227"><span class="lineNum">     227</span>                 :             :       }</span>
 <span id="L228"><span class="lineNum">     228</span>                 :             : </span>
-<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">          60 :       uint256 decimals = _assets[rewardsInput[i].asset].decimals = IERC20Detailed(</span></span>
+<span id="L229"><span class="lineNum">     229</span>                 :<span class="tlaGNC">        9023 :       uint256 decimals = _assets[rewardsInput[i].asset].decimals = IERC20Detailed(</span></span>
 <span id="L230"><span class="lineNum">     230</span>                 :             :         rewardsInput[i].asset</span>
 <span id="L231"><span class="lineNum">     231</span>                 :             :       ).decimals();</span>
 <span id="L232"><span class="lineNum">     232</span>                 :             : </span>
-<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">          40 :       RewardsDataTypes.RewardData storage rewardConfig = _assets[rewardsInput[i].asset].rewards[</span></span>
+<span id="L233"><span class="lineNum">     233</span>                 :<span class="tlaGNC">        9023 :       RewardsDataTypes.RewardData storage rewardConfig = _assets[rewardsInput[i].asset].rewards[</span></span>
 <span id="L234"><span class="lineNum">     234</span>                 :             :         rewardsInput[i].reward</span>
 <span id="L235"><span class="lineNum">     235</span>                 :             :       ];</span>
 <span id="L236"><span class="lineNum">     236</span>                 :             : </span>
 <span id="L237"><span class="lineNum">     237</span>                 :             :       // Add reward address to asset available rewards if latestUpdateTimestamp is zero</span>
-<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">          40 :       if (rewardConfig.lastUpdateTimestamp == 0) {</span></span>
-<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">          40 :         _assets[rewardsInput[i].asset].availableRewards[</span></span>
+<span id="L238"><span class="lineNum">     238</span>                 :<span class="tlaGNC">        9023 :       if (rewardConfig.lastUpdateTimestamp == 0) {</span></span>
+<span id="L239"><span class="lineNum">     239</span>                 :<span class="tlaGNC">        9023 :         _assets[rewardsInput[i].asset].availableRewards[</span></span>
 <span id="L240"><span class="lineNum">     240</span>                 :             :           _assets[rewardsInput[i].asset].availableRewardsCount</span>
 <span id="L241"><span class="lineNum">     241</span>                 :             :         ] = rewardsInput[i].reward;</span>
-<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">          40 :         _assets[rewardsInput[i].asset].availableRewardsCount++;</span></span>
+<span id="L242"><span class="lineNum">     242</span>                 :<span class="tlaGNC">        9023 :         _assets[rewardsInput[i].asset].availableRewardsCount++;</span></span>
 <span id="L243"><span class="lineNum">     243</span>                 :             :       }</span>
 <span id="L244"><span class="lineNum">     244</span>                 :             : </span>
 <span id="L245"><span class="lineNum">     245</span>                 :             :       // Add reward address to global rewards list if still not enabled</span>
-<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">          40 :       if (_isRewardEnabled[rewardsInput[i].reward] == false) {</span></span>
-<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">          40 :         _isRewardEnabled[rewardsInput[i].reward] = true;</span></span>
-<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">          40 :         _rewardsList.push(rewardsInput[i].reward);</span></span>
+<span id="L246"><span class="lineNum">     246</span>                 :<span class="tlaGNC">        9023 :       if (_isRewardEnabled[rewardsInput[i].reward] == false) {</span></span>
+<span id="L247"><span class="lineNum">     247</span>                 :<span class="tlaGNC">        9023 :         _isRewardEnabled[rewardsInput[i].reward] = true;</span></span>
+<span id="L248"><span class="lineNum">     248</span>                 :<span class="tlaGNC">        9023 :         _rewardsList.push(rewardsInput[i].reward);</span></span>
 <span id="L249"><span class="lineNum">     249</span>                 :             :       }</span>
 <span id="L250"><span class="lineNum">     250</span>                 :             : </span>
 <span id="L251"><span class="lineNum">     251</span>                 :             :       // Due emissions is still zero, updates only latestUpdateTimestamp</span>
-<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">          60 :       (uint256 newIndex, ) = _updateRewardData(</span></span>
+<span id="L252"><span class="lineNum">     252</span>                 :<span class="tlaGNC">        9023 :       (uint256 newIndex, ) = _updateRewardData(</span></span>
 <span id="L253"><span class="lineNum">     253</span>                 :             :         rewardConfig,</span>
 <span id="L254"><span class="lineNum">     254</span>                 :             :         rewardsInput[i].totalSupply,</span>
 <span id="L255"><span class="lineNum">     255</span>                 :             :         10 ** decimals</span>
 <span id="L256"><span class="lineNum">     256</span>                 :             :       );</span>
 <span id="L257"><span class="lineNum">     257</span>                 :             : </span>
 <span id="L258"><span class="lineNum">     258</span>                 :             :       // Configure emission and distribution end of the reward per asset</span>
-<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">          40 :       uint88 oldEmissionsPerSecond = rewardConfig.emissionPerSecond;</span></span>
-<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">          40 :       uint32 oldDistributionEnd = rewardConfig.distributionEnd;</span></span>
-<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">          40 :       rewardConfig.emissionPerSecond = rewardsInput[i].emissionPerSecond;</span></span>
-<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">          40 :       rewardConfig.distributionEnd = rewardsInput[i].distributionEnd;</span></span>
+<span id="L259"><span class="lineNum">     259</span>                 :<span class="tlaGNC">        9023 :       uint88 oldEmissionsPerSecond = rewardConfig.emissionPerSecond;</span></span>
+<span id="L260"><span class="lineNum">     260</span>                 :<span class="tlaGNC">        9023 :       uint32 oldDistributionEnd = rewardConfig.distributionEnd;</span></span>
+<span id="L261"><span class="lineNum">     261</span>                 :<span class="tlaGNC">        9023 :       rewardConfig.emissionPerSecond = rewardsInput[i].emissionPerSecond;</span></span>
+<span id="L262"><span class="lineNum">     262</span>                 :<span class="tlaGNC">        9023 :       rewardConfig.distributionEnd = rewardsInput[i].distributionEnd;</span></span>
 <span id="L263"><span class="lineNum">     263</span>                 :             : </span>
-<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">          40 :       emit AssetConfigUpdated(</span></span>
+<span id="L264"><span class="lineNum">     264</span>                 :<span class="tlaGNC">        9023 :       emit AssetConfigUpdated(</span></span>
 <span id="L265"><span class="lineNum">     265</span>                 :             :         rewardsInput[i].asset,</span>
 <span id="L266"><span class="lineNum">     266</span>                 :             :         rewardsInput[i].reward,</span>
 <span id="L267"><span class="lineNum">     267</span>                 :             :         oldEmissionsPerSecond,</span>
@@ -352,25 +352,25 @@
 <span id="L281"><span class="lineNum">     281</span>                 :             :    * @return The new distribution index</span>
 <span id="L282"><span class="lineNum">     282</span>                 :             :    * @return True if the index was updated, false otherwise</span>
 <span id="L283"><span class="lineNum">     283</span>                 :             :    **/</span>
-<span id="L284"><span class="lineNum">     284</span>                 :<span class="tlaGNC">          39 :   function _updateRewardData(</span></span>
+<span id="L284"><span class="lineNum">     284</span>                 :             :   function _updateRewardData(</span>
 <span id="L285"><span class="lineNum">     285</span>                 :             :     RewardsDataTypes.RewardData storage rewardData,</span>
 <span id="L286"><span class="lineNum">     286</span>                 :             :     uint256 totalSupply,</span>
 <span id="L287"><span class="lineNum">     287</span>                 :             :     uint256 assetUnit</span>
 <span id="L288"><span class="lineNum">     288</span>                 :             :   ) internal returns (uint256, bool) {</span>
-<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">         117 :     (uint256 oldIndex, uint256 newIndex) = _getAssetIndex(rewardData, totalSupply, assetUnit);</span></span>
-<span id="L290"><span class="lineNum">     290</span>                 :<span class="tlaGNC">          78 :     bool indexUpdated;</span></span>
-<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">          78 :     if (newIndex != oldIndex) {</span></span>
-<span id="L292"><span class="lineNum">     292</span>                 :<span class="tlaGNC">          16 :       require(newIndex &lt;= type(uint104).max, 'INDEX_OVERFLOW');</span></span>
-<span id="L293"><span class="lineNum">     293</span>                 :<span class="tlaGNC">          16 :       indexUpdated = true;</span></span>
+<span id="L289"><span class="lineNum">     289</span>                 :<span class="tlaGNC">       11558 :     (uint256 oldIndex, uint256 newIndex) = _getAssetIndex(rewardData, totalSupply, assetUnit);</span></span>
+<span id="L290"><span class="lineNum">     290</span>                 :<span class="tlaGNC">       11558 :     bool indexUpdated;</span></span>
+<span id="L291"><span class="lineNum">     291</span>                 :<span class="tlaGNC">       11558 :     if (newIndex != oldIndex) {</span></span>
+<span id="L292"><span class="lineNum">     292</span>                 :<span class="tlaGNC">        1903 :       require(newIndex &lt;= type(uint104).max, 'INDEX_OVERFLOW');</span></span>
+<span id="L293"><span class="lineNum">     293</span>                 :<span class="tlaGNC">        1903 :       indexUpdated = true;</span></span>
 <span id="L294"><span class="lineNum">     294</span>                 :             : </span>
 <span id="L295"><span class="lineNum">     295</span>                 :             :       //optimization: storing one after another saves one SSTORE</span>
-<span id="L296"><span class="lineNum">     296</span>                 :<span class="tlaGNC">          16 :       rewardData.index = uint104(newIndex);</span></span>
-<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">          16 :       rewardData.lastUpdateTimestamp = block.timestamp.toUint32();</span></span>
+<span id="L296"><span class="lineNum">     296</span>                 :<span class="tlaGNC">        1903 :       rewardData.index = uint104(newIndex);</span></span>
+<span id="L297"><span class="lineNum">     297</span>                 :<span class="tlaGNC">        1903 :       rewardData.lastUpdateTimestamp = block.timestamp.toUint32();</span></span>
 <span id="L298"><span class="lineNum">     298</span>                 :             :     } else {</span>
-<span id="L299"><span class="lineNum">     299</span>                 :<span class="tlaGNC">          62 :       rewardData.lastUpdateTimestamp = block.timestamp.toUint32();</span></span>
+<span id="L299"><span class="lineNum">     299</span>                 :<span class="tlaGNC">        9655 :       rewardData.lastUpdateTimestamp = block.timestamp.toUint32();</span></span>
 <span id="L300"><span class="lineNum">     300</span>                 :             :     }</span>
 <span id="L301"><span class="lineNum">     301</span>                 :             : </span>
-<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">          78 :     return (newIndex, indexUpdated);</span></span>
+<span id="L302"><span class="lineNum">     302</span>                 :<span class="tlaGNC">       11558 :     return (newIndex, indexUpdated);</span></span>
 <span id="L303"><span class="lineNum">     303</span>                 :             :   }</span>
 <span id="L304"><span class="lineNum">     304</span>                 :             : </span>
 <span id="L305"><span class="lineNum">     305</span>                 :             :   /**</span>
@@ -382,26 +382,26 @@
 <span id="L311"><span class="lineNum">     311</span>                 :             :    * @param assetUnit One unit of asset (10**decimals)</span>
 <span id="L312"><span class="lineNum">     312</span>                 :             :    * @return The rewards accrued since the last update</span>
 <span id="L313"><span class="lineNum">     313</span>                 :             :    **/</span>
-<span id="L314"><span class="lineNum">     314</span>                 :<span class="tlaGNC">          17 :   function _updateUserData(</span></span>
+<span id="L314"><span class="lineNum">     314</span>                 :             :   function _updateUserData(</span>
 <span id="L315"><span class="lineNum">     315</span>                 :             :     RewardsDataTypes.RewardData storage rewardData,</span>
 <span id="L316"><span class="lineNum">     316</span>                 :             :     address user,</span>
 <span id="L317"><span class="lineNum">     317</span>                 :             :     uint256 userBalance,</span>
 <span id="L318"><span class="lineNum">     318</span>                 :             :     uint256 newAssetIndex,</span>
 <span id="L319"><span class="lineNum">     319</span>                 :             :     uint256 assetUnit</span>
 <span id="L320"><span class="lineNum">     320</span>                 :             :   ) internal returns (uint256, bool) {</span>
-<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">          34 :     uint256 userIndex = rewardData.usersData[user].index;</span></span>
-<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">          34 :     uint256 rewardsAccrued;</span></span>
-<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">          34 :     bool dataUpdated;</span></span>
-<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">          17 :     if ((dataUpdated = userIndex != newAssetIndex)) {</span></span>
+<span id="L321"><span class="lineNum">     321</span>                 :<span class="tlaGNC">        2533 :     uint256 userIndex = rewardData.usersData[user].index;</span></span>
+<span id="L322"><span class="lineNum">     322</span>                 :<span class="tlaGNC">        2533 :     uint256 rewardsAccrued;</span></span>
+<span id="L323"><span class="lineNum">     323</span>                 :<span class="tlaGNC">        2533 :     bool dataUpdated;</span></span>
+<span id="L324"><span class="lineNum">     324</span>                 :<span class="tlaGNC">        2533 :     if ((dataUpdated = userIndex != newAssetIndex)) {</span></span>
 <span id="L325"><span class="lineNum">     325</span>                 :             :       // already checked for overflow in _updateRewardData</span>
-<span id="L326"><span class="lineNum">     326</span>                 :<span class="tlaGNC">          16 :       rewardData.usersData[user].index = uint104(newAssetIndex);</span></span>
-<span id="L327"><span class="lineNum">     327</span>                 :<span class="tlaGNC">          16 :       if (userBalance != 0) {</span></span>
-<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">          16 :         rewardsAccrued = _getRewards(userBalance, newAssetIndex, userIndex, assetUnit);</span></span>
+<span id="L326"><span class="lineNum">     326</span>                 :<span class="tlaGNC">        1903 :       rewardData.usersData[user].index = uint104(newAssetIndex);</span></span>
+<span id="L327"><span class="lineNum">     327</span>                 :<span class="tlaGNC">        1903 :       if (userBalance != 0) {</span></span>
+<span id="L328"><span class="lineNum">     328</span>                 :<span class="tlaGNC">        1903 :         rewardsAccrued = _getRewards(userBalance, newAssetIndex, userIndex, assetUnit);</span></span>
 <span id="L329"><span class="lineNum">     329</span>                 :             : </span>
-<span id="L330"><span class="lineNum">     330</span>                 :<span class="tlaGNC">          16 :         rewardData.usersData[user].accrued += rewardsAccrued.toUint128();</span></span>
+<span id="L330"><span class="lineNum">     330</span>                 :<span class="tlaGNC">        1903 :         rewardData.usersData[user].accrued += rewardsAccrued.toUint128();</span></span>
 <span id="L331"><span class="lineNum">     331</span>                 :             :       }</span>
 <span id="L332"><span class="lineNum">     332</span>                 :             :     }</span>
-<span id="L333"><span class="lineNum">     333</span>                 :<span class="tlaGNC">          34 :     return (rewardsAccrued, dataUpdated);</span></span>
+<span id="L333"><span class="lineNum">     333</span>                 :<span class="tlaGNC">        2533 :     return (rewardsAccrued, dataUpdated);</span></span>
 <span id="L334"><span class="lineNum">     334</span>                 :             :   }</span>
 <span id="L335"><span class="lineNum">     335</span>                 :             : </span>
 <span id="L336"><span class="lineNum">     336</span>                 :             :   /**</span>
@@ -411,33 +411,33 @@
 <span id="L340"><span class="lineNum">     340</span>                 :             :    * @param userBalance The current user asset balance</span>
 <span id="L341"><span class="lineNum">     341</span>                 :             :    * @param totalSupply Total supply of the asset</span>
 <span id="L342"><span class="lineNum">     342</span>                 :             :    **/</span>
-<span id="L343"><span class="lineNum">     343</span>                 :<span class="tlaGNC">       53895 :   function _updateData(</span></span>
+<span id="L343"><span class="lineNum">     343</span>                 :             :   function _updateData(</span>
 <span id="L344"><span class="lineNum">     344</span>                 :             :     address asset,</span>
 <span id="L345"><span class="lineNum">     345</span>                 :             :     address user,</span>
 <span id="L346"><span class="lineNum">     346</span>                 :             :     uint256 userBalance,</span>
 <span id="L347"><span class="lineNum">     347</span>                 :             :     uint256 totalSupply</span>
 <span id="L348"><span class="lineNum">     348</span>                 :             :   ) internal {</span>
-<span id="L349"><span class="lineNum">     349</span>                 :<span class="tlaGNC">      107790 :     uint256 assetUnit;</span></span>
-<span id="L350"><span class="lineNum">     350</span>                 :<span class="tlaGNC">      107790 :     uint256 numAvailableRewards = _assets[asset].availableRewardsCount;</span></span>
+<span id="L349"><span class="lineNum">     349</span>                 :<span class="tlaGNC">      141340 :     uint256 assetUnit;</span></span>
+<span id="L350"><span class="lineNum">     350</span>                 :<span class="tlaGNC">      141340 :     uint256 numAvailableRewards = _assets[asset].availableRewardsCount;</span></span>
 <span id="L351"><span class="lineNum">     351</span>                 :             :     unchecked {</span>
-<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">      107790 :       assetUnit = 10 ** _assets[asset].decimals;</span></span>
+<span id="L352"><span class="lineNum">     352</span>                 :<span class="tlaGNC">      141340 :       assetUnit = 10 ** _assets[asset].decimals;</span></span>
 <span id="L353"><span class="lineNum">     353</span>                 :             :     }</span>
 <span id="L354"><span class="lineNum">     354</span>                 :             : </span>
-<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaGNC">      107790 :     if (numAvailableRewards == 0) {</span></span>
-<span id="L356"><span class="lineNum">     356</span>                 :<span class="tlaGNC">      107756 :       return;</span></span>
+<span id="L355"><span class="lineNum">     355</span>                 :<span class="tlaGNC">      141340 :     if (numAvailableRewards == 0) {</span></span>
+<span id="L356"><span class="lineNum">     356</span>                 :<span class="tlaGNC">      138807 :       return;</span></span>
 <span id="L357"><span class="lineNum">     357</span>                 :             :     }</span>
 <span id="L358"><span class="lineNum">     358</span>                 :             :     unchecked {</span>
-<span id="L359"><span class="lineNum">     359</span>                 :<span class="tlaGNC">          85 :       for (uint128 r = 0; r &lt; numAvailableRewards; r++) {</span></span>
-<span id="L360"><span class="lineNum">     360</span>                 :<span class="tlaGNC">          34 :         address reward = _assets[asset].availableRewards[r];</span></span>
-<span id="L361"><span class="lineNum">     361</span>                 :<span class="tlaGNC">          34 :         RewardsDataTypes.RewardData storage rewardData = _assets[asset].rewards[reward];</span></span>
+<span id="L359"><span class="lineNum">     359</span>                 :<span class="tlaGNC">        2533 :       for (uint128 r = 0; r &lt; numAvailableRewards; r++) {</span></span>
+<span id="L360"><span class="lineNum">     360</span>                 :<span class="tlaGNC">        2533 :         address reward = _assets[asset].availableRewards[r];</span></span>
+<span id="L361"><span class="lineNum">     361</span>                 :<span class="tlaGNC">        2533 :         RewardsDataTypes.RewardData storage rewardData = _assets[asset].rewards[reward];</span></span>
 <span id="L362"><span class="lineNum">     362</span>                 :             : </span>
-<span id="L363"><span class="lineNum">     363</span>                 :<span class="tlaGNC">          51 :         (uint256 newAssetIndex, bool rewardDataUpdated) = _updateRewardData(</span></span>
+<span id="L363"><span class="lineNum">     363</span>                 :<span class="tlaGNC">        2533 :         (uint256 newAssetIndex, bool rewardDataUpdated) = _updateRewardData(</span></span>
 <span id="L364"><span class="lineNum">     364</span>                 :             :           rewardData,</span>
 <span id="L365"><span class="lineNum">     365</span>                 :             :           totalSupply,</span>
 <span id="L366"><span class="lineNum">     366</span>                 :             :           assetUnit</span>
 <span id="L367"><span class="lineNum">     367</span>                 :             :         );</span>
 <span id="L368"><span class="lineNum">     368</span>                 :             : </span>
-<span id="L369"><span class="lineNum">     369</span>                 :<span class="tlaGNC">          51 :         (uint256 rewardsAccrued, bool userDataUpdated) = _updateUserData(</span></span>
+<span id="L369"><span class="lineNum">     369</span>                 :<span class="tlaGNC">        2533 :         (uint256 rewardsAccrued, bool userDataUpdated) = _updateUserData(</span></span>
 <span id="L370"><span class="lineNum">     370</span>                 :             :           rewardData,</span>
 <span id="L371"><span class="lineNum">     371</span>                 :             :           user,</span>
 <span id="L372"><span class="lineNum">     372</span>                 :             :           userBalance,</span>
@@ -445,8 +445,8 @@
 <span id="L374"><span class="lineNum">     374</span>                 :             :           assetUnit</span>
 <span id="L375"><span class="lineNum">     375</span>                 :             :         );</span>
 <span id="L376"><span class="lineNum">     376</span>                 :             : </span>
-<span id="L377"><span class="lineNum">     377</span>                 :<span class="tlaGNC">          34 :         if (rewardDataUpdated || userDataUpdated) {</span></span>
-<span id="L378"><span class="lineNum">     378</span>                 :<span class="tlaGNC">          16 :           emit Accrued(asset, reward, user, newAssetIndex, newAssetIndex, rewardsAccrued);</span></span>
+<span id="L377"><span class="lineNum">     377</span>                 :<span class="tlaGNC">        2533 :         if (rewardDataUpdated || userDataUpdated) {</span></span>
+<span id="L378"><span class="lineNum">     378</span>                 :<span class="tlaGNC">        1903 :           emit Accrued(asset, reward, user, newAssetIndex, newAssetIndex, rewardsAccrued);</span></span>
 <span id="L379"><span class="lineNum">     379</span>                 :             :         }</span>
 <span id="L380"><span class="lineNum">     380</span>                 :             :       }</span>
 <span id="L381"><span class="lineNum">     381</span>                 :             :     }</span>
@@ -457,12 +457,12 @@
 <span id="L386"><span class="lineNum">     386</span>                 :             :    * @param user The address of the user</span>
 <span id="L387"><span class="lineNum">     387</span>                 :             :    * @param userAssetBalances List of structs with the user balance and total supply of a set of assets</span>
 <span id="L388"><span class="lineNum">     388</span>                 :             :    **/</span>
-<span id="L389"><span class="lineNum">     389</span>                 :<span class="tlaGNC">           8 :   function _updateDataMultiple(</span></span>
+<span id="L389"><span class="lineNum">     389</span>                 :             :   function _updateDataMultiple(</span>
 <span id="L390"><span class="lineNum">     390</span>                 :             :     address user,</span>
 <span id="L391"><span class="lineNum">     391</span>                 :             :     RewardsDataTypes.UserAssetBalance[] memory userAssetBalances</span>
 <span id="L392"><span class="lineNum">     392</span>                 :             :   ) internal {</span>
-<span id="L393"><span class="lineNum">     393</span>                 :<span class="tlaGNC">          40 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
-<span id="L394"><span class="lineNum">     394</span>                 :<span class="tlaGNC">          16 :       _updateData(</span></span>
+<span id="L393"><span class="lineNum">     393</span>                 :<span class="tlaGNC">        2525 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
+<span id="L394"><span class="lineNum">     394</span>                 :<span class="tlaGNC">        2525 :       _updateData(</span></span>
 <span id="L395"><span class="lineNum">     395</span>                 :             :         userAssetBalances[i].asset,</span>
 <span id="L396"><span class="lineNum">     396</span>                 :             :         user,</span>
 <span id="L397"><span class="lineNum">     397</span>                 :             :         userAssetBalances[i].userBalance,</span>
@@ -478,20 +478,20 @@
 <span id="L407"><span class="lineNum">     407</span>                 :             :    * @param userAssetBalances List of structs with the user balance and total supply of a set of assets</span>
 <span id="L408"><span class="lineNum">     408</span>                 :             :    * @return unclaimedRewards The accrued rewards for the user until the moment</span>
 <span id="L409"><span class="lineNum">     409</span>                 :             :    **/</span>
-<span id="L410"><span class="lineNum">     410</span>                 :<span class="tlaGNC">          10 :   function _getUserReward(</span></span>
+<span id="L410"><span class="lineNum">     410</span>                 :             :   function _getUserReward(</span>
 <span id="L411"><span class="lineNum">     411</span>                 :             :     address user,</span>
 <span id="L412"><span class="lineNum">     412</span>                 :             :     address reward,</span>
 <span id="L413"><span class="lineNum">     413</span>                 :             :     RewardsDataTypes.UserAssetBalance[] memory userAssetBalances</span>
 <span id="L414"><span class="lineNum">     414</span>                 :             :   ) internal view returns (uint256 unclaimedRewards) {</span>
 <span id="L415"><span class="lineNum">     415</span>                 :             :     // Add unrealized rewards</span>
-<span id="L416"><span class="lineNum">     416</span>                 :<span class="tlaGNC">          50 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
-<span id="L417"><span class="lineNum">     417</span>                 :<span class="tlaGNC">          20 :       if (userAssetBalances[i].userBalance == 0) {</span></span>
-<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">           4 :         unclaimedRewards += _assets[userAssetBalances[i].asset]</span></span>
+<span id="L416"><span class="lineNum">     416</span>                 :<span class="tlaGNC">        1011 :     for (uint256 i = 0; i &lt; userAssetBalances.length; i++) {</span></span>
+<span id="L417"><span class="lineNum">     417</span>                 :<span class="tlaGNC">        1011 :       if (userAssetBalances[i].userBalance == 0) {</span></span>
+<span id="L418"><span class="lineNum">     418</span>                 :<span class="tlaGNC">           3 :         unclaimedRewards += _assets[userAssetBalances[i].asset]</span></span>
 <span id="L419"><span class="lineNum">     419</span>                 :             :           .rewards[reward]</span>
 <span id="L420"><span class="lineNum">     420</span>                 :             :           .usersData[user]</span>
 <span id="L421"><span class="lineNum">     421</span>                 :             :           .accrued;</span>
 <span id="L422"><span class="lineNum">     422</span>                 :             :       } else {</span>
-<span id="L423"><span class="lineNum">     423</span>                 :<span class="tlaGNC">          16 :         unclaimedRewards +=</span></span>
+<span id="L423"><span class="lineNum">     423</span>                 :<span class="tlaGNC">        1008 :         unclaimedRewards +=</span></span>
 <span id="L424"><span class="lineNum">     424</span>                 :             :           _getPendingRewards(user, reward, userAssetBalances[i]) +</span>
 <span id="L425"><span class="lineNum">     425</span>                 :             :           _assets[userAssetBalances[i].asset].rewards[reward].usersData[user].accrued;</span>
 <span id="L426"><span class="lineNum">     426</span>                 :             :       }</span>
@@ -507,19 +507,19 @@
 <span id="L436"><span class="lineNum">     436</span>                 :             :    * @param userAssetBalance struct with the user balance and total supply of the incentivized asset</span>
 <span id="L437"><span class="lineNum">     437</span>                 :             :    * @return The pending rewards for the user since the last user action</span>
 <span id="L438"><span class="lineNum">     438</span>                 :             :    **/</span>
-<span id="L439"><span class="lineNum">     439</span>                 :<span class="tlaGNC tlaBgGNC">           9 :   function _getPendingRewards(</span></span>
+<span id="L439"><span class="lineNum">     439</span>                 :             :   function _getPendingRewards(</span>
 <span id="L440"><span class="lineNum">     440</span>                 :             :     address user,</span>
 <span id="L441"><span class="lineNum">     441</span>                 :             :     address reward,</span>
 <span id="L442"><span class="lineNum">     442</span>                 :             :     RewardsDataTypes.UserAssetBalance memory userAssetBalance</span>
 <span id="L443"><span class="lineNum">     443</span>                 :             :   ) internal view returns (uint256) {</span>
-<span id="L444"><span class="lineNum">     444</span>                 :<span class="tlaGNC">          18 :     RewardsDataTypes.RewardData storage rewardData = _assets[userAssetBalance.asset].rewards[</span></span>
+<span id="L444"><span class="lineNum">     444</span>                 :<span class="tlaGNC tlaBgGNC">        1009 :     RewardsDataTypes.RewardData storage rewardData = _assets[userAssetBalance.asset].rewards[</span></span>
 <span id="L445"><span class="lineNum">     445</span>                 :             :       reward</span>
 <span id="L446"><span class="lineNum">     446</span>                 :             :     ];</span>
-<span id="L447"><span class="lineNum">     447</span>                 :<span class="tlaGNC">          27 :     uint256 assetUnit = 10 ** _assets[userAssetBalance.asset].decimals;</span></span>
-<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">          27 :     (, uint256 nextIndex) = _getAssetIndex(rewardData, userAssetBalance.totalSupply, assetUnit);</span></span>
+<span id="L447"><span class="lineNum">     447</span>                 :<span class="tlaGNC">        1009 :     uint256 assetUnit = 10 ** _assets[userAssetBalance.asset].decimals;</span></span>
+<span id="L448"><span class="lineNum">     448</span>                 :<span class="tlaGNC">        1009 :     (, uint256 nextIndex) = _getAssetIndex(rewardData, userAssetBalance.totalSupply, assetUnit);</span></span>
 <span id="L449"><span class="lineNum">     449</span>                 :             : </span>
-<span id="L450"><span class="lineNum">     450</span>                 :<span class="tlaGNC">          18 :     return</span></span>
-<span id="L451"><span class="lineNum">     451</span>                 :<span class="tlaGNC">          18 :       _getRewards(</span></span>
+<span id="L450"><span class="lineNum">     450</span>                 :<span class="tlaGNC">        1009 :     return</span></span>
+<span id="L451"><span class="lineNum">     451</span>                 :<span class="tlaGNC">        1009 :       _getRewards(</span></span>
 <span id="L452"><span class="lineNum">     452</span>                 :             :         userAssetBalance.userBalance,</span>
 <span id="L453"><span class="lineNum">     453</span>                 :             :         nextIndex,</span>
 <span id="L454"><span class="lineNum">     454</span>                 :             :         rewardData.usersData[user].index,</span>
@@ -535,17 +535,17 @@
 <span id="L464"><span class="lineNum">     464</span>                 :             :    * @param assetUnit One unit of asset (10**decimals)</span>
 <span id="L465"><span class="lineNum">     465</span>                 :             :    * @return The rewards</span>
 <span id="L466"><span class="lineNum">     466</span>                 :             :    **/</span>
-<span id="L467"><span class="lineNum">     467</span>                 :<span class="tlaGNC">          17 :   function _getRewards(</span></span>
+<span id="L467"><span class="lineNum">     467</span>                 :             :   function _getRewards(</span>
 <span id="L468"><span class="lineNum">     468</span>                 :             :     uint256 userBalance,</span>
 <span id="L469"><span class="lineNum">     469</span>                 :             :     uint256 reserveIndex,</span>
 <span id="L470"><span class="lineNum">     470</span>                 :             :     uint256 userIndex,</span>
 <span id="L471"><span class="lineNum">     471</span>                 :             :     uint256 assetUnit</span>
 <span id="L472"><span class="lineNum">     472</span>                 :             :   ) internal pure returns (uint256) {</span>
-<span id="L473"><span class="lineNum">     473</span>                 :<span class="tlaGNC">          51 :     uint256 result = userBalance * (reserveIndex - userIndex);</span></span>
+<span id="L473"><span class="lineNum">     473</span>                 :<span class="tlaGNC">        2912 :     uint256 result = userBalance * (reserveIndex - userIndex);</span></span>
 <span id="L474"><span class="lineNum">     474</span>                 :             :     assembly {</span>
-<span id="L475"><span class="lineNum">     475</span>                 :<span class="tlaGNC">          34 :       result := div(result, assetUnit)</span></span>
+<span id="L475"><span class="lineNum">     475</span>                 :<span class="tlaGNC">        2912 :       result := div(result, assetUnit)</span></span>
 <span id="L476"><span class="lineNum">     476</span>                 :             :     }</span>
-<span id="L477"><span class="lineNum">     477</span>                 :<span class="tlaGNC">          34 :     return result;</span></span>
+<span id="L477"><span class="lineNum">     477</span>                 :<span class="tlaGNC">        2912 :     return result;</span></span>
 <span id="L478"><span class="lineNum">     478</span>                 :             :   }</span>
 <span id="L479"><span class="lineNum">     479</span>                 :             : </span>
 <span id="L480"><span class="lineNum">     480</span>                 :             :   /**</span>
@@ -555,34 +555,34 @@
 <span id="L484"><span class="lineNum">     484</span>                 :             :    * @param assetUnit One unit of asset (10**decimals)</span>
 <span id="L485"><span class="lineNum">     485</span>                 :             :    * @return The new index.</span>
 <span id="L486"><span class="lineNum">     486</span>                 :             :    **/</span>
-<span id="L487"><span class="lineNum">     487</span>                 :<span class="tlaGNC">          49 :   function _getAssetIndex(</span></span>
+<span id="L487"><span class="lineNum">     487</span>                 :             :   function _getAssetIndex(</span>
 <span id="L488"><span class="lineNum">     488</span>                 :             :     RewardsDataTypes.RewardData storage rewardData,</span>
 <span id="L489"><span class="lineNum">     489</span>                 :             :     uint256 totalSupply,</span>
 <span id="L490"><span class="lineNum">     490</span>                 :             :     uint256 assetUnit</span>
 <span id="L491"><span class="lineNum">     491</span>                 :             :   ) internal view returns (uint256, uint256) {</span>
-<span id="L492"><span class="lineNum">     492</span>                 :<span class="tlaGNC">          98 :     uint256 oldIndex = rewardData.index;</span></span>
-<span id="L493"><span class="lineNum">     493</span>                 :<span class="tlaGNC">          98 :     uint256 distributionEnd = rewardData.distributionEnd;</span></span>
-<span id="L494"><span class="lineNum">     494</span>                 :<span class="tlaGNC">          98 :     uint256 emissionPerSecond = rewardData.emissionPerSecond;</span></span>
-<span id="L495"><span class="lineNum">     495</span>                 :<span class="tlaGNC">          98 :     uint256 lastUpdateTimestamp = rewardData.lastUpdateTimestamp;</span></span>
+<span id="L492"><span class="lineNum">     492</span>                 :<span class="tlaGNC">       50521 :     uint256 oldIndex = rewardData.index;</span></span>
+<span id="L493"><span class="lineNum">     493</span>                 :<span class="tlaGNC">       50521 :     uint256 distributionEnd = rewardData.distributionEnd;</span></span>
+<span id="L494"><span class="lineNum">     494</span>                 :<span class="tlaGNC">       50521 :     uint256 emissionPerSecond = rewardData.emissionPerSecond;</span></span>
+<span id="L495"><span class="lineNum">     495</span>                 :<span class="tlaGNC">       50521 :     uint256 lastUpdateTimestamp = rewardData.lastUpdateTimestamp;</span></span>
 <span id="L496"><span class="lineNum">     496</span>                 :             : </span>
 <span id="L497"><span class="lineNum">     497</span>                 :             :     if (</span>
-<span id="L498"><span class="lineNum">     498</span>                 :<span class="tlaGNC">         245 :       emissionPerSecond == 0 ||</span></span>
-<span id="L499"><span class="lineNum">     499</span>                 :<span class="tlaGNC">          58 :       totalSupply == 0 ||</span></span>
-<span id="L500"><span class="lineNum">     500</span>                 :<span class="tlaGNC">          36 :       lastUpdateTimestamp == block.timestamp ||</span></span>
-<span id="L501"><span class="lineNum">     501</span>                 :<span class="tlaGNC">          36 :       lastUpdateTimestamp &gt;= distributionEnd</span></span>
+<span id="L498"><span class="lineNum">     498</span>                 :<span class="tlaGNC">       50521 :       emissionPerSecond == 0 ||</span></span>
+<span id="L499"><span class="lineNum">     499</span>                 :<span class="tlaGNC">       40167 :       totalSupply == 0 ||</span></span>
+<span id="L500"><span class="lineNum">     500</span>                 :<span class="tlaGNC">       31462 :       lastUpdateTimestamp == block.timestamp ||</span></span>
+<span id="L501"><span class="lineNum">     501</span>                 :<span class="tlaGNC">       20033 :       lastUpdateTimestamp &gt;= distributionEnd</span></span>
 <span id="L502"><span class="lineNum">     502</span>                 :             :     ) {</span>
-<span id="L503"><span class="lineNum">     503</span>                 :<span class="tlaGNC">          62 :       return (oldIndex, oldIndex);</span></span>
+<span id="L503"><span class="lineNum">     503</span>                 :<span class="tlaGNC">       31961 :       return (oldIndex, oldIndex);</span></span>
 <span id="L504"><span class="lineNum">     504</span>                 :             :     }</span>
 <span id="L505"><span class="lineNum">     505</span>                 :             : </span>
-<span id="L506"><span class="lineNum">     506</span>                 :<span class="tlaGNC">          54 :     uint256 currentTimestamp = block.timestamp &gt; distributionEnd</span></span>
+<span id="L506"><span class="lineNum">     506</span>                 :<span class="tlaGNC">       18560 :     uint256 currentTimestamp = block.timestamp &gt; distributionEnd</span></span>
 <span id="L507"><span class="lineNum">     507</span>                 :             :       ? distributionEnd</span>
 <span id="L508"><span class="lineNum">     508</span>                 :             :       : block.timestamp;</span>
-<span id="L509"><span class="lineNum">     509</span>                 :<span class="tlaGNC">          54 :     uint256 timeDelta = currentTimestamp - lastUpdateTimestamp;</span></span>
-<span id="L510"><span class="lineNum">     510</span>                 :<span class="tlaGNC">          72 :     uint256 firstTerm = emissionPerSecond * timeDelta * assetUnit;</span></span>
+<span id="L509"><span class="lineNum">     509</span>                 :<span class="tlaGNC">       18560 :     uint256 timeDelta = currentTimestamp - lastUpdateTimestamp;</span></span>
+<span id="L510"><span class="lineNum">     510</span>                 :<span class="tlaGNC">       18560 :     uint256 firstTerm = emissionPerSecond * timeDelta * assetUnit;</span></span>
 <span id="L511"><span class="lineNum">     511</span>                 :             :     assembly {</span>
-<span id="L512"><span class="lineNum">     512</span>                 :<span class="tlaGNC">          36 :       firstTerm := div(firstTerm, totalSupply)</span></span>
+<span id="L512"><span class="lineNum">     512</span>                 :<span class="tlaGNC">       18560 :       firstTerm := div(firstTerm, totalSupply)</span></span>
 <span id="L513"><span class="lineNum">     513</span>                 :             :     }</span>
-<span id="L514"><span class="lineNum">     514</span>                 :<span class="tlaGNC">          36 :     return (oldIndex, (firstTerm + oldIndex));</span></span>
+<span id="L514"><span class="lineNum">     514</span>                 :<span class="tlaGNC">       18560 :     return (oldIndex, (firstTerm + oldIndex));</span></span>
 <span id="L515"><span class="lineNum">     515</span>                 :             :   }</span>
 <span id="L516"><span class="lineNum">     516</span>                 :             : </span>
 <span id="L517"><span class="lineNum">     517</span>                 :             :   /**</span>
@@ -597,13 +597,13 @@
 <span id="L526"><span class="lineNum">     526</span>                 :             :   ) internal view virtual returns (RewardsDataTypes.UserAssetBalance[] memory userAssetBalances);</span>
 <span id="L527"><span class="lineNum">     527</span>                 :             : </span>
 <span id="L528"><span class="lineNum">     528</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L529"><span class="lineNum">     529</span>                 :<span class="tlaGNC">           2 :   function getAssetDecimals(address asset) external view returns (uint8) {</span></span>
-<span id="L530"><span class="lineNum">     530</span>                 :<span class="tlaGNC">           4 :     return _assets[asset].decimals;</span></span>
+<span id="L529"><span class="lineNum">     529</span>                 :             :   function getAssetDecimals(address asset) external view returns (uint8) {</span>
+<span id="L530"><span class="lineNum">     530</span>                 :<span class="tlaGNC">           2 :     return _assets[asset].decimals;</span></span>
 <span id="L531"><span class="lineNum">     531</span>                 :             :   }</span>
 <span id="L532"><span class="lineNum">     532</span>                 :             : </span>
 <span id="L533"><span class="lineNum">     533</span>                 :             :   /// @inheritdoc IRewardsDistributor</span>
-<span id="L534"><span class="lineNum">     534</span>                 :<span class="tlaGNC">           3 :   function getEmissionManager() external view returns (address) {</span></span>
-<span id="L535"><span class="lineNum">     535</span>                 :<span class="tlaGNC">           6 :     return EMISSION_MANAGER;</span></span>
+<span id="L534"><span class="lineNum">     534</span>                 :             :   function getEmissionManager() external view returns (address) {</span>
+<span id="L535"><span class="lineNum">     535</span>                 :<span class="tlaGNC">           5 :     return EMISSION_MANAGER;</span></span>
 <span id="L536"><span class="lineNum">     536</span>                 :             :   }</span>
 <span id="L537"><span class="lineNum">     537</span>                 :             : }</span>
         </pre>
@@ -613,8 +613,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index.html b/report/rewards/index-sort-b.html
similarity index 57%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/index.html
rename to report/rewards/index-sort-b.html
index c312bdc4..40bea0d0 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index.html
+++ b/report/rewards/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/rewards/src/periphery/contracts/rewards</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - rewards</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">214</td>
-            <td class="headerCovTableEntry">212</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">219</td>
+            <td class="headerCovTableEntry">216</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntryHi">96.7&nbsp;%</td>
+            <td class="headerCovTableEntry">61</td>
+            <td class="headerCovTableEntry">59</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EmissionManager.sol.gcov.html">EmissionManager.sol</a></td>
+              <td class="coverFile"><a href="EmissionManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/EmissionManager.sol">EmissionManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">12</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsController.sol.gcov.html">RewardsController.sol</a></td>
+              <td class="coverFile"><a href="RewardsController.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsController.sol">RewardsController.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="98.7%"><img src="../../../../../../../snow.png" width=1 height=10 alt="98.7%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=99 height=10 alt="98.8%"><img src="../snow.png" width=1 height=10 alt="98.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.7&nbsp;%</td>
+              <td class="coverPerHi">98.8&nbsp;%</td>
+              <td class="coverNumDflt">80</td>
               <td class="coverNumDflt">79</td>
-              <td class="coverNumDflt">78</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">23</td>
-              <td class="coverNumDflt">23</td>
+              <td class="coverPerHi">96.0&nbsp;%</td>
+              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">24</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html">RewardsDistributor.sol</a></td>
+              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsDistributor.sol">RewardsDistributor.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="99.2%"><img src="../../../../../../../snow.png" width=1 height=10 alt="99.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.2&nbsp;%</td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
               <td class="coverNumDflt">119</td>
-              <td class="coverNumDflt">118</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
+              <td class="coverPerHi">95.8&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">23</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-f.html b/report/rewards/index-sort-f.html
similarity index 57%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-f.html
rename to report/rewards/index-sort-f.html
index 52a4a0d6..f8ef4622 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-f.html
+++ b/report/rewards/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/rewards/src/periphery/contracts/rewards</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - rewards</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">214</td>
-            <td class="headerCovTableEntry">212</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">219</td>
+            <td class="headerCovTableEntry">216</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntryHi">96.7&nbsp;%</td>
+            <td class="headerCovTableEntry">61</td>
+            <td class="headerCovTableEntry">59</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EmissionManager.sol.gcov.html">EmissionManager.sol</a></td>
+              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsDistributor.sol">RewardsDistributor.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverPerHi">95.8&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">23</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html">RewardsDistributor.sol</a></td>
+              <td class="coverFile"><a href="RewardsController.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsController.sol">RewardsController.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="99.2%"><img src="../../../../../../../snow.png" width=1 height=10 alt="99.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=99 height=10 alt="98.8%"><img src="../snow.png" width=1 height=10 alt="98.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.2&nbsp;%</td>
-              <td class="coverNumDflt">119</td>
-              <td class="coverNumDflt">118</td>
+              <td class="coverPerHi">98.8&nbsp;%</td>
+              <td class="coverNumDflt">80</td>
+              <td class="coverNumDflt">79</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
+              <td class="coverPerHi">96.0&nbsp;%</td>
+              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">24</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsController.sol.gcov.html">RewardsController.sol</a></td>
+              <td class="coverFile"><a href="EmissionManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/EmissionManager.sol">EmissionManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="98.7%"><img src="../../../../../../../snow.png" width=1 height=10 alt="98.7%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.7&nbsp;%</td>
-              <td class="coverNumDflt">79</td>
-              <td class="coverNumDflt">78</td>
+              <td class="coverPerHi">100.0&nbsp;%</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">23</td>
-              <td class="coverNumDflt">23</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">12</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-l.html b/report/rewards/index-sort-l.html
similarity index 57%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-l.html
rename to report/rewards/index-sort-l.html
index 03d2ac1a..9d3a50d5 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-l.html
+++ b/report/rewards/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/rewards/src/periphery/contracts/rewards</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - rewards</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">214</td>
-            <td class="headerCovTableEntry">212</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">219</td>
+            <td class="headerCovTableEntry">216</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntryHi">96.7&nbsp;%</td>
+            <td class="headerCovTableEntry">61</td>
+            <td class="headerCovTableEntry">59</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsController.sol.gcov.html">RewardsController.sol</a></td>
+              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsDistributor.sol">RewardsDistributor.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="98.7%"><img src="../../../../../../../snow.png" width=1 height=10 alt="98.7%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.7&nbsp;%</td>
-              <td class="coverNumDflt">79</td>
-              <td class="coverNumDflt">78</td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
+              <td class="coverNumDflt">119</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">23</td>
+              <td class="coverPerHi">95.8&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
               <td class="coverNumDflt">23</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html">RewardsDistributor.sol</a></td>
+              <td class="coverFile"><a href="RewardsController.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsController.sol">RewardsController.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="99.2%"><img src="../../../../../../../snow.png" width=1 height=10 alt="99.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=99 height=10 alt="98.8%"><img src="../snow.png" width=1 height=10 alt="98.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.2&nbsp;%</td>
-              <td class="coverNumDflt">119</td>
-              <td class="coverNumDflt">118</td>
+              <td class="coverPerHi">98.8&nbsp;%</td>
+              <td class="coverNumDflt">80</td>
+              <td class="coverNumDflt">79</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
+              <td class="coverPerHi">96.0&nbsp;%</td>
+              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">24</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EmissionManager.sol.gcov.html">EmissionManager.sol</a></td>
+              <td class="coverFile"><a href="EmissionManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/EmissionManager.sol">EmissionManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">12</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-b.html b/report/rewards/index.html
similarity index 57%
rename from report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-b.html
rename to report/rewards/index.html
index e5282164..a50dcfc8 100644
--- a/report/periphery/contracts/rewards/src/periphery/contracts/rewards/index-sort-b.html
+++ b/report/rewards/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/src/periphery/contracts/rewards</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards</title>
+  <link rel="stylesheet" type="text/css" href="../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../index.html">top level</a> - periphery/contracts/rewards/src/periphery/contracts/rewards</td>
+            <td width="10%" class="headerValue"><a href="../index.html" title="Click to go to top-level">top level</a> - rewards</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">99.1&nbsp;%</td>
-            <td class="headerCovTableEntry">214</td>
-            <td class="headerCovTableEntry">212</td>
+            <td class="headerCovTableEntryHi">98.6&nbsp;%</td>
+            <td class="headerCovTableEntry">219</td>
+            <td class="headerCovTableEntry">216</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">55</td>
-            <td class="headerCovTableEntry">55</td>
+            <td class="headerCovTableEntryHi">96.7&nbsp;%</td>
+            <td class="headerCovTableEntry">61</td>
+            <td class="headerCovTableEntry">59</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="EmissionManager.sol.gcov.html">EmissionManager.sol</a></td>
+              <td class="coverFile"><a href="EmissionManager.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/EmissionManager.sol">EmissionManager.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverNumDflt">18</td>
+              <td class="coverNumDflt">18</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">10</td>
-              <td class="coverNumDflt">10</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">12</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsController.sol.gcov.html">RewardsController.sol</a></td>
+              <td class="coverFile"><a href="RewardsController.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsController.sol">RewardsController.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="98.7%"><img src="../../../../../../../snow.png" width=1 height=10 alt="98.7%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=99 height=10 alt="98.8%"><img src="../snow.png" width=1 height=10 alt="98.8%"></td></tr></table>
               </td>
-              <td class="coverPerHi">98.7&nbsp;%</td>
+              <td class="coverPerHi">98.8&nbsp;%</td>
+              <td class="coverNumDflt">80</td>
               <td class="coverNumDflt">79</td>
-              <td class="coverNumDflt">78</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">23</td>
-              <td class="coverNumDflt">23</td>
+              <td class="coverPerHi">96.0&nbsp;%</td>
+              <td class="coverNumDflt">25</td>
+              <td class="coverNumDflt">24</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html">RewardsDistributor.sol</a></td>
+              <td class="coverFile"><a href="RewardsDistributor.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/RewardsDistributor.sol">RewardsDistributor.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../emerald.png" width=99 height=10 alt="99.2%"><img src="../../../../../../../snow.png" width=1 height=10 alt="99.2%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=98 height=10 alt="98.3%"><img src="../snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
               </td>
-              <td class="coverPerHi">99.2&nbsp;%</td>
+              <td class="coverPerHi">98.3&nbsp;%</td>
+              <td class="coverNumDflt">121</td>
               <td class="coverNumDflt">119</td>
-              <td class="coverNumDflt">118</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">22</td>
-              <td class="coverNumDflt">22</td>
+              <td class="coverPerHi">95.8&nbsp;%</td>
+              <td class="coverNumDflt">24</td>
+              <td class="coverNumDflt">23</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html
similarity index 64%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html
rename to report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html
index cf59fe14..744cbbcd 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html
+++ b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/PullRewardsTransferStrategy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (<a href="PullRewardsTransferStrategy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (<a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PullRewardsTransferStrategy.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="PullRewardsTransferStrategy.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -77,11 +77,18 @@
               <td class="coverFnHi">1</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PullRewardsTransferStrategy.sol.gcov.html#L19">PullRewardsTransferStrategy.</a></td>
+              
+              <td class="coverFnHi">866</td>
+              
+              
             </tr>
             <tr>
               <td class="coverFn"><a href="PullRewardsTransferStrategy.sol.gcov.html#L28">PullRewardsTransferStrategy.performTransfer</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">1902</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html
similarity index 64%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html
rename to report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html
index ed02ea5a..b36edeb1 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html
+++ b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/PullRewardsTransferStrategy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (<a href="PullRewardsTransferStrategy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (<a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PullRewardsTransferStrategy.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="PullRewardsTransferStrategy.sol.gcov.html#L19">PullRewardsTransferStrategy.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="PullRewardsTransferStrategy.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnHi">866</td>
               
               
             </tr>
@@ -81,7 +88,7 @@
             <tr>
               <td class="coverFn"><a href="PullRewardsTransferStrategy.sol.gcov.html#L28">PullRewardsTransferStrategy.performTransfer</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">1902</td>
               
               
             </tr>
@@ -89,8 +96,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html
similarity index 79%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html
rename to report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html
index c52092d8..28784529 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html
+++ b/report/rewards/transfer-strategies/PullRewardsTransferStrategy.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/PullRewardsTransferStrategy.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (source / <a href="PullRewardsTransferStrategy.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - PullRewardsTransferStrategy.sol<span style="font-size: 80%;"> (source / <a href="PullRewardsTransferStrategy.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">4</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">2</td>
-            <td class="headerCovTableEntry">2</td>
+            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">3</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -75,8 +75,8 @@
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {IPullRewardsTransferStrategy} from '../interfaces/IPullRewardsTransferStrategy.sol';</span>
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {TransferStrategyBase} from './TransferStrategyBase.sol';</span>
-<span id="L7"><span class="lineNum">       7</span>                 :             : import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L7"><span class="lineNum">       7</span>                 :             : import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             : </span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : /**</span>
 <span id="L11"><span class="lineNum">      11</span>                 :             :  * @title PullRewardsTransferStrategy</span>
@@ -94,11 +94,11 @@
 <span id="L23"><span class="lineNum">      23</span>                 :             :     address rewardsAdmin,</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :     address rewardsVault</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :   ) TransferStrategyBase(incentivesController, rewardsAdmin) {</span>
-<span id="L26"><span class="lineNum">      26</span>                 :             :     REWARDS_VAULT = rewardsVault;</span>
+<span id="L26"><span class="lineNum">      26</span>                 :<span class="tlaGNC tlaBgGNC">         380 :     REWARDS_VAULT = rewardsVault;</span></span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   }</span>
 <span id="L28"><span class="lineNum">      28</span>                 :             : </span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :   /// @inheritdoc TransferStrategyBase</span>
-<span id="L30"><span class="lineNum">      30</span>                 :<span class="tlaGNC tlaBgGNC">           7 :   function performTransfer(</span></span>
+<span id="L30"><span class="lineNum">      30</span>                 :             :   function performTransfer(</span>
 <span id="L31"><span class="lineNum">      31</span>                 :             :     address to,</span>
 <span id="L32"><span class="lineNum">      32</span>                 :             :     address reward,</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :     uint256 amount</span>
@@ -108,14 +108,14 @@
 <span id="L37"><span class="lineNum">      37</span>                 :             :     onlyIncentivesController</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     returns (bool)</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   {</span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">          14 :     IERC20(reward).safeTransferFrom(REWARDS_VAULT, to, amount);</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC">        1902 :     IERC20(reward).safeTransferFrom(REWARDS_VAULT, to, amount);</span></span>
 <span id="L41"><span class="lineNum">      41</span>                 :             : </span>
-<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">          14 :     return true;</span></span>
+<span id="L42"><span class="lineNum">      42</span>                 :<span class="tlaGNC">        1902 :     return true;</span></span>
 <span id="L43"><span class="lineNum">      43</span>                 :             :   }</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             : </span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :   /// @inheritdoc IPullRewardsTransferStrategy</span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           1 :   function getRewardsVault() external view returns (address) {</span></span>
-<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           2 :     return REWARDS_VAULT;</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :             :   function getRewardsVault() external view returns (address) {</span>
+<span id="L47"><span class="lineNum">      47</span>                 :<span class="tlaGNC">           1 :     return REWARDS_VAULT;</span></span>
 <span id="L48"><span class="lineNum">      48</span>                 :             :   }</span>
 <span id="L49"><span class="lineNum">      49</span>                 :             : }</span>
         </pre>
@@ -125,8 +125,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html
similarity index 67%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html
rename to report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html
index 95d87bcd..b68d95c7 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html
+++ b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/StakedTokenTransferStrategy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (<a href="StakedTokenTransferStrategy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (<a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">12</td>
             <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StakedTokenTransferStrategy.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="StakedTokenTransferStrategy.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StakedTokenTransferStrategy.sol.gcov.html#L21">StakedTokenTransferStrategy.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html
similarity index 67%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html
rename to report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html
index 26f341d4..f0e7459a 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html
+++ b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/StakedTokenTransferStrategy.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (<a href="StakedTokenTransferStrategy.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (<a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">12</td>
             <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StakedTokenTransferStrategy.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="StakedTokenTransferStrategy.sol.gcov.html#L21">StakedTokenTransferStrategy.</a></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="StakedTokenTransferStrategy.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="coverFnLo">0</td>
               
               
             </tr>
@@ -110,8 +117,8 @@
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html
similarity index 76%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html
rename to report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html
index 07c0b5dc..b71c62ba 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html
+++ b/report/rewards/transfer-strategies/StakedTokenTransferStrategy.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/StakedTokenTransferStrategy.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (source / <a href="StakedTokenTransferStrategy.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - StakedTokenTransferStrategy.sol<span style="font-size: 80%;"> (source / <a href="StakedTokenTransferStrategy.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntryLo">66.7&nbsp;%</td>
+            <td class="headerCovTableEntry">12</td>
             <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">5</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">6</td>
             <td class="headerCovTableEntry">5</td>
           </tr>
           <tr>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -76,8 +76,8 @@
 <span id="L5"><span class="lineNum">       5</span>                 :             : import {IStakedTokenTransferStrategy} from '../interfaces/IStakedTokenTransferStrategy.sol';</span>
 <span id="L6"><span class="lineNum">       6</span>                 :             : import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : import {TransferStrategyBase} from './TransferStrategyBase.sol';</span>
-<span id="L8"><span class="lineNum">       8</span>                 :             : import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
-<span id="L9"><span class="lineNum">       9</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L8"><span class="lineNum">       8</span>                 :             : import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
+<span id="L9"><span class="lineNum">       9</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L10"><span class="lineNum">      10</span>                 :             : </span>
 <span id="L11"><span class="lineNum">      11</span>                 :             : /**</span>
 <span id="L12"><span class="lineNum">      12</span>                 :             :  * @title StakedTokenTransferStrategy</span>
@@ -96,15 +96,15 @@
 <span id="L25"><span class="lineNum">      25</span>                 :             :     address rewardsAdmin,</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :     IStakedToken stakeToken</span>
 <span id="L27"><span class="lineNum">      27</span>                 :             :   ) TransferStrategyBase(incentivesController, rewardsAdmin) {</span>
-<span id="L28"><span class="lineNum">      28</span>                 :             :     STAKE_CONTRACT = stakeToken;</span>
-<span id="L29"><span class="lineNum">      29</span>                 :             :     UNDERLYING_TOKEN = STAKE_CONTRACT.STAKED_TOKEN();</span>
+<span id="L28"><span class="lineNum">      28</span>                 :<span class="tlaUNC tlaBgUNC">           0 :     STAKE_CONTRACT = stakeToken;</span></span>
+<span id="L29"><span class="lineNum">      29</span>                 :<span class="tlaUNC">           0 :     UNDERLYING_TOKEN = STAKE_CONTRACT.STAKED_TOKEN();</span></span>
 <span id="L30"><span class="lineNum">      30</span>                 :             : </span>
-<span id="L31"><span class="lineNum">      31</span>                 :             :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span>
-<span id="L32"><span class="lineNum">      32</span>                 :             :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), type(uint256).max);</span>
+<span id="L31"><span class="lineNum">      31</span>                 :<span class="tlaUNC">           0 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span></span>
+<span id="L32"><span class="lineNum">      32</span>                 :<span class="tlaUNC">           0 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), type(uint256).max);</span></span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :   }</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             : </span>
 <span id="L35"><span class="lineNum">      35</span>                 :             :   /// @inheritdoc TransferStrategyBase</span>
-<span id="L36"><span class="lineNum">      36</span>                 :<span class="tlaGNC tlaBgGNC">           1 :   function performTransfer(</span></span>
+<span id="L36"><span class="lineNum">      36</span>                 :             :   function performTransfer(</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :     address to,</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             :     address reward,</span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :     uint256 amount</span>
@@ -114,32 +114,32 @@
 <span id="L43"><span class="lineNum">      43</span>                 :             :     onlyIncentivesController</span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :     returns (bool)</span>
 <span id="L45"><span class="lineNum">      45</span>                 :             :   {</span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           2 :     require(reward == address(STAKE_CONTRACT), 'REWARD_TOKEN_NOT_STAKE_CONTRACT');</span></span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC tlaBgGNC">           1 :     require(reward == address(STAKE_CONTRACT), 'REWARD_TOKEN_NOT_STAKE_CONTRACT');</span></span>
 <span id="L47"><span class="lineNum">      47</span>                 :             : </span>
-<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           2 :     STAKE_CONTRACT.stake(to, amount);</span></span>
+<span id="L48"><span class="lineNum">      48</span>                 :<span class="tlaGNC">           1 :     STAKE_CONTRACT.stake(to, amount);</span></span>
 <span id="L49"><span class="lineNum">      49</span>                 :             : </span>
-<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">           2 :     return true;</span></span>
+<span id="L50"><span class="lineNum">      50</span>                 :<span class="tlaGNC">           1 :     return true;</span></span>
 <span id="L51"><span class="lineNum">      51</span>                 :             :   }</span>
 <span id="L52"><span class="lineNum">      52</span>                 :             : </span>
 <span id="L53"><span class="lineNum">      53</span>                 :             :   /// @inheritdoc IStakedTokenTransferStrategy</span>
-<span id="L54"><span class="lineNum">      54</span>                 :<span class="tlaGNC">           1 :   function renewApproval() external onlyRewardsAdmin {</span></span>
-<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           2 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span></span>
-<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           2 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), type(uint256).max);</span></span>
+<span id="L54"><span class="lineNum">      54</span>                 :             :   function renewApproval() external onlyRewardsAdmin {</span>
+<span id="L55"><span class="lineNum">      55</span>                 :<span class="tlaGNC">           1 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span></span>
+<span id="L56"><span class="lineNum">      56</span>                 :<span class="tlaGNC">           1 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), type(uint256).max);</span></span>
 <span id="L57"><span class="lineNum">      57</span>                 :             :   }</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             : </span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :   /// @inheritdoc IStakedTokenTransferStrategy</span>
-<span id="L60"><span class="lineNum">      60</span>                 :<span class="tlaGNC">           1 :   function dropApproval() external onlyRewardsAdmin {</span></span>
-<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           2 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span></span>
+<span id="L60"><span class="lineNum">      60</span>                 :             :   function dropApproval() external onlyRewardsAdmin {</span>
+<span id="L61"><span class="lineNum">      61</span>                 :<span class="tlaGNC">           1 :     IERC20(UNDERLYING_TOKEN).approve(address(STAKE_CONTRACT), 0);</span></span>
 <span id="L62"><span class="lineNum">      62</span>                 :             :   }</span>
 <span id="L63"><span class="lineNum">      63</span>                 :             : </span>
 <span id="L64"><span class="lineNum">      64</span>                 :             :   /// @inheritdoc IStakedTokenTransferStrategy</span>
-<span id="L65"><span class="lineNum">      65</span>                 :<span class="tlaGNC">           1 :   function getStakeContract() external view returns (address) {</span></span>
-<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           3 :     return address(STAKE_CONTRACT);</span></span>
+<span id="L65"><span class="lineNum">      65</span>                 :             :   function getStakeContract() external view returns (address) {</span>
+<span id="L66"><span class="lineNum">      66</span>                 :<span class="tlaGNC">           1 :     return address(STAKE_CONTRACT);</span></span>
 <span id="L67"><span class="lineNum">      67</span>                 :             :   }</span>
 <span id="L68"><span class="lineNum">      68</span>                 :             : </span>
 <span id="L69"><span class="lineNum">      69</span>                 :             :   /// @inheritdoc IStakedTokenTransferStrategy</span>
-<span id="L70"><span class="lineNum">      70</span>                 :<span class="tlaGNC">           1 :   function getUnderlyingToken() external view returns (address) {</span></span>
-<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           2 :     return UNDERLYING_TOKEN;</span></span>
+<span id="L70"><span class="lineNum">      70</span>                 :             :   function getUnderlyingToken() external view returns (address) {</span>
+<span id="L71"><span class="lineNum">      71</span>                 :<span class="tlaGNC">           1 :     return UNDERLYING_TOKEN;</span></span>
 <span id="L72"><span class="lineNum">      72</span>                 :             :   }</span>
 <span id="L73"><span class="lineNum">      73</span>                 :             : }</span>
         </pre>
@@ -149,8 +149,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html b/report/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html
similarity index 57%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html
rename to report/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html
index 9221e237..baaa9b82 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html
+++ b/report/rewards/transfer-strategies/TransferStrategyBase.sol.func-c.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/TransferStrategyBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (<a href="TransferStrategyBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (<a href="TransferStrategyBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,21 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="TransferStrategyBase.sol.func.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="TransferStrategyBase.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
               
               
             </tr>
@@ -91,13 +91,34 @@
               <td class="coverFnHi">1</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L32">TransferStrategyBase.onlyRewardsAdmin</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L16">TransferStrategyBase.</a></td>
+              
+              <td class="coverFnHi">344</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L24">TransferStrategyBase.onlyIncentivesController</a></td>
+              
+              <td class="coverFnHi">1903</td>
+              
+              
             </tr>
           </table>
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func.html b/report/rewards/transfer-strategies/TransferStrategyBase.sol.func.html
similarity index 57%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func.html
rename to report/rewards/transfer-strategies/TransferStrategyBase.sol.func.html
index 4a7b7bdd..ce59f793 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.func.html
+++ b/report/rewards/transfer-strategies/TransferStrategyBase.sol.func.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol - functions</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/TransferStrategyBase.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (<a href="TransferStrategyBase.sol.gcov.html">source</a> / functions)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (<a href="TransferStrategyBase.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,21 +53,28 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
           <table cellpadding=1 cellspacing=1 border=0>
             <tr><td><br></td></tr>
             <tr>
-              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
               
-              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="TransferStrategyBase.sol.func-c.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="TransferStrategyBase.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L16">TransferStrategyBase.</a></td>
+              
+              <td class="coverFnHi">344</td>
               
               
             </tr>
@@ -91,13 +98,27 @@
               <td class="coverFnHi">1</td>
               
               
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L24">TransferStrategyBase.onlyIncentivesController</a></td>
+              
+              <td class="coverFnHi">1903</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="TransferStrategyBase.sol.gcov.html#L32">TransferStrategyBase.onlyRewardsAdmin</a></td>
+              
+              <td class="coverFnHi">1</td>
+              
+              
             </tr>
           </table>
           <br>
           </center>
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html b/report/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html
similarity index 78%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html
rename to report/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html
index 7ae8da4c..6eb5665f 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html
+++ b/report/rewards/transfer-strategies/TransferStrategyBase.sol.gcov.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies/TransferStrategyBase.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - <a href="index.html">periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (source / <a href="TransferStrategyBase.sol.func-c.html">functions</a>)</span></td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory rewards/transfer-strategies">rewards/transfer-strategies</a> - TransferStrategyBase.sol<span style="font-size: 80%;"> (source / <a href="TransferStrategyBase.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -32,17 +32,17 @@
             <td></td>
             <td class="headerItem">Lines:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntry">8</td>
+            <td class="headerCovTableEntry">8</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">3</td>
-            <td class="headerCovTableEntry">3</td>
+            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntry">6</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <table cellpadding=0 cellspacing=0 border=0>
@@ -73,8 +73,8 @@
 <span id="L2"><span class="lineNum">       2</span>                 :             : pragma solidity ^0.8.10;</span>
 <span id="L3"><span class="lineNum">       3</span>                 :             : </span>
 <span id="L4"><span class="lineNum">       4</span>                 :             : import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';</span>
-<span id="L5"><span class="lineNum">       5</span>                 :             : import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
-<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';</span>
+<span id="L5"><span class="lineNum">       5</span>                 :             : import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';</span>
+<span id="L6"><span class="lineNum">       6</span>                 :             : import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';</span>
 <span id="L7"><span class="lineNum">       7</span>                 :             : </span>
 <span id="L8"><span class="lineNum">       8</span>                 :             : /**</span>
 <span id="L9"><span class="lineNum">       9</span>                 :             :  * @title TransferStrategyStorage</span>
@@ -87,15 +87,15 @@
 <span id="L16"><span class="lineNum">      16</span>                 :             :   address internal immutable REWARDS_ADMIN;</span>
 <span id="L17"><span class="lineNum">      17</span>                 :             : </span>
 <span id="L18"><span class="lineNum">      18</span>                 :             :   constructor(address incentivesController, address rewardsAdmin) {</span>
-<span id="L19"><span class="lineNum">      19</span>                 :             :     INCENTIVES_CONTROLLER = incentivesController;</span>
-<span id="L20"><span class="lineNum">      20</span>                 :             :     REWARDS_ADMIN = rewardsAdmin;</span>
+<span id="L19"><span class="lineNum">      19</span>                 :<span class="tlaGNC tlaBgGNC">         344 :     INCENTIVES_CONTROLLER = incentivesController;</span></span>
+<span id="L20"><span class="lineNum">      20</span>                 :<span class="tlaGNC">         398 :     REWARDS_ADMIN = rewardsAdmin;</span></span>
 <span id="L21"><span class="lineNum">      21</span>                 :             :   }</span>
 <span id="L22"><span class="lineNum">      22</span>                 :             : </span>
 <span id="L23"><span class="lineNum">      23</span>                 :             :   /**</span>
 <span id="L24"><span class="lineNum">      24</span>                 :             :    * @dev Modifier for incentives controller only functions</span>
 <span id="L25"><span class="lineNum">      25</span>                 :             :    */</span>
 <span id="L26"><span class="lineNum">      26</span>                 :             :   modifier onlyIncentivesController() {</span>
-<span id="L27"><span class="lineNum">      27</span>                 :             :     require(INCENTIVES_CONTROLLER == msg.sender, 'CALLER_NOT_INCENTIVES_CONTROLLER');</span>
+<span id="L27"><span class="lineNum">      27</span>                 :<span class="tlaGNC">        1903 :     require(INCENTIVES_CONTROLLER == msg.sender, 'CALLER_NOT_INCENTIVES_CONTROLLER');</span></span>
 <span id="L28"><span class="lineNum">      28</span>                 :             :     _;</span>
 <span id="L29"><span class="lineNum">      29</span>                 :             :   }</span>
 <span id="L30"><span class="lineNum">      30</span>                 :             : </span>
@@ -103,18 +103,18 @@
 <span id="L32"><span class="lineNum">      32</span>                 :             :    * @dev Modifier for reward admin only functions</span>
 <span id="L33"><span class="lineNum">      33</span>                 :             :    */</span>
 <span id="L34"><span class="lineNum">      34</span>                 :             :   modifier onlyRewardsAdmin() {</span>
-<span id="L35"><span class="lineNum">      35</span>                 :             :     require(msg.sender == REWARDS_ADMIN, 'ONLY_REWARDS_ADMIN');</span>
+<span id="L35"><span class="lineNum">      35</span>                 :<span class="tlaGNC">           1 :     require(msg.sender == REWARDS_ADMIN, 'ONLY_REWARDS_ADMIN');</span></span>
 <span id="L36"><span class="lineNum">      36</span>                 :             :     _;</span>
 <span id="L37"><span class="lineNum">      37</span>                 :             :   }</span>
 <span id="L38"><span class="lineNum">      38</span>                 :             : </span>
 <span id="L39"><span class="lineNum">      39</span>                 :             :   /// @inheritdoc ITransferStrategyBase</span>
-<span id="L40"><span class="lineNum">      40</span>                 :<span class="tlaGNC tlaBgGNC">           1 :   function getIncentivesController() external view override returns (address) {</span></span>
-<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">           2 :     return INCENTIVES_CONTROLLER;</span></span>
+<span id="L40"><span class="lineNum">      40</span>                 :             :   function getIncentivesController() external view override returns (address) {</span>
+<span id="L41"><span class="lineNum">      41</span>                 :<span class="tlaGNC">           1 :     return INCENTIVES_CONTROLLER;</span></span>
 <span id="L42"><span class="lineNum">      42</span>                 :             :   }</span>
 <span id="L43"><span class="lineNum">      43</span>                 :             : </span>
 <span id="L44"><span class="lineNum">      44</span>                 :             :   /// @inheritdoc ITransferStrategyBase</span>
-<span id="L45"><span class="lineNum">      45</span>                 :<span class="tlaGNC">           1 :   function getRewardsAdmin() external view override returns (address) {</span></span>
-<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           2 :     return REWARDS_ADMIN;</span></span>
+<span id="L45"><span class="lineNum">      45</span>                 :             :   function getRewardsAdmin() external view override returns (address) {</span>
+<span id="L46"><span class="lineNum">      46</span>                 :<span class="tlaGNC">           1 :     return REWARDS_ADMIN;</span></span>
 <span id="L47"><span class="lineNum">      47</span>                 :             :   }</span>
 <span id="L48"><span class="lineNum">      48</span>                 :             : </span>
 <span id="L49"><span class="lineNum">      49</span>                 :             :   /// @inheritdoc ITransferStrategyBase</span>
@@ -125,14 +125,14 @@
 <span id="L54"><span class="lineNum">      54</span>                 :             :   ) external virtual returns (bool);</span>
 <span id="L55"><span class="lineNum">      55</span>                 :             : </span>
 <span id="L56"><span class="lineNum">      56</span>                 :             :   /// @inheritdoc ITransferStrategyBase</span>
-<span id="L57"><span class="lineNum">      57</span>                 :<span class="tlaGNC">           1 :   function emergencyWithdrawal(</span></span>
+<span id="L57"><span class="lineNum">      57</span>                 :             :   function emergencyWithdrawal(</span>
 <span id="L58"><span class="lineNum">      58</span>                 :             :     address token,</span>
 <span id="L59"><span class="lineNum">      59</span>                 :             :     address to,</span>
 <span id="L60"><span class="lineNum">      60</span>                 :             :     uint256 amount</span>
 <span id="L61"><span class="lineNum">      61</span>                 :             :   ) external onlyRewardsAdmin {</span>
-<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           2 :     IERC20(token).safeTransfer(to, amount);</span></span>
+<span id="L62"><span class="lineNum">      62</span>                 :<span class="tlaGNC">           1 :     IERC20(token).safeTransfer(to, amount);</span></span>
 <span id="L63"><span class="lineNum">      63</span>                 :             : </span>
-<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           2 :     emit EmergencyWithdrawal(msg.sender, token, to, amount);</span></span>
+<span id="L64"><span class="lineNum">      64</span>                 :<span class="tlaGNC">           1 :     emit EmergencyWithdrawal(msg.sender, token, to, amount);</span></span>
 <span id="L65"><span class="lineNum">      65</span>                 :             :   }</span>
 <span id="L66"><span class="lineNum">      66</span>                 :             : }</span>
         </pre>
@@ -142,8 +142,8 @@
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-b.html b/report/rewards/transfer-strategies/index-sort-b.html
similarity index 60%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-b.html
rename to report/rewards/transfer-strategies/index-sort-b.html
index 93cc44a3..3a810862 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-b.html
+++ b/report/rewards/transfer-strategies/index-sort-b.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - rewards/transfer-strategies</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">15</td>
-            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntryHi">93.3&nbsp;%</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html">PullRewardsTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol">PullRewardsTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html">StakedTokenTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol">StakedTokenTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">12</td>
               <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html">TransferStrategyBase.sol</a></td>
+              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol">TransferStrategyBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-f.html b/report/rewards/transfer-strategies/index-sort-f.html
similarity index 60%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-f.html
rename to report/rewards/transfer-strategies/index-sort-f.html
index a0bf2774..dd9ad31f 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-f.html
+++ b/report/rewards/transfer-strategies/index-sort-f.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - rewards/transfer-strategies</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">15</td>
-            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntryHi">93.3&nbsp;%</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html">PullRewardsTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol">StakedTokenTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html">TransferStrategyBase.sol</a></td>
+              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol">PullRewardsTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">4</td>
@@ -126,9 +126,9 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html">StakedTokenTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol">TransferStrategyBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">8</td>
@@ -137,16 +137,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-l.html b/report/rewards/transfer-strategies/index-sort-l.html
similarity index 60%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-l.html
rename to report/rewards/transfer-strategies/index-sort-l.html
index 5949512f..d96ecee6 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index-sort-l.html
+++ b/report/rewards/transfer-strategies/index-sort-l.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - rewards/transfer-strategies</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">15</td>
-            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntryHi">93.3&nbsp;%</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><a href="index.html"><img src="../../updown.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></a></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,24 +96,24 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html">PullRewardsTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol">StakedTokenTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">12</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html">TransferStrategyBase.sol</a></td>
+              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol">PullRewardsTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">4</td>
@@ -126,9 +126,9 @@
               <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html">StakedTokenTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol">TransferStrategyBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
               <td class="coverNumDflt">8</td>
@@ -137,16 +137,16 @@
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html b/report/rewards/transfer-strategies/index.html
similarity index 60%
rename from report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html
rename to report/rewards/transfer-strategies/index.html
index 1059339f..c141bbe9 100644
--- a/report/periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies/index.html
+++ b/report/rewards/transfer-strategies/index.html
@@ -4,22 +4,22 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>LCOV - lcov.info.p - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</title>
-  <link rel="stylesheet" type="text/css" href="../../../../../../../../../gcov.css">
+  <title>LCOV - lcov.info.p - rewards/transfer-strategies</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
 </head>
 
 <body>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
             <tr><td class="title">LCOV - code coverage report</td></tr>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
 
             <tr>
               <td width="100%">
                 <table cellpadding=1 border=0 width="100%">
           <tr>
             <td width="10%" class="headerItem">Current view:</td>
-            <td width="10%" class="headerValue"><a href="../../../../../../../../../index.html">top level</a> - periphery/contracts/rewards/transfer-strategies/src/periphery/contracts/rewards/transfer-strategies</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - rewards/transfer-strategies</td>
             <td width="5%"></td>
             <td width="5%"></td>
             <td width="5%" class="headerCovTableHead">Coverage</td>
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info.p</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">15</td>
-            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntryMed">83.3&nbsp;%</td>
+            <td class="headerCovTableEntry">24</td>
+            <td class="headerCovTableEntry">20</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-04-09 14:12:28</td>
+            <td class="headerValue">2024-09-24 09:34:24</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">10</td>
-            <td class="headerCovTableEntry">10</td>
+            <td class="headerCovTableEntryHi">93.3&nbsp;%</td>
+            <td class="headerCovTableEntry">15</td>
+            <td class="headerCovTableEntry">14</td>
           </tr>
           <tr>
             <td></td>
@@ -53,12 +53,12 @@
             <td class="headerCovTableEntry">0</td>
             <td class="headerCovTableEntry">0</td>
           </tr>
-                  <tr><td><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
               </td>
             </tr>
 
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
           </table>
 
           <center>
@@ -79,10 +79,10 @@
             </tr>
 
             <tr>
-              <td class="tableHead" rowspan=2>Filename <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../../../../../../../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
-        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
-        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../../../../../../../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
+              <td class="tableHead" rowspan=2>File <span  title="Click to sort table by file name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by file name" title="Click to sort table by file name" border=0></span></td>
+        <td class="tableHead" colspan=4>Line Coverage <span  title="Click to sort table by line coverage" class="tableHeadSort"><a href="index-sort-l.html"><img src="../../updown.png" width=10 height=14 alt="Sort by line coverage" title="Click to sort table by line coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Branch Coverage <span  title="Click to sort table by branch coverage" class="tableHeadSort"><a href="index-sort-b.html"><img src="../../updown.png" width=10 height=14 alt="Sort by branch coverage" title="Click to sort table by branch coverage" border=0></a></span></td>
+        <td class="tableHead" colspan=3>Function Coverage <span  title="Click to sort table by function coverage" class="tableHeadSort"><a href="index-sort-f.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function coverage" title="Click to sort table by function coverage" border=0></a></span></td>
             </tr>
             <tr>
                     <td class="tableHead" colspan=2> Rate</td>
@@ -96,57 +96,57 @@
                     <td class="tableHead"> Hit</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html">PullRewardsTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="PullRewardsTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol">PullRewardsTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">4</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">2</td>
-              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">3</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html">StakedTokenTransferStrategy.sol</a></td>
+              <td class="coverFile"><a href="StakedTokenTransferStrategy.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol">StakedTokenTransferStrategy.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=67 height=10 alt="66.7%"><img src="../../snow.png" width=33 height=10 alt="66.7%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">8</td>
+              <td class="coverPerLo">66.7&nbsp;%</td>
+              <td class="coverNumDflt">12</td>
               <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">5</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
+              <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">5</td>
             </tr>
             <tr>
-              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html">TransferStrategyBase.sol</a></td>
+              <td class="coverFile"><a href="TransferStrategyBase.sol.gcov.html" title="Click to go to file /Users/sakulstra/Documents/BGD/aave-v3-origin-private/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol">TransferStrategyBase.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../../../../../../../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
               </td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">8</td>
+              <td class="coverNumDflt">8</td>
               <td class="coverPerHi">-</td>
               <td class="coverNumDflt"></td>
               <td class="coverNumDflt"></td>
               <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">3</td>
-              <td class="coverNumDflt">3</td>
+              <td class="coverNumDflt">6</td>
+              <td class="coverNumDflt">6</td>
             </tr>
           </table>
           </center>
           <br>
 
           <table width="100%" border=0 cellspacing=0 cellpadding=0>
-            <tr><td class="ruler"><img src="../../../../../../../../../glass.png" width=3 height=3 alt=""></td></tr>
-            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.0-1</a></td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov">LCOV version 2.1-1</a></td></tr>
           </table>
           <br>
 
diff --git a/scripts/misc/LibraryPreCompileOne.sol b/scripts/misc/LibraryPreCompileOne.sol
index 502b5cdf..746a7920 100644
--- a/scripts/misc/LibraryPreCompileOne.sol
+++ b/scripts/misc/LibraryPreCompileOne.sol
@@ -71,16 +71,16 @@ contract LibraryPreCompileOne is FfiUtils, Script, DeployUtils {
     return
       string(
         abi.encodePacked(
-          'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol:BorrowLogic:',
+          'src/contracts/protocol/libraries/logic/BorrowLogic.sol:BorrowLogic:',
           vm.toString(report.borrowLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/BridgeLogic.sol:BridgeLogic:',
+          'src/contracts/protocol/libraries/logic/BridgeLogic.sol:BridgeLogic:',
           vm.toString(report.bridgeLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol:ConfiguratorLogic:',
+          'src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol:ConfiguratorLogic:',
           vm.toString(report.configuratorLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/EModeLogic.sol:EModeLogic:',
+          'src/contracts/protocol/libraries/logic/EModeLogic.sol:EModeLogic:',
           vm.toString(report.eModeLogic)
         )
       );
diff --git a/scripts/misc/LibraryPreCompileTwo.sol b/scripts/misc/LibraryPreCompileTwo.sol
index cab49cec..9b381a66 100644
--- a/scripts/misc/LibraryPreCompileTwo.sol
+++ b/scripts/misc/LibraryPreCompileTwo.sol
@@ -71,16 +71,16 @@ contract LibraryPreCompileTwo is FfiUtils, Script, DeployUtils {
       string(
         abi.encodePacked(
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/FlashLoanLogic.sol:FlashLoanLogic:',
+          'src/contracts/protocol/libraries/logic/FlashLoanLogic.sol:FlashLoanLogic:',
           vm.toString(report.flashLoanLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/LiquidationLogic.sol:LiquidationLogic:',
+          'src/contracts/protocol/libraries/logic/LiquidationLogic.sol:LiquidationLogic:',
           vm.toString(report.liquidationLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/PoolLogic.sol:PoolLogic:',
+          'src/contracts/protocol/libraries/logic/PoolLogic.sol:PoolLogic:',
           vm.toString(report.poolLogic),
           ',',
-          'aave-v3-core/contracts/protocol/libraries/logic/SupplyLogic.sol:SupplyLogic:',
+          'src/contracts/protocol/libraries/logic/SupplyLogic.sol:SupplyLogic:',
           vm.toString(report.supplyLogic)
         )
       );
diff --git a/src/core/contracts/dependencies/chainlink/AggregatorInterface.sol b/src/contracts/dependencies/chainlink/AggregatorInterface.sol
similarity index 100%
rename from src/core/contracts/dependencies/chainlink/AggregatorInterface.sol
rename to src/contracts/dependencies/chainlink/AggregatorInterface.sol
diff --git a/src/core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol b/src/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol
similarity index 100%
rename from src/core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol
rename to src/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol
diff --git a/src/periphery/contracts/dependencies/openzeppelin/ReentrancyGuard.sol b/src/contracts/dependencies/openzeppelin/ReentrancyGuard.sol
similarity index 100%
rename from src/periphery/contracts/dependencies/openzeppelin/ReentrancyGuard.sol
rename to src/contracts/dependencies/openzeppelin/ReentrancyGuard.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/AccessControl.sol b/src/contracts/dependencies/openzeppelin/contracts/AccessControl.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/AccessControl.sol
rename to src/contracts/dependencies/openzeppelin/contracts/AccessControl.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/Address.sol b/src/contracts/dependencies/openzeppelin/contracts/Address.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/Address.sol
rename to src/contracts/dependencies/openzeppelin/contracts/Address.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/Context.sol b/src/contracts/dependencies/openzeppelin/contracts/Context.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/Context.sol
rename to src/contracts/dependencies/openzeppelin/contracts/Context.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/ERC165.sol b/src/contracts/dependencies/openzeppelin/contracts/ERC165.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/ERC165.sol
rename to src/contracts/dependencies/openzeppelin/contracts/ERC165.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/ERC20.sol b/src/contracts/dependencies/openzeppelin/contracts/ERC20.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/ERC20.sol
rename to src/contracts/dependencies/openzeppelin/contracts/ERC20.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol b/src/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol
rename to src/contracts/dependencies/openzeppelin/contracts/IAccessControl.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/IERC165.sol b/src/contracts/dependencies/openzeppelin/contracts/IERC165.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/IERC165.sol
rename to src/contracts/dependencies/openzeppelin/contracts/IERC165.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol b/src/contracts/dependencies/openzeppelin/contracts/IERC20.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/IERC20.sol
rename to src/contracts/dependencies/openzeppelin/contracts/IERC20.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol b/src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol
rename to src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/Ownable.sol b/src/contracts/dependencies/openzeppelin/contracts/Ownable.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/Ownable.sol
rename to src/contracts/dependencies/openzeppelin/contracts/Ownable.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol b/src/contracts/dependencies/openzeppelin/contracts/SafeCast.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol
rename to src/contracts/dependencies/openzeppelin/contracts/SafeCast.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol b/src/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol
rename to src/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol b/src/contracts/dependencies/openzeppelin/contracts/SafeMath.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol
rename to src/contracts/dependencies/openzeppelin/contracts/SafeMath.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/contracts/Strings.sol b/src/contracts/dependencies/openzeppelin/contracts/Strings.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/contracts/Strings.sol
rename to src/contracts/dependencies/openzeppelin/contracts/Strings.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/AdminUpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/BaseAdminUpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol b/src/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/Initializable.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/InitializableAdminUpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/Proxy.sol
diff --git a/src/core/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol b/src/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol
similarity index 100%
rename from src/core/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol
rename to src/contracts/dependencies/openzeppelin/upgradeability/UpgradeabilityProxy.sol
diff --git a/src/core/contracts/dependencies/weth/WETH9.sol b/src/contracts/dependencies/weth/WETH9.sol
similarity index 100%
rename from src/core/contracts/dependencies/weth/WETH9.sol
rename to src/contracts/dependencies/weth/WETH9.sol
diff --git a/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol b/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol
similarity index 95%
rename from src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol
rename to src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol
index d4ebff35..0f91ff05 100644
--- a/src/periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol
+++ b/src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import {IFeeClaimer} from './interfaces/IFeeClaimer.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title AaveParaSwapFeeClaimer
diff --git a/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol b/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol
similarity index 79%
rename from src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol
index 247f4437..45988edf 100644
--- a/src/periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol
@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {FlashLoanSimpleReceiverBase} from 'aave-v3-core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPriceOracleGetter} from 'aave-v3-core/contracts/interfaces/IPriceOracleGetter.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
+import {FlashLoanSimpleReceiverBase} from '../../misc/flashloan/base/FlashLoanSimpleReceiverBase.sol';
+import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IPriceOracleGetter} from '../../interfaces/IPriceOracleGetter.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
 
 /**
  * @title BaseParaSwapAdapter
diff --git a/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol b/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol
similarity index 89%
rename from src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol
index 522ac1c8..abff3e87 100644
--- a/src/periphery/contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/BaseParaSwapBuyAdapter.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';
diff --git a/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol b/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol
similarity index 89%
rename from src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol
index ce34288c..2b5a306f 100644
--- a/src/periphery/contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/BaseParaSwapSellAdapter.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
+import {PercentageMath} from '../../protocol/libraries/math/PercentageMath.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {BaseParaSwapAdapter} from './BaseParaSwapAdapter.sol';
diff --git a/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol b/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol
similarity index 94%
rename from src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol
index 7852f16e..db855a33 100644
--- a/src/periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {BaseParaSwapSellAdapter} from './BaseParaSwapSellAdapter.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
diff --git a/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol b/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol
similarity index 90%
rename from src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol
index f199b9ba..659aae7c 100644
--- a/src/periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {SafeMath} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeMath.sol';
+import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {BaseParaSwapBuyAdapter} from './BaseParaSwapBuyAdapter.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
@@ -222,13 +222,13 @@ contract ParaSwapRepayAdapter is BaseParaSwapBuyAdapter, ReentrancyGuard {
     uint256 debtRepayAmount,
     address initiator
   ) private view returns (uint256) {
+    require(
+      DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.VARIABLE,
+      'INVALID_RATE_MODE'
+    );
     DataTypes.ReserveDataLegacy memory debtReserveData = _getReserveData(address(debtAsset));
 
-    address debtToken = DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.STABLE
-      ? debtReserveData.stableDebtTokenAddress
-      : debtReserveData.variableDebtTokenAddress;
-
-    uint256 currentDebt = IERC20(debtToken).balanceOf(initiator);
+    uint256 currentDebt = IERC20(debtReserveData.variableDebtTokenAddress).balanceOf(initiator);
 
     if (buyAllBalanceOffset != 0) {
       require(currentDebt <= debtRepayAmount, 'INSUFFICIENT_AMOUNT_TO_REPAY');
diff --git a/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol b/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol
similarity index 87%
rename from src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol
rename to src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol
index 499c7d6a..2522ee88 100644
--- a/src/periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol
+++ b/src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.8.10;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
 import {BaseParaSwapSellAdapter} from './BaseParaSwapSellAdapter.sol';
 import {IParaSwapAugustusRegistry} from './interfaces/IParaSwapAugustusRegistry.sol';
-import {SafeERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {SafeERC20} from '../../dependencies/openzeppelin/contracts/SafeERC20.sol';
 import {IParaSwapAugustus} from './interfaces/IParaSwapAugustus.sol';
 import {ReentrancyGuard} from '../../dependencies/openzeppelin/ReentrancyGuard.sol';
 
diff --git a/src/periphery/contracts/adapters/paraswap/interfaces/IFeeClaimer.sol b/src/contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol
similarity index 97%
rename from src/periphery/contracts/adapters/paraswap/interfaces/IFeeClaimer.sol
rename to src/contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol
index 5fd9d59a..161bcd51 100644
--- a/src/periphery/contracts/adapters/paraswap/interfaces/IFeeClaimer.sol
+++ b/src/contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: ISC
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 interface IFeeClaimer {
   /**
diff --git a/src/periphery/contracts/adapters/paraswap/interfaces/IParaSwapAugustus.sol b/src/contracts/extensions/paraswap-adapters/interfaces/IParaSwapAugustus.sol
similarity index 100%
rename from src/periphery/contracts/adapters/paraswap/interfaces/IParaSwapAugustus.sol
rename to src/contracts/extensions/paraswap-adapters/interfaces/IParaSwapAugustus.sol
diff --git a/src/periphery/contracts/adapters/paraswap/interfaces/IParaSwapAugustusRegistry.sol b/src/contracts/extensions/paraswap-adapters/interfaces/IParaSwapAugustusRegistry.sol
similarity index 100%
rename from src/periphery/contracts/adapters/paraswap/interfaces/IParaSwapAugustusRegistry.sol
rename to src/contracts/extensions/paraswap-adapters/interfaces/IParaSwapAugustusRegistry.sol
diff --git a/src/periphery/contracts/static-a-token/ERC20AaveLMUpgradeable.sol b/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol
similarity index 99%
rename from src/periphery/contracts/static-a-token/ERC20AaveLMUpgradeable.sol
rename to src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol
index 651c2fa0..71d52c59 100644
--- a/src/periphery/contracts/static-a-token/ERC20AaveLMUpgradeable.sol
+++ b/src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol
@@ -6,7 +6,7 @@ import {IERC20} from 'openzeppelin-contracts/contracts/interfaces/IERC20.sol';
 import {SafeERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 import {SafeCast} from 'solidity-utils/contracts/oz-common/SafeCast.sol';
 
-import {IRewardsController} from '../rewards/interfaces/IRewardsController.sol';
+import {IRewardsController} from '../../rewards/interfaces/IRewardsController.sol';
 import {IERC20AaveLM} from './interfaces/IERC20AaveLM.sol';
 
 /**
@@ -45,6 +45,7 @@ abstract contract ERC20AaveLMUpgradeable is ERC20Upgradeable, IERC20AaveLM {
   function __ERC20AaveLM_init(address referenceAsset_) internal onlyInitializing {
     __ERC20AaveLM_init_unchained(referenceAsset_);
   }
+
   function __ERC20AaveLM_init_unchained(address referenceAsset_) internal onlyInitializing {
     ERC20AaveLMStorage storage $ = _getERC20AaveLMStorage();
     $._referenceAsset = referenceAsset_;
diff --git a/src/periphery/contracts/static-a-token/ERC4626StataTokenUpgradeable.sol b/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol
similarity index 97%
rename from src/periphery/contracts/static-a-token/ERC4626StataTokenUpgradeable.sol
rename to src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol
index 2a2d0cdd..060fc135 100644
--- a/src/periphery/contracts/static-a-token/ERC4626StataTokenUpgradeable.sol
+++ b/src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol
@@ -5,9 +5,9 @@ import {ERC4626Upgradeable, Math, IERC4626} from 'openzeppelin-contracts-upgrade
 import {SafeERC20, IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol';
 import {IERC20Permit} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol';
 
-import {IPool, IPoolAddressesProvider} from '../../../core/contracts/interfaces/IPool.sol';
-import {IAaveOracle} from '../../../core/contracts/interfaces/IAaveOracle.sol';
-import {DataTypes, ReserveConfiguration} from '../../../core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IPool, IPoolAddressesProvider} from '../../interfaces/IPool.sol';
+import {IAaveOracle} from '../../interfaces/IAaveOracle.sol';
+import {DataTypes, ReserveConfiguration} from '../../protocol/libraries/configuration/ReserveConfiguration.sol';
 
 import {IAToken} from './interfaces/IAToken.sol';
 import {IERC4626StataToken} from './interfaces/IERC4626StataToken.sol';
diff --git a/src/periphery/contracts/static-a-token/README.md b/src/contracts/extensions/static-a-token/README.md
similarity index 100%
rename from src/periphery/contracts/static-a-token/README.md
rename to src/contracts/extensions/static-a-token/README.md
diff --git a/src/periphery/contracts/static-a-token/StataTokenFactory.sol b/src/contracts/extensions/static-a-token/StataTokenFactory.sol
similarity index 97%
rename from src/periphery/contracts/static-a-token/StataTokenFactory.sol
rename to src/contracts/extensions/static-a-token/StataTokenFactory.sol
index e7ba0929..5ca2bb28 100644
--- a/src/periphery/contracts/static-a-token/StataTokenFactory.sol
+++ b/src/contracts/extensions/static-a-token/StataTokenFactory.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IPool, DataTypes} from '../../../core/contracts/interfaces/IPool.sol';
 import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';
+import {IPool, DataTypes} from '../../../contracts/interfaces/IPool.sol';
 import {StataTokenV2} from './StataTokenV2.sol';
 import {IStataTokenFactory} from './interfaces/IStataTokenFactory.sol';
 
diff --git a/src/periphery/contracts/static-a-token/StataTokenV2.sol b/src/contracts/extensions/static-a-token/StataTokenV2.sol
similarity index 98%
rename from src/periphery/contracts/static-a-token/StataTokenV2.sol
rename to src/contracts/extensions/static-a-token/StataTokenV2.sol
index f3784053..f2af30b7 100644
--- a/src/periphery/contracts/static-a-token/StataTokenV2.sol
+++ b/src/contracts/extensions/static-a-token/StataTokenV2.sol
@@ -8,7 +8,7 @@ import {IRescuable, Rescuable} from 'solidity-utils/contracts/utils/Rescuable.so
 import {IRescuableBase, RescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {IERC20Permit} from '@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol';
 
-import {IACLManager} from '../../../core/contracts/interfaces/IACLManager.sol';
+import {IACLManager} from '../../../contracts/interfaces/IACLManager.sol';
 import {ERC4626Upgradeable, ERC4626StataTokenUpgradeable, IPool, Math, IERC20} from './ERC4626StataTokenUpgradeable.sol';
 import {ERC20AaveLMUpgradeable, IRewardsController} from './ERC20AaveLMUpgradeable.sol';
 import {IStataTokenV2} from './interfaces/IStataTokenV2.sol';
diff --git a/src/periphery/contracts/static-a-token/inheritance.png b/src/contracts/extensions/static-a-token/inheritance.png
similarity index 100%
rename from src/periphery/contracts/static-a-token/inheritance.png
rename to src/contracts/extensions/static-a-token/inheritance.png
diff --git a/src/periphery/contracts/static-a-token/interfaces/IAToken.sol b/src/contracts/extensions/static-a-token/interfaces/IAToken.sol
similarity index 100%
rename from src/periphery/contracts/static-a-token/interfaces/IAToken.sol
rename to src/contracts/extensions/static-a-token/interfaces/IAToken.sol
diff --git a/src/periphery/contracts/static-a-token/interfaces/IERC20AaveLM.sol b/src/contracts/extensions/static-a-token/interfaces/IERC20AaveLM.sol
similarity index 100%
rename from src/periphery/contracts/static-a-token/interfaces/IERC20AaveLM.sol
rename to src/contracts/extensions/static-a-token/interfaces/IERC20AaveLM.sol
diff --git a/src/periphery/contracts/static-a-token/interfaces/IERC4626StataToken.sol b/src/contracts/extensions/static-a-token/interfaces/IERC4626StataToken.sol
similarity index 100%
rename from src/periphery/contracts/static-a-token/interfaces/IERC4626StataToken.sol
rename to src/contracts/extensions/static-a-token/interfaces/IERC4626StataToken.sol
diff --git a/src/periphery/contracts/static-a-token/interfaces/IStataTokenFactory.sol b/src/contracts/extensions/static-a-token/interfaces/IStataTokenFactory.sol
similarity index 100%
rename from src/periphery/contracts/static-a-token/interfaces/IStataTokenFactory.sol
rename to src/contracts/extensions/static-a-token/interfaces/IStataTokenFactory.sol
diff --git a/src/periphery/contracts/static-a-token/interfaces/IStataTokenV2.sol b/src/contracts/extensions/static-a-token/interfaces/IStataTokenV2.sol
similarity index 100%
rename from src/periphery/contracts/static-a-token/interfaces/IStataTokenV2.sol
rename to src/contracts/extensions/static-a-token/interfaces/IStataTokenV2.sol
diff --git a/src/periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol b/src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol
similarity index 94%
rename from src/periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol
rename to src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol
index 25b07174..3c9df057 100644
--- a/src/periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol
@@ -30,7 +30,6 @@ contract AaveV3ConfigEngine is IAaveV3ConfigEngine {
   IAaveOracle public immutable ORACLE;
   address public immutable ATOKEN_IMPL;
   address public immutable VTOKEN_IMPL;
-  address public immutable STOKEN_IMPL;
   address public immutable REWARDS_CONTROLLER;
   address public immutable COLLECTOR;
   address public immutable DEFAULT_INTEREST_RATE_STRATEGY;
@@ -47,14 +46,12 @@ contract AaveV3ConfigEngine is IAaveV3ConfigEngine {
    * @dev Constructor.
    * @param aTokenImpl The address of default aToken implementation.
    * @param vTokenImpl The address of default variable debt token implementation.
-   * @param sTokenImpl The address of default stable debt token implementation.
    * @param engineConstants The struct containing all the engine constants.
    * @param engineLibraries The struct containing the addresses of stateless libraries containing the engine logic.
    */
   constructor(
     address aTokenImpl,
     address vTokenImpl,
-    address sTokenImpl,
     EngineConstants memory engineConstants,
     EngineLibraries memory engineLibraries
   ) {
@@ -68,10 +65,7 @@ contract AaveV3ConfigEngine is IAaveV3ConfigEngine {
       'ONLY_NONZERO_ENGINE_CONSTANTS'
     );
 
-    require(
-      aTokenImpl != address(0) && vTokenImpl != address(0) && sTokenImpl != address(0),
-      'ONLY_NONZERO_TOKEN_IMPLS'
-    );
+    require(aTokenImpl != address(0) && vTokenImpl != address(0), 'ONLY_NONZERO_TOKEN_IMPLS');
 
     require(
       engineLibraries.borrowEngine != address(0) &&
@@ -84,7 +78,6 @@ contract AaveV3ConfigEngine is IAaveV3ConfigEngine {
 
     ATOKEN_IMPL = aTokenImpl;
     VTOKEN_IMPL = vTokenImpl;
-    STOKEN_IMPL = sTokenImpl;
     POOL = engineConstants.pool;
     POOL_CONFIGURATOR = engineConstants.poolConfigurator;
     ORACLE = engineConstants.oracle;
@@ -108,11 +101,7 @@ contract AaveV3ConfigEngine is IAaveV3ConfigEngine {
     for (uint256 i = 0; i < listings.length; i++) {
       customListings[i] = ListingWithCustomImpl({
         base: listings[i],
-        implementations: TokenImplementations({
-          aToken: ATOKEN_IMPL,
-          vToken: VTOKEN_IMPL,
-          sToken: STOKEN_IMPL
-        })
+        implementations: TokenImplementations({aToken: ATOKEN_IMPL, vToken: VTOKEN_IMPL})
       });
     }
 
diff --git a/src/periphery/contracts/v3-config-engine/AaveV3Payload.sol b/src/contracts/extensions/v3-config-engine/AaveV3Payload.sol
similarity index 93%
rename from src/periphery/contracts/v3-config-engine/AaveV3Payload.sol
rename to src/contracts/extensions/v3-config-engine/AaveV3Payload.sol
index 57ed5837..50ecc07a 100644
--- a/src/periphery/contracts/v3-config-engine/AaveV3Payload.sol
+++ b/src/contracts/extensions/v3-config-engine/AaveV3Payload.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
-import {WadRayMath} from '../../../core/contracts/protocol/libraries/math/WadRayMath.sol';
+import {WadRayMath} from '../../protocol/libraries/math/WadRayMath.sol';
 import {IAaveV3ConfigEngine as IEngine} from './IAaveV3ConfigEngine.sol';
 import {EngineFlags} from './EngineFlags.sol';
 
@@ -18,7 +18,7 @@ import {EngineFlags} from './EngineFlags.sol';
  *   - Updates of caps (supply cap, borrow cap).
  *   - Updates of price feeds
  *   - Updates of interest rate strategies
- *   - Updates of borrow parameters (flashloanable, stableRateModeEnabled, borrowableInIsolation, withSiloedBorrowing, reserveFactor)
+ *   - Updates of borrow parameters (flashloanable, borrowableInIsolation, withSiloedBorrowing, reserveFactor)
  *   - Updates of collateral parameters (ltv, liq threshold, liq bonus, liq protocol fee, debt ceiling)
  *   - Updates of emode category parameters (ltv, liq threshold, liq bonus, price source, label)
  *   - Updates of emode category of assets (e-mode id)
@@ -49,7 +49,7 @@ abstract contract AaveV3Payload {
     IEngine.BorrowUpdate[] memory borrows = borrowsUpdates();
     IEngine.RateStrategyUpdate[] memory rates = rateStrategiesUpdates();
     IEngine.PriceFeedUpdate[] memory priceFeeds = priceFeedsUpdates();
-    IEngine.AssetEModeUpdate[] memory assetsEMode = assetsEModeUpdates();
+    IEngine.AssetEModeUpdate[] memory assetsEModes = assetsEModeUpdates();
     IEngine.CapsUpdate[] memory caps = capsUpdates();
 
     if (eModeCategories.length != 0) {
@@ -98,9 +98,9 @@ abstract contract AaveV3Payload {
       );
     }
 
-    if (assetsEMode.length != 0) {
+    if (assetsEModes.length != 0) {
       address(CONFIG_ENGINE).functionDelegateCall(
-        abi.encodeWithSelector(CONFIG_ENGINE.updateAssetsEMode.selector, assetsEMode)
+        abi.encodeWithSelector(CONFIG_ENGINE.updateAssetsEMode.selector, assetsEModes)
       );
     }
 
@@ -151,7 +151,7 @@ abstract contract AaveV3Payload {
     returns (IEngine.EModeCategoryUpdate[] memory)
   {}
 
-  /// @dev to be defined in the child with a list of assets for which eMode categories to update
+  /// @dev to be defined in the child with a list of assets for which eMode collateral to update
   function assetsEModeUpdates() public view virtual returns (IEngine.AssetEModeUpdate[] memory) {}
 
   /// @dev to be defined in the child with a list of set of parameters of rate strategies
diff --git a/src/periphery/contracts/v3-config-engine/EngineFlags.sol b/src/contracts/extensions/v3-config-engine/EngineFlags.sol
similarity index 100%
rename from src/periphery/contracts/v3-config-engine/EngineFlags.sol
rename to src/contracts/extensions/v3-config-engine/EngineFlags.sol
diff --git a/src/periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol b/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol
similarity index 91%
rename from src/periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol
rename to src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol
index ddbcdf13..500d7eb7 100644
--- a/src/periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {IPool} from '../../../core/contracts/interfaces/IPool.sol';
-import {IPoolConfigurator} from '../../../core/contracts/interfaces/IPoolConfigurator.sol';
-import {IAaveOracle} from '../../../core/contracts/interfaces/IAaveOracle.sol';
-import {IDefaultInterestRateStrategyV2} from '../../../core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
+import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolConfigurator} from '../../interfaces/IPoolConfigurator.sol';
+import {IAaveOracle} from '../../interfaces/IAaveOracle.sol';
+import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';
 
 /// @dev Examples here assume the usage of the `AaveV3Payload` base contracts
 /// contained in this same repository
@@ -67,7 +67,6 @@ interface IAaveV3ConfigEngine {
    *   }),
    *   enabledToBorrow: EngineFlags.ENABLED,
    *   flashloanable: EngineFlags.ENABLED,
-   *   stableRateModeEnabled: EngineFlags.DISABLED,
    *   borrowableInIsolation: EngineFlags.ENABLED,
    *   withSiloedBorrowing:, EngineFlags.DISABLED,
    *   ltv: 70_50, // 70.5%
@@ -87,7 +86,6 @@ interface IAaveV3ConfigEngine {
     address priceFeed;
     InterestRateInputData rateStrategyParams; // Mandatory, no matter if enabled for borrowing or not
     uint256 enabledToBorrow;
-    uint256 stableRateModeEnabled; // Only considered is enabledToBorrow == EngineFlags.ENABLED (true)
     uint256 borrowableInIsolation; // Only considered is enabledToBorrow == EngineFlags.ENABLED (true)
     uint256 withSiloedBorrowing; // Only considered if enabledToBorrow == EngineFlags.ENABLED (true)
     uint256 flashloanable; // Independent from enabled to borrow: an asset can be flashloanble and not enabled to borrow
@@ -99,7 +97,6 @@ interface IAaveV3ConfigEngine {
     uint256 borrowCap; // If passing any value distinct to EngineFlags.KEEP_CURRENT, always configured
     uint256 debtCeiling; // Only considered if liqThreshold > 0
     uint256 liqProtocolFee; // Only considered if liqThreshold > 0
-    uint8 eModeCategory; // If `O`, no eMode category will be set
   }
 
   struct RepackedListings {
@@ -108,7 +105,6 @@ interface IAaveV3ConfigEngine {
     BorrowUpdate[] borrowsUpdates;
     CollateralUpdate[] collateralsUpdates;
     PriceFeedUpdate[] priceFeedsUpdates;
-    AssetEModeUpdate[] assetsEModeUpdates;
     CapsUpdate[] capsUpdates;
     IDefaultInterestRateStrategyV2.InterestRateData[] rates;
   }
@@ -116,7 +112,6 @@ interface IAaveV3ConfigEngine {
   struct TokenImplementations {
     address aToken;
     address vToken;
-    address sToken;
   }
 
   struct ListingWithCustomImpl {
@@ -176,7 +171,6 @@ interface IAaveV3ConfigEngine {
    *   asset: AaveV3EthereumAssets.AAVE_UNDERLYING,
    *   enabledToBorrow: EngineFlags.ENABLED,
    *   flashloanable: EngineFlags.KEEP_CURRENT,
-   *   stableRateModeEnabled: EngineFlags.KEEP_CURRENT,
    *   borrowableInIsolation: EngineFlags.KEEP_CURRENT,
    *   withSiloedBorrowing: EngineFlags.KEEP_CURRENT,
    *   reserveFactor: 15_00, // 15%
@@ -186,7 +180,6 @@ interface IAaveV3ConfigEngine {
     address asset;
     uint256 enabledToBorrow;
     uint256 flashloanable;
-    uint256 stableRateModeEnabled;
     uint256 borrowableInIsolation;
     uint256 withSiloedBorrowing;
     uint256 reserveFactor;
@@ -197,11 +190,15 @@ interface IAaveV3ConfigEngine {
    * AssetEModeUpdate({
    *   asset: AaveV3EthereumAssets.rETH_UNDERLYING,
    *   eModeCategory: 1, // ETH correlated
+   *   borrowable: EngineFlags.ENABLED,
+   *   collateral: EngineFlags.KEEP_CURRENT,
    * })
    */
   struct AssetEModeUpdate {
     address asset;
     uint8 eModeCategory;
+    uint256 borrowable;
+    uint256 collateral;
   }
 
   /**
@@ -211,7 +208,6 @@ interface IAaveV3ConfigEngine {
    *   ltv: 60_00,
    *   liqThreshold: 70_00,
    *   liqBonus: EngineFlags.KEEP_CURRENT,
-   *   priceSource: EngineFlags.KEEP_CURRENT_ADDRESS,
    *   label: EngineFlags.KEEP_CURRENT_STRING
    * })
    */
@@ -220,7 +216,6 @@ interface IAaveV3ConfigEngine {
     uint256 ltv;
     uint256 liqThreshold;
     uint256 liqBonus;
-    address priceSource;
     string label;
   }
 
@@ -308,8 +303,9 @@ interface IAaveV3ConfigEngine {
   function updateEModeCategories(EModeCategoryUpdate[] memory updates) external;
 
   /**
-   * @notice Performs an update of the e-mode category of the assets, in the Aave pool configured in this engine instance
-   * @param updates `AssetEModeUpdate[]` list of declarative updates containing the new parameters
+   * @notice Performs an update of the e-mode category.
+   * Sets a specified asset collateral and/or borrowable, in the Aave pool configured in this engine instance
+   * @param updates `EModeCollateralUpdate[]` list of declarative updates containing the new parameters
    *   More information on the documentation of the struct.
    */
   function updateAssetsEMode(AssetEModeUpdate[] calldata updates) external;
@@ -326,8 +322,6 @@ interface IAaveV3ConfigEngine {
 
   function VTOKEN_IMPL() external view returns (address);
 
-  function STOKEN_IMPL() external view returns (address);
-
   function REWARDS_CONTROLLER() external view returns (address);
 
   function COLLECTOR() external view returns (address);
diff --git a/src/periphery/contracts/v3-config-engine/README.md b/src/contracts/extensions/v3-config-engine/README.md
similarity index 100%
rename from src/periphery/contracts/v3-config-engine/README.md
rename to src/contracts/extensions/v3-config-engine/README.md
diff --git a/src/periphery/contracts/v3-config-engine/libraries/BorrowEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/BorrowEngine.sol
similarity index 76%
rename from src/periphery/contracts/v3-config-engine/libraries/BorrowEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/BorrowEngine.sol
index 4fa237b6..bbe2d8f2 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/BorrowEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/BorrowEngine.sol
@@ -1,9 +1,9 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
 import {EngineFlags} from '../EngineFlags.sol';
-import {DataTypes} from '../../../../core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveConfiguration} from '../../../../core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../../../protocol/libraries/types/DataTypes.sol';
+import {ReserveConfiguration} from '../../../protocol/libraries/configuration/ReserveConfiguration.sol';
 import {IAaveV3ConfigEngine as IEngine, IPoolConfigurator, IPool} from '../IAaveV3ConfigEngine.sol';
 
 library BorrowEngine {
@@ -30,19 +30,10 @@ library BorrowEngine {
           EngineFlags.toBool(updates[i].enabledToBorrow)
         );
       } else {
-        (, , bool borrowingEnabled, , ) = pool.getConfiguration(updates[i].asset).getFlags();
+        (, , bool borrowingEnabled, ) = pool.getConfiguration(updates[i].asset).getFlags();
         updates[i].enabledToBorrow = EngineFlags.fromBool(borrowingEnabled);
       }
 
-      if (updates[i].enabledToBorrow == EngineFlags.ENABLED) {
-        if (updates[i].stableRateModeEnabled != EngineFlags.KEEP_CURRENT) {
-          poolConfigurator.setReserveStableRateBorrowing(
-            updates[i].asset,
-            EngineFlags.toBool(updates[i].stableRateModeEnabled)
-          );
-        }
-      }
-
       if (updates[i].borrowableInIsolation != EngineFlags.KEEP_CURRENT) {
         poolConfigurator.setBorrowableInIsolation(
           updates[i].asset,
diff --git a/src/periphery/contracts/v3-config-engine/libraries/CapsEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/CapsEngine.sol
similarity index 96%
rename from src/periphery/contracts/v3-config-engine/libraries/CapsEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/CapsEngine.sol
index b06c61fc..084ebc26 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/CapsEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/CapsEngine.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
 import {EngineFlags} from '../EngineFlags.sol';
diff --git a/src/periphery/contracts/v3-config-engine/libraries/CollateralEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/CollateralEngine.sol
similarity index 90%
rename from src/periphery/contracts/v3-config-engine/libraries/CollateralEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/CollateralEngine.sol
index 73e9a7f0..3bd70a3c 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/CollateralEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/CollateralEngine.sol
@@ -1,10 +1,10 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
-import {DataTypes} from '../../../../core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveConfiguration} from '../../../../core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../../../protocol/libraries/types/DataTypes.sol';
+import {ReserveConfiguration} from '../../../protocol/libraries/configuration/ReserveConfiguration.sol';
 import {IAaveV3ConfigEngine as IEngine, IPoolConfigurator, IPool} from '../IAaveV3ConfigEngine.sol';
-import {PercentageMath} from '../../../../core/contracts/protocol/libraries/math/PercentageMath.sol';
+import {PercentageMath} from '../../../protocol/libraries/math/PercentageMath.sol';
 import {EngineFlags} from '../EngineFlags.sol';
 
 library CollateralEngine {
@@ -44,7 +44,6 @@ library CollateralEngine {
             uint256 currentLiqThreshold,
             uint256 currentLiqBonus,
             ,
-            ,
 
           ) = configuration.getParams();
 
diff --git a/src/periphery/contracts/v3-config-engine/libraries/EModeEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/EModeEngine.sol
similarity index 76%
rename from src/periphery/contracts/v3-config-engine/libraries/EModeEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/EModeEngine.sol
index 5ccf4231..df2f72ab 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/EModeEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/EModeEngine.sol
@@ -1,10 +1,10 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
 import {EngineFlags} from '../EngineFlags.sol';
-import {DataTypes} from '../../../../core/contracts/protocol/libraries/types/DataTypes.sol';
+import {DataTypes} from '../../../protocol/libraries/types/DataTypes.sol';
 import {SafeCast} from 'solidity-utils/contracts/oz-common/SafeCast.sol';
-import {PercentageMath} from '../../../../core/contracts/protocol/libraries/math/PercentageMath.sol';
+import {PercentageMath} from '../../../protocol/libraries/math/PercentageMath.sol';
 import {IAaveV3ConfigEngine as IEngine, IPoolConfigurator, IPool} from '../IAaveV3ConfigEngine.sol';
 
 library EModeEngine {
@@ -34,8 +34,19 @@ library EModeEngine {
     IEngine.AssetEModeUpdate[] memory updates
   ) internal {
     for (uint256 i = 0; i < updates.length; i++) {
-      if (updates[i].eModeCategory != EngineFlags.KEEP_CURRENT) {
-        poolConfigurator.setAssetEModeCategory(updates[i].asset, updates[i].eModeCategory);
+      if (updates[i].collateral != EngineFlags.KEEP_CURRENT) {
+        poolConfigurator.setAssetCollateralInEMode(
+          updates[i].asset,
+          updates[i].eModeCategory,
+          EngineFlags.toBool(updates[i].collateral)
+        );
+      }
+      if (updates[i].borrowable != EngineFlags.KEEP_CURRENT) {
+        poolConfigurator.setAssetBorrowableInEMode(
+          updates[i].asset,
+          updates[i].eModeCategory,
+          EngineFlags.toBool(updates[i].borrowable)
+        );
       }
     }
   }
@@ -49,44 +60,38 @@ library EModeEngine {
       bool atLeastOneKeepCurrent = updates[i].ltv == EngineFlags.KEEP_CURRENT ||
         updates[i].liqThreshold == EngineFlags.KEEP_CURRENT ||
         updates[i].liqBonus == EngineFlags.KEEP_CURRENT ||
-        updates[i].priceSource == EngineFlags.KEEP_CURRENT_ADDRESS ||
         keccak256(abi.encode(updates[i].label)) ==
         keccak256(abi.encode(EngineFlags.KEEP_CURRENT_STRING));
 
       bool notAllKeepCurrent = updates[i].ltv != EngineFlags.KEEP_CURRENT ||
         updates[i].liqThreshold != EngineFlags.KEEP_CURRENT ||
         updates[i].liqBonus != EngineFlags.KEEP_CURRENT ||
-        updates[i].priceSource != EngineFlags.KEEP_CURRENT_ADDRESS ||
         keccak256(abi.encode(updates[i].label)) !=
         keccak256(abi.encode(EngineFlags.KEEP_CURRENT_STRING));
 
       if (notAllKeepCurrent && atLeastOneKeepCurrent) {
-        DataTypes.EModeCategory memory configuration = pool.getEModeCategoryData(
+        DataTypes.CollateralConfig memory cfg = pool.getEModeCategoryCollateralConfig(
           updates[i].eModeCategory
         );
 
         if (updates[i].ltv == EngineFlags.KEEP_CURRENT) {
-          updates[i].ltv = configuration.ltv;
+          updates[i].ltv = cfg.ltv;
         }
 
         if (updates[i].liqThreshold == EngineFlags.KEEP_CURRENT) {
-          updates[i].liqThreshold = configuration.liquidationThreshold;
+          updates[i].liqThreshold = cfg.liquidationThreshold;
         }
 
         if (updates[i].liqBonus == EngineFlags.KEEP_CURRENT) {
           // Subtracting 100_00 to be consistent with the engine as 100_00 gets added while setting the liqBonus
-          updates[i].liqBonus = configuration.liquidationBonus - 100_00;
-        }
-
-        if (updates[i].priceSource == EngineFlags.KEEP_CURRENT_ADDRESS) {
-          updates[i].priceSource = configuration.priceSource;
+          updates[i].liqBonus = cfg.liquidationBonus - 100_00;
         }
 
         if (
           keccak256(abi.encode(updates[i].label)) ==
           keccak256(abi.encode(EngineFlags.KEEP_CURRENT_STRING))
         ) {
-          updates[i].label = configuration.label;
+          updates[i].label = pool.getEModeCategoryLabel(updates[i].eModeCategory);
         }
       }
 
@@ -104,7 +109,6 @@ library EModeEngine {
           // For reference, this is to simplify the interaction with the Aave protocol,
           // as there the definition is as e.g. 105% (5% bonus for liquidators)
           (100_00 + updates[i].liqBonus).toUint16(),
-          updates[i].priceSource,
           updates[i].label
         );
       }
diff --git a/src/periphery/contracts/v3-config-engine/libraries/ListingEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/ListingEngine.sol
similarity index 82%
rename from src/periphery/contracts/v3-config-engine/libraries/ListingEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/ListingEngine.sol
index 4e1e8a7f..29d98807 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/ListingEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/ListingEngine.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
 import {IAaveV3ConfigEngine as IEngine, IPoolConfigurator, IPool, IDefaultInterestRateStrategyV2} from '../IAaveV3ConfigEngine.sol';
@@ -7,9 +7,9 @@ import {CapsEngine} from './CapsEngine.sol';
 import {BorrowEngine} from './BorrowEngine.sol';
 import {CollateralEngine} from './CollateralEngine.sol';
 import {EModeEngine} from './EModeEngine.sol';
-import {ConfiguratorInputTypes} from '../../../../core/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol';
+import {ConfiguratorInputTypes} from '../../../protocol/libraries/types/ConfiguratorInputTypes.sol';
 import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
-import {SafeCast} from '../../../../core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
+import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol';
 
 library ListingEngine {
   using Address for address;
@@ -67,16 +67,6 @@ library ListingEngine {
         repacked.collateralsUpdates
       )
     );
-
-    // For an asset listing we only update the e-mode category id for the asset and do not make changes
-    // to the e-mode category configuration
-    engineLibraries.eModeEngine.functionDelegateCall(
-      abi.encodeWithSelector(
-        EModeEngine.executeAssetsEModeUpdate.selector,
-        engineConstants,
-        repacked.assetsEModeUpdates
-      )
-    );
   }
 
   function _repackListing(
@@ -90,9 +80,6 @@ library ListingEngine {
     IEngine.PriceFeedUpdate[] memory priceFeedsUpdates = new IEngine.PriceFeedUpdate[](
       listings.length
     );
-    IEngine.AssetEModeUpdate[] memory assetsEModeUpdates = new IEngine.AssetEModeUpdate[](
-      listings.length
-    );
     IEngine.CapsUpdate[] memory capsUpdates = new IEngine.CapsUpdate[](listings.length);
 
     IEngine.Basic[] memory basics = new IEngine.Basic[](listings.length);
@@ -114,7 +101,6 @@ library ListingEngine {
         asset: listings[i].base.asset,
         enabledToBorrow: listings[i].base.enabledToBorrow,
         flashloanable: listings[i].base.flashloanable,
-        stableRateModeEnabled: listings[i].base.stableRateModeEnabled,
         borrowableInIsolation: listings[i].base.borrowableInIsolation,
         withSiloedBorrowing: listings[i].base.withSiloedBorrowing,
         reserveFactor: listings[i].base.reserveFactor
@@ -142,10 +128,6 @@ library ListingEngine {
         variableRateSlope1: listings[i].base.rateStrategyParams.variableRateSlope1.toUint32(),
         variableRateSlope2: listings[i].base.rateStrategyParams.variableRateSlope2.toUint32()
       });
-      assetsEModeUpdates[i] = IEngine.AssetEModeUpdate({
-        asset: listings[i].base.asset,
-        eModeCategory: listings[i].base.eModeCategory
-      });
     }
 
     return
@@ -155,7 +137,6 @@ library ListingEngine {
         borrowsUpdates,
         collateralsUpdates,
         priceFeedsUpdates,
-        assetsEModeUpdates,
         capsUpdates,
         rates
       );
@@ -178,7 +159,6 @@ library ListingEngine {
     for (uint256 i = 0; i < ids.length; i++) {
       initReserveInputs[i] = ConfiguratorInputTypes.InitReserveInput({
         aTokenImpl: basics[i].implementations.aToken,
-        stableDebtTokenImpl: basics[i].implementations.sToken,
         variableDebtTokenImpl: basics[i].implementations.vToken,
         interestRateStrategyAddress: rateStrategy,
         interestRateData: abi.encode(rates[i]),
@@ -199,17 +179,6 @@ library ListingEngine {
           context.networkAbbreviation,
           basics[i].assetSymbol
         ),
-        stableDebtTokenName: string.concat(
-          'Aave ',
-          context.networkName,
-          ' Stable Debt ',
-          basics[i].assetSymbol
-        ),
-        stableDebtTokenSymbol: string.concat(
-          'stableDebt',
-          context.networkAbbreviation,
-          basics[i].assetSymbol
-        ),
         params: bytes('')
       });
     }
diff --git a/src/periphery/contracts/v3-config-engine/libraries/PriceFeedEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/PriceFeedEngine.sol
similarity index 88%
rename from src/periphery/contracts/v3-config-engine/libraries/PriceFeedEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/PriceFeedEngine.sol
index d7186082..75cc49f4 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/PriceFeedEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/PriceFeedEngine.sol
@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
 import {IAaveV3ConfigEngine as IEngine, IAaveOracle} from '../IAaveV3ConfigEngine.sol';
-import {IEACAggregatorProxy} from '../../../../periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol';
+import {IEACAggregatorProxy} from '../../../helpers/interfaces/IEACAggregatorProxy.sol';
 
 library PriceFeedEngine {
   function executePriceFeedsUpdate(
diff --git a/src/periphery/contracts/v3-config-engine/libraries/RateEngine.sol b/src/contracts/extensions/v3-config-engine/libraries/RateEngine.sol
similarity index 93%
rename from src/periphery/contracts/v3-config-engine/libraries/RateEngine.sol
rename to src/contracts/extensions/v3-config-engine/libraries/RateEngine.sol
index db9c37d3..8ae88e2b 100644
--- a/src/periphery/contracts/v3-config-engine/libraries/RateEngine.sol
+++ b/src/contracts/extensions/v3-config-engine/libraries/RateEngine.sol
@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.18;
 
-import {IDefaultInterestRateStrategyV2} from '../../../../core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
-import {SafeCast} from '../../../../core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
+import {IDefaultInterestRateStrategyV2} from '../../../interfaces/IDefaultInterestRateStrategyV2.sol';
+import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol';
 import {EngineFlags} from '../EngineFlags.sol';
 import {IAaveV3ConfigEngine as IEngine, IPoolConfigurator} from '../IAaveV3ConfigEngine.sol';
 
diff --git a/src/core/contracts/misc/AaveProtocolDataProvider.sol b/src/contracts/helpers/AaveProtocolDataProvider.sol
similarity index 86%
rename from src/core/contracts/misc/AaveProtocolDataProvider.sol
rename to src/contracts/helpers/AaveProtocolDataProvider.sol
index 4db9441b..671b658b 100644
--- a/src/core/contracts/misc/AaveProtocolDataProvider.sol
+++ b/src/contracts/helpers/AaveProtocolDataProvider.sol
@@ -7,7 +7,6 @@ import {UserConfiguration} from '../protocol/libraries/configuration/UserConfigu
 import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
 import {WadRayMath} from '../protocol/libraries/math/WadRayMath.sol';
 import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
-import {IStableDebtToken} from '../interfaces/IStableDebtToken.sol';
 import {IVariableDebtToken} from '../interfaces/IVariableDebtToken.sol';
 import {IPool} from '../interfaces/IPool.sol';
 import {IPoolDataProvider} from '../interfaces/IPoolDataProvider.sol';
@@ -96,19 +95,15 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
     DataTypes.ReserveConfigurationMap memory configuration = IPool(ADDRESSES_PROVIDER.getPool())
       .getConfiguration(asset);
 
-    (ltv, liquidationThreshold, liquidationBonus, decimals, reserveFactor, ) = configuration
+    (ltv, liquidationThreshold, liquidationBonus, decimals, reserveFactor) = configuration
       .getParams();
 
-    (isActive, isFrozen, borrowingEnabled, stableBorrowRateEnabled, ) = configuration.getFlags();
+    (isActive, isFrozen, borrowingEnabled, ) = configuration.getFlags();
 
-    usageAsCollateralEnabled = liquidationThreshold != 0;
-  }
+    // @notice all stable debt related parameters deprecated in v3.2.0
+    stableBorrowRateEnabled = false;
 
-  /// @inheritdoc IPoolDataProvider
-  function getReserveEModeCategory(address asset) external view override returns (uint256) {
-    DataTypes.ReserveConfigurationMap memory configuration = IPool(ADDRESSES_PROVIDER.getPool())
-      .getConfiguration(asset);
-    return configuration.getEModeCategory();
+    usageAsCollateralEnabled = liquidationThreshold != 0;
   }
 
   /// @inheritdoc IPoolDataProvider
@@ -120,7 +115,7 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
 
   /// @inheritdoc IPoolDataProvider
   function getPaused(address asset) external view override returns (bool isPaused) {
-    (, , , , isPaused) = IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getFlags();
+    (, , , isPaused) = IPool(ADDRESSES_PROVIDER.getPool()).getConfiguration(asset).getFlags();
   }
 
   /// @inheritdoc IPoolDataProvider
@@ -174,16 +169,17 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
       asset
     );
 
+    // @notice all stable debt related parameters deprecated in v3.2.0
     return (
       reserve.unbacked,
       reserve.accruedToTreasury,
       IERC20Detailed(reserve.aTokenAddress).totalSupply(),
-      IERC20Detailed(reserve.stableDebtTokenAddress).totalSupply(),
+      0,
       IERC20Detailed(reserve.variableDebtTokenAddress).totalSupply(),
       reserve.currentLiquidityRate,
       reserve.currentVariableBorrowRate,
-      reserve.currentStableBorrowRate,
-      IStableDebtToken(reserve.stableDebtTokenAddress).getAverageStableRate(),
+      0,
+      0,
       reserve.liquidityIndex,
       reserve.variableBorrowIndex,
       reserve.lastUpdateTimestamp
@@ -203,9 +199,7 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
     DataTypes.ReserveDataLegacy memory reserve = IPool(ADDRESSES_PROVIDER.getPool()).getReserveData(
       asset
     );
-    return
-      IERC20Detailed(reserve.stableDebtTokenAddress).totalSupply() +
-      IERC20Detailed(reserve.variableDebtTokenAddress).totalSupply();
+    return IERC20Detailed(reserve.variableDebtTokenAddress).totalSupply();
   }
 
   /// @inheritdoc IPoolDataProvider
@@ -237,14 +231,12 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
 
     currentATokenBalance = IERC20Detailed(reserve.aTokenAddress).balanceOf(user);
     currentVariableDebt = IERC20Detailed(reserve.variableDebtTokenAddress).balanceOf(user);
-    currentStableDebt = IERC20Detailed(reserve.stableDebtTokenAddress).balanceOf(user);
-    principalStableDebt = IStableDebtToken(reserve.stableDebtTokenAddress).principalBalanceOf(user);
+
+    // @notice all stable debt related parameters deprecated in v3.2.0
+    currentStableDebt = principalStableDebt = stableBorrowRate = stableRateLastUpdated = 0;
+
     scaledVariableDebt = IVariableDebtToken(reserve.variableDebtTokenAddress).scaledBalanceOf(user);
     liquidityRate = reserve.currentLiquidityRate;
-    stableBorrowRate = IStableDebtToken(reserve.stableDebtTokenAddress).getUserStableRate(user);
-    stableRateLastUpdated = IStableDebtToken(reserve.stableDebtTokenAddress).getUserLastUpdated(
-      user
-    );
     usageAsCollateralEnabled = userConfig.isUsingAsCollateral(reserve.id);
   }
 
@@ -265,11 +257,8 @@ contract AaveProtocolDataProvider is IPoolDataProvider {
       asset
     );
 
-    return (
-      reserve.aTokenAddress,
-      reserve.stableDebtTokenAddress,
-      reserve.variableDebtTokenAddress
-    );
+    // @notice all stable debt related parameters deprecated in v3.2.0
+    return (reserve.aTokenAddress, address(0), reserve.variableDebtTokenAddress);
   }
 
   /// @inheritdoc IPoolDataProvider
diff --git a/src/core/contracts/misc/L2Encoder.sol b/src/contracts/helpers/L2Encoder.sol
similarity index 87%
rename from src/core/contracts/misc/L2Encoder.sol
rename to src/contracts/helpers/L2Encoder.sol
index bdcd225e..7c1bd96c 100644
--- a/src/core/contracts/misc/L2Encoder.sol
+++ b/src/contracts/helpers/L2Encoder.sol
@@ -118,7 +118,7 @@ contract L2Encoder {
    * @dev Without an onBehalfOf parameter as the compact calls to L2Pool will use msg.sender as onBehalfOf
    * @param asset The address of the underlying asset to borrow
    * @param amount The amount to be borrowed
-   * @param interestRateMode The interest rate mode at which the user wants to borrow: 1 for Stable, 2 for Variable
+   * @param interestRateMode The interest rate mode at which the user wants to borrow: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
    * @return compact representation of withdraw parameters
@@ -153,7 +153,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `interestRateMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @return compact representation of repay parameters
    */
   function encodeRepayParams(
@@ -180,7 +180,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param deadline The deadline timestamp that the permit is valid
    * @param permitV The V parameter of ERC712 permit sig
    * @param permitR The R parameter of ERC712 permit sig
@@ -226,7 +226,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated  (changed on v3.2.0)
    * @return compact representation of repay with aToken parameters
    */
   function encodeRepayWithATokensParams(
@@ -237,46 +237,6 @@ contract L2Encoder {
     return encodeRepayParams(asset, amount, interestRateMode);
   }
 
-  /**
-   * @notice Encodes swap borrow rate mode parameters from standard input to compact representation of 1 bytes32
-   * @param asset The address of the underlying asset borrowed
-   * @param interestRateMode The current interest rate mode of the position being swapped: 1 for Stable, 2 for Variable
-   * @return compact representation of swap borrow rate mode parameters
-   */
-  function encodeSwapBorrowRateMode(
-    address asset,
-    uint256 interestRateMode
-  ) external view returns (bytes32) {
-    DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);
-    uint16 assetId = data.id;
-    uint8 shortenedInterestRateMode = interestRateMode.toUint8();
-    bytes32 res;
-    assembly {
-      res := add(assetId, shl(16, shortenedInterestRateMode))
-    }
-    return res;
-  }
-
-  /**
-   * @notice Encodes rebalance stable borrow rate parameters from standard input to compact representation of 1 bytes32
-   * @param asset The address of the underlying asset borrowed
-   * @param user The address of the user to be rebalanced
-   * @return compact representation of rebalance stable borrow rate parameters
-   */
-  function encodeRebalanceStableBorrowRate(
-    address asset,
-    address user
-  ) external view returns (bytes32) {
-    DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);
-    uint16 assetId = data.id;
-
-    bytes32 res;
-    assembly {
-      res := add(assetId, shl(16, user))
-    }
-    return res;
-  }
-
   /**
    * @notice Encodes set user use reserve as collateral parameters from standard input to compact representation of 1 bytes32
    * @param asset The address of the underlying asset borrowed
diff --git a/src/periphery/contracts/misc/UiIncentiveDataProviderV3.sol b/src/contracts/helpers/UiIncentiveDataProviderV3.sol
similarity index 69%
rename from src/periphery/contracts/misc/UiIncentiveDataProviderV3.sol
rename to src/contracts/helpers/UiIncentiveDataProviderV3.sol
index 5c8f3e7f..79a1829d 100644
--- a/src/periphery/contracts/misc/UiIncentiveDataProviderV3.sol
+++ b/src/contracts/helpers/UiIncentiveDataProviderV3.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IncentivizedERC20} from 'aave-v3-core/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {IERC20Detailed} from '../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../interfaces/IPool.sol';
+import {IncentivizedERC20} from '../protocol/tokenization/base/IncentivizedERC20.sol';
+import {UserConfiguration} from '../../contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
 import {IRewardsController} from '../rewards/interfaces/IRewardsController.sol';
 import {IEACAggregatorProxy} from './interfaces/IEACAggregatorProxy.sol';
 import {IUiIncentiveDataProviderV3} from './interfaces/IUiIncentiveDataProviderV3.sol';
@@ -47,7 +47,6 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
       DataTypes.ReserveDataLegacy memory baseData = pool.getReserveData(reserves[i]);
 
       // Get aTokens rewards information
-      // TODO: check that this is deployed correctly on contract and remove casting
       IRewardsController aTokenIncentiveController = IRewardsController(
         address(IncentivizedERC20(baseData.aTokenAddress).getIncentivesController())
       );
@@ -155,60 +154,6 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
         address(vTokenIncentiveController),
         vRewardsInformation
       );
-
-      // Get sTokens rewards information
-      IRewardsController sTokenIncentiveController = IRewardsController(
-        address(IncentivizedERC20(baseData.stableDebtTokenAddress).getIncentivesController())
-      );
-      RewardInfo[] memory sRewardsInformation;
-      if (address(sTokenIncentiveController) != address(0)) {
-        address[] memory sTokenRewardAddresses = sTokenIncentiveController.getRewardsByAsset(
-          baseData.stableDebtTokenAddress
-        );
-        sRewardsInformation = new RewardInfo[](sTokenRewardAddresses.length);
-        for (uint256 j = 0; j < sTokenRewardAddresses.length; ++j) {
-          RewardInfo memory rewardInformation;
-          rewardInformation.rewardTokenAddress = sTokenRewardAddresses[j];
-
-          (
-            rewardInformation.tokenIncentivesIndex,
-            rewardInformation.emissionPerSecond,
-            rewardInformation.incentivesLastUpdateTimestamp,
-            rewardInformation.emissionEndTimestamp
-          ) = sTokenIncentiveController.getRewardsData(
-            baseData.stableDebtTokenAddress,
-            rewardInformation.rewardTokenAddress
-          );
-
-          rewardInformation.precision = sTokenIncentiveController.getAssetDecimals(
-            baseData.stableDebtTokenAddress
-          );
-          rewardInformation.rewardTokenDecimals = IERC20Detailed(
-            rewardInformation.rewardTokenAddress
-          ).decimals();
-          rewardInformation.rewardTokenSymbol = IERC20Detailed(rewardInformation.rewardTokenAddress)
-            .symbol();
-
-          // Get price of reward token from Chainlink Proxy Oracle
-          rewardInformation.rewardOracleAddress = sTokenIncentiveController.getRewardOracle(
-            rewardInformation.rewardTokenAddress
-          );
-          rewardInformation.priceFeedDecimals = IEACAggregatorProxy(
-            rewardInformation.rewardOracleAddress
-          ).decimals();
-          rewardInformation.rewardPriceFeed = IEACAggregatorProxy(
-            rewardInformation.rewardOracleAddress
-          ).latestAnswer();
-
-          sRewardsInformation[j] = rewardInformation;
-        }
-      }
-
-      reserveIncentiveData.sIncentiveData = IncentiveData(
-        baseData.stableDebtTokenAddress,
-        address(sTokenIncentiveController),
-        sRewardsInformation
-      );
     }
 
     return (reservesIncentiveData);
@@ -342,59 +287,6 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
           vUserRewardsInformation
         );
       }
-
-      // stable debt token
-      IRewardsController sTokenIncentiveController = IRewardsController(
-        address(IncentivizedERC20(baseData.stableDebtTokenAddress).getIncentivesController())
-      );
-      if (address(sTokenIncentiveController) != address(0)) {
-        // get all rewards information from the asset
-        address[] memory sTokenRewardAddresses = sTokenIncentiveController.getRewardsByAsset(
-          baseData.stableDebtTokenAddress
-        );
-        UserRewardInfo[] memory sUserRewardsInformation = new UserRewardInfo[](
-          sTokenRewardAddresses.length
-        );
-        for (uint256 j = 0; j < sTokenRewardAddresses.length; ++j) {
-          UserRewardInfo memory userRewardInformation;
-          userRewardInformation.rewardTokenAddress = sTokenRewardAddresses[j];
-
-          userRewardInformation.tokenIncentivesUserIndex = sTokenIncentiveController
-            .getUserAssetIndex(
-              user,
-              baseData.stableDebtTokenAddress,
-              userRewardInformation.rewardTokenAddress
-            );
-
-          userRewardInformation.userUnclaimedRewards = sTokenIncentiveController
-            .getUserAccruedRewards(user, userRewardInformation.rewardTokenAddress);
-          userRewardInformation.rewardTokenDecimals = IERC20Detailed(
-            userRewardInformation.rewardTokenAddress
-          ).decimals();
-          userRewardInformation.rewardTokenSymbol = IERC20Detailed(
-            userRewardInformation.rewardTokenAddress
-          ).symbol();
-
-          // Get price of reward token from Chainlink Proxy Oracle
-          userRewardInformation.rewardOracleAddress = sTokenIncentiveController.getRewardOracle(
-            userRewardInformation.rewardTokenAddress
-          );
-          userRewardInformation.priceFeedDecimals = IEACAggregatorProxy(
-            userRewardInformation.rewardOracleAddress
-          ).decimals();
-          userRewardInformation.rewardPriceFeed = IEACAggregatorProxy(
-            userRewardInformation.rewardOracleAddress
-          ).latestAnswer();
-
-          sUserRewardsInformation[j] = userRewardInformation;
-        }
-
-        userReservesIncentivesData[i].sTokenIncentivesUserData = UserIncentiveData(
-          baseData.stableDebtTokenAddress,
-          address(aTokenIncentiveController),
-          sUserRewardsInformation
-        );
-      }
     }
 
     return (userReservesIncentivesData);
diff --git a/src/periphery/contracts/misc/UiPoolDataProviderV3.sol b/src/contracts/helpers/UiPoolDataProviderV3.sol
similarity index 75%
rename from src/periphery/contracts/misc/UiPoolDataProviderV3.sol
rename to src/contracts/helpers/UiPoolDataProviderV3.sol
index 8906d694..b079d2dd 100644
--- a/src/periphery/contracts/misc/UiPoolDataProviderV3.sol
+++ b/src/contracts/helpers/UiPoolDataProviderV3.sol
@@ -1,19 +1,18 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {IStableDebtToken} from 'aave-v3-core/contracts/interfaces/IStableDebtToken.sol';
-import {IDefaultInterestRateStrategyV2} from 'aave-v3-core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
-import {AaveProtocolDataProvider} from 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {IERC20Detailed} from '../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../interfaces/IPool.sol';
+import {IAaveOracle} from '../interfaces/IAaveOracle.sol';
+import {IAToken} from '../interfaces/IAToken.sol';
+import {IVariableDebtToken} from '../interfaces/IVariableDebtToken.sol';
+import {IDefaultInterestRateStrategyV2} from '../interfaces/IDefaultInterestRateStrategyV2.sol';
+import {AaveProtocolDataProvider} from './AaveProtocolDataProvider.sol';
+import {WadRayMath} from '../protocol/libraries/math/WadRayMath.sol';
+import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol';
+import {UserConfiguration} from '../protocol/libraries/configuration/UserConfiguration.sol';
+import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
 import {IEACAggregatorProxy} from './interfaces/IEACAggregatorProxy.sol';
 import {IERC20DetailedBytes} from './interfaces/IERC20DetailedBytes.sol';
 import {IUiPoolDataProviderV3} from './interfaces/IUiPoolDataProviderV3.sol';
@@ -71,11 +70,8 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
       reserveData.liquidityRate = baseData.currentLiquidityRate;
       //the current variable borrow rate. Expressed in ray
       reserveData.variableBorrowRate = baseData.currentVariableBorrowRate;
-      //the current stable borrow rate. Expressed in ray
-      reserveData.stableBorrowRate = baseData.currentStableBorrowRate;
       reserveData.lastUpdateTimestamp = baseData.lastUpdateTimestamp;
       reserveData.aTokenAddress = baseData.aTokenAddress;
-      reserveData.stableDebtTokenAddress = baseData.stableDebtTokenAddress;
       reserveData.variableDebtTokenAddress = baseData.variableDebtTokenAddress;
       //address of the interest rate strategy
       reserveData.interestRateStrategyAddress = baseData.interestRateStrategyAddress;
@@ -86,12 +82,6 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
       reserveData.availableLiquidity = IERC20Detailed(reserveData.underlyingAsset).balanceOf(
         reserveData.aTokenAddress
       );
-      (
-        reserveData.totalPrincipalStableDebt,
-        ,
-        reserveData.averageStableRate,
-        reserveData.stableDebtLastUpdateTimestamp
-      ) = IStableDebtToken(reserveData.stableDebtTokenAddress).getSupplyData();
       reserveData.totalScaledVariableDebt = IVariableDebtToken(reserveData.variableDebtTokenAddress)
         .scaledTotalSupply();
 
@@ -108,14 +98,12 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
 
       //stores the reserve configuration
       DataTypes.ReserveConfigurationMap memory reserveConfigurationMap = baseData.configuration;
-      uint256 eModeCategoryId;
       (
         reserveData.baseLTVasCollateral,
         reserveData.reserveLiquidationThreshold,
         reserveData.reserveLiquidationBonus,
         reserveData.decimals,
-        reserveData.reserveFactor,
-        eModeCategoryId
+        reserveData.reserveFactor
       ) = reserveConfigurationMap.getParams();
       reserveData.usageAsCollateralEnabled = reserveData.baseLTVasCollateral != 0;
 
@@ -123,7 +111,6 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
         reserveData.isActive,
         reserveData.isFrozen,
         reserveData.borrowingEnabled,
-        reserveData.stableBorrowRateEnabled,
         reserveData.isPaused
       ) = reserveConfigurationMap.getFlags();
 
@@ -138,12 +125,8 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
         reserveData.variableRateSlope2 = res.variableRateSlope2;
         reserveData.optimalUsageRatio = res.optimalUsageRatio;
       } catch {}
-      reserveData.stableRateSlope1 = 0;
-      reserveData.stableRateSlope2 = 0;
-      reserveData.baseStableBorrowRate = 0;
 
       // v3 only
-      reserveData.eModeCategoryId = uint8(eModeCategoryId);
       reserveData.debtCeiling = reserveConfigurationMap.getDebtCeiling();
       reserveData.debtCeilingDecimals = poolDataProvider.getDebtCeilingDecimals();
       (reserveData.borrowCap, reserveData.supplyCap) = reserveConfigurationMap.getCaps();
@@ -161,16 +144,6 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
       reserveData.isolationModeTotalDebt = baseData.isolationModeTotalDebt;
       reserveData.accruedToTreasury = baseData.accruedToTreasury;
 
-      DataTypes.EModeCategory memory categoryData = pool.getEModeCategoryData(
-        reserveData.eModeCategoryId
-      );
-      reserveData.eModeLtv = categoryData.ltv;
-      reserveData.eModeLiquidationThreshold = categoryData.liquidationThreshold;
-      reserveData.eModeLiquidationBonus = categoryData.liquidationBonus;
-      // each eMode category may or may not have a custom oracle to override the individual assets price oracles
-      reserveData.eModePriceSource = categoryData.priceSource;
-      reserveData.eModeLabel = categoryData.label;
-
       reserveData.borrowableInIsolation = reserveConfigurationMap.getBorrowableInIsolation();
 
       try poolDataProvider.getIsVirtualAccActive(reserveData.underlyingAsset) returns (
@@ -209,6 +182,41 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
     return (reservesData, baseCurrencyInfo);
   }
 
+  /// @inheritdoc IUiPoolDataProviderV3
+  function getEModes(IPoolAddressesProvider provider) external view returns (Emode[] memory) {
+    IPool pool = IPool(provider.getPool());
+    Emode[] memory tempCategories = new Emode[](256);
+    uint8 eModesFound = 0;
+    uint8 missCounter = 0;
+    for (uint8 i = 1; i < 256; i++) {
+      DataTypes.CollateralConfig memory cfg = pool.getEModeCategoryCollateralConfig(i);
+      if (cfg.liquidationThreshold != 0) {
+        tempCategories[eModesFound] = Emode({
+          eMode: DataTypes.EModeCategory({
+            ltv: cfg.ltv,
+            liquidationThreshold: cfg.liquidationThreshold,
+            liquidationBonus: cfg.liquidationBonus,
+            label: pool.getEModeCategoryLabel(i),
+            collateralBitmap: pool.getEModeCategoryCollateralBitmap(i),
+            borrowableBitmap: pool.getEModeCategoryBorrowableBitmap(i)
+          }),
+          id: i
+        });
+        ++eModesFound;
+        missCounter = 0;
+      } else {
+        ++missCounter;
+      }
+      // assumes there will never be a gap > 2 when setting eModes
+      if (missCounter > 2) break;
+    }
+    Emode[] memory categories = new Emode[](eModesFound);
+    for (uint8 i = 0; i < eModesFound; i++) {
+      categories[i] = tempCategories[i];
+    }
+    return categories;
+  }
+
   function getUserReservesData(
     IPoolAddressesProvider provider,
     address user
@@ -237,15 +245,6 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
         userReservesData[i].scaledVariableDebt = IVariableDebtToken(
           baseData.variableDebtTokenAddress
         ).scaledBalanceOf(user);
-        userReservesData[i].principalStableDebt = IStableDebtToken(baseData.stableDebtTokenAddress)
-          .principalBalanceOf(user);
-        if (userReservesData[i].principalStableDebt != 0) {
-          userReservesData[i].stableBorrowRate = IStableDebtToken(baseData.stableDebtTokenAddress)
-            .getUserStableRate(user);
-          userReservesData[i].stableBorrowLastUpdateTimestamp = IStableDebtToken(
-            baseData.stableDebtTokenAddress
-          ).getUserLastUpdated(user);
-        }
       }
     }
 
diff --git a/src/periphery/contracts/misc/WalletBalanceProvider.sol b/src/contracts/helpers/WalletBalanceProvider.sol
similarity index 81%
rename from src/periphery/contracts/misc/WalletBalanceProvider.sol
rename to src/contracts/helpers/WalletBalanceProvider.sol
index f215610c..54efad64 100644
--- a/src/periphery/contracts/misc/WalletBalanceProvider.sol
+++ b/src/contracts/helpers/WalletBalanceProvider.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {Address} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Address.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {Address} from '../dependencies/openzeppelin/contracts/Address.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
 
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../interfaces/IPool.sol';
+import {GPv2SafeERC20} from '../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
 
 /**
  * @title WalletBalanceProvider contract
@@ -93,7 +93,7 @@ contract WalletBalanceProvider {
         reservesWithEth[j]
       );
 
-      (bool isActive, , , , ) = configuration.getFlags();
+      (bool isActive, , , ) = configuration.getFlags();
 
       if (!isActive) {
         balances[j] = 0;
diff --git a/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol b/src/contracts/helpers/WrappedTokenGatewayV3.sol
similarity index 79%
rename from src/periphery/contracts/misc/WrappedTokenGatewayV3.sol
rename to src/contracts/helpers/WrappedTokenGatewayV3.sol
index a120eeab..56725d5e 100644
--- a/src/periphery/contracts/misc/WrappedTokenGatewayV3.sol
+++ b/src/contracts/helpers/WrappedTokenGatewayV3.sol
@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IWETH} from 'aave-v3-core/contracts/misc/interfaces/IWETH.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IWETH} from './interfaces/IWETH.sol';
+import {IPool} from '../interfaces/IPool.sol';
+import {IAToken} from '../interfaces/IAToken.sol';
+import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol';
+import {UserConfiguration} from '../protocol/libraries/configuration/UserConfiguration.sol';
+import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
 import {IWrappedTokenGatewayV3} from './interfaces/IWrappedTokenGatewayV3.sol';
-import {DataTypesHelper} from '../libraries/DataTypesHelper.sol';
 
 /**
  * @dev This contract is an upgrade of the WrappedTokenGatewayV3 contract, with immutable pool address.
@@ -71,31 +70,23 @@ contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {
   /**
    * @dev repays a borrow on the WETH reserve, for the specified amount (or for the whole amount, if uint256(-1) is specified).
    * @param amount the amount to repay, or uint256(-1) if the user wants to repay everything
-   * @param rateMode the rate mode to repay
    * @param onBehalfOf the address for which msg.sender is repaying
    */
-  function repayETH(
-    address,
-    uint256 amount,
-    uint256 rateMode,
-    address onBehalfOf
-  ) external payable override {
-    (uint256 stableDebt, uint256 variableDebt) = DataTypesHelper.getUserCurrentDebt(
-      onBehalfOf,
-      POOL.getReserveData(address(WETH))
-    );
-
-    uint256 paybackAmount = DataTypes.InterestRateMode(rateMode) ==
-      DataTypes.InterestRateMode.STABLE
-      ? stableDebt
-      : variableDebt;
+  function repayETH(address, uint256 amount, address onBehalfOf) external payable override {
+    uint256 paybackAmount = IERC20((POOL.getReserveData(address(WETH))).variableDebtTokenAddress)
+      .balanceOf(onBehalfOf);
 
     if (amount < paybackAmount) {
       paybackAmount = amount;
     }
     require(msg.value >= paybackAmount, 'msg.value is less than repayment amount');
     WETH.deposit{value: paybackAmount}();
-    POOL.repay(address(WETH), paybackAmount, rateMode, onBehalfOf);
+    POOL.repay(
+      address(WETH),
+      paybackAmount,
+      uint256(DataTypes.InterestRateMode.VARIABLE),
+      onBehalfOf
+    );
 
     // refund remaining dust eth
     if (msg.value > paybackAmount) _safeTransferETH(msg.sender, msg.value - paybackAmount);
@@ -104,16 +95,16 @@ contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {
   /**
    * @dev borrow WETH, unwraps to ETH and send both the ETH and DebtTokens to msg.sender, via `approveDelegation` and onBehalf argument in `Pool.borrow`.
    * @param amount the amount of ETH to borrow
-   * @param interestRateMode the interest rate mode
    * @param referralCode integrators are assigned a referral code and can potentially receive rewards
    */
-  function borrowETH(
-    address,
-    uint256 amount,
-    uint256 interestRateMode,
-    uint16 referralCode
-  ) external override {
-    POOL.borrow(address(WETH), amount, interestRateMode, referralCode, msg.sender);
+  function borrowETH(address, uint256 amount, uint16 referralCode) external override {
+    POOL.borrow(
+      address(WETH),
+      amount,
+      uint256(DataTypes.InterestRateMode.VARIABLE),
+      referralCode,
+      msg.sender
+    );
     WETH.withdraw(amount);
     _safeTransferETH(msg.sender, amount);
   }
diff --git a/src/periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol b/src/contracts/helpers/interfaces/IEACAggregatorProxy.sol
similarity index 100%
rename from src/periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol
rename to src/contracts/helpers/interfaces/IEACAggregatorProxy.sol
diff --git a/src/periphery/contracts/misc/interfaces/IERC20DetailedBytes.sol b/src/contracts/helpers/interfaces/IERC20DetailedBytes.sol
similarity index 73%
rename from src/periphery/contracts/misc/interfaces/IERC20DetailedBytes.sol
rename to src/contracts/helpers/interfaces/IERC20DetailedBytes.sol
index 3e213158..0541f0da 100644
--- a/src/periphery/contracts/misc/interfaces/IERC20DetailedBytes.sol
+++ b/src/contracts/helpers/interfaces/IERC20DetailedBytes.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 interface IERC20DetailedBytes is IERC20 {
   function name() external view returns (bytes32);
diff --git a/src/periphery/contracts/misc/interfaces/IUiIncentiveDataProviderV3.sol b/src/contracts/helpers/interfaces/IUiIncentiveDataProviderV3.sol
similarity index 91%
rename from src/periphery/contracts/misc/interfaces/IUiIncentiveDataProviderV3.sol
rename to src/contracts/helpers/interfaces/IUiIncentiveDataProviderV3.sol
index fb3bb00c..3402953f 100644
--- a/src/periphery/contracts/misc/interfaces/IUiIncentiveDataProviderV3.sol
+++ b/src/contracts/helpers/interfaces/IUiIncentiveDataProviderV3.sol
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
 
 interface IUiIncentiveDataProviderV3 {
   struct AggregatedReserveIncentiveData {
     address underlyingAsset;
     IncentiveData aIncentiveData;
     IncentiveData vIncentiveData;
-    IncentiveData sIncentiveData;
   }
 
   struct IncentiveData {
@@ -35,7 +34,6 @@ interface IUiIncentiveDataProviderV3 {
     address underlyingAsset;
     UserIncentiveData aTokenIncentivesUserData;
     UserIncentiveData vTokenIncentivesUserData;
-    UserIncentiveData sTokenIncentivesUserData;
   }
 
   struct UserIncentiveData {
diff --git a/src/periphery/contracts/misc/interfaces/IUiPoolDataProviderV3.sol b/src/contracts/helpers/interfaces/IUiPoolDataProviderV3.sol
similarity index 69%
rename from src/periphery/contracts/misc/interfaces/IUiPoolDataProviderV3.sol
rename to src/contracts/helpers/interfaces/IUiPoolDataProviderV3.sol
index 42944eb8..3280d75b 100644
--- a/src/periphery/contracts/misc/interfaces/IUiPoolDataProviderV3.sol
+++ b/src/contracts/helpers/interfaces/IUiPoolDataProviderV3.sol
@@ -1,19 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
 
 interface IUiPoolDataProviderV3 {
-  struct InterestRates {
-    uint256 variableRateSlope1;
-    uint256 variableRateSlope2;
-    uint256 stableRateSlope1;
-    uint256 stableRateSlope2;
-    uint256 baseStableBorrowRate;
-    uint256 baseVariableBorrowRate;
-    uint256 optimalUsageRatio;
-  }
-
   struct AggregatedReserveData {
     address underlyingAsset;
     string name;
@@ -25,7 +16,6 @@ interface IUiPoolDataProviderV3 {
     uint256 reserveFactor;
     bool usageAsCollateralEnabled;
     bool borrowingEnabled;
-    bool stableBorrowRateEnabled;
     bool isActive;
     bool isFrozen;
     // base data
@@ -33,25 +23,17 @@ interface IUiPoolDataProviderV3 {
     uint128 variableBorrowIndex;
     uint128 liquidityRate;
     uint128 variableBorrowRate;
-    uint128 stableBorrowRate;
     uint40 lastUpdateTimestamp;
     address aTokenAddress;
-    address stableDebtTokenAddress;
     address variableDebtTokenAddress;
     address interestRateStrategyAddress;
     //
     uint256 availableLiquidity;
-    uint256 totalPrincipalStableDebt;
-    uint256 averageStableRate;
-    uint256 stableDebtLastUpdateTimestamp;
     uint256 totalScaledVariableDebt;
     uint256 priceInMarketReferenceCurrency;
     address priceOracle;
     uint256 variableRateSlope1;
     uint256 variableRateSlope2;
-    uint256 stableRateSlope1;
-    uint256 stableRateSlope2;
-    uint256 baseStableBorrowRate;
     uint256 baseVariableBorrowRate;
     uint256 optimalUsageRatio;
     // v3 only
@@ -64,15 +46,8 @@ interface IUiPoolDataProviderV3 {
     //
     uint256 debtCeiling;
     uint256 debtCeilingDecimals;
-    uint8 eModeCategoryId;
     uint256 borrowCap;
     uint256 supplyCap;
-    // eMode
-    uint16 eModeLtv;
-    uint16 eModeLiquidationThreshold;
-    uint16 eModeLiquidationBonus;
-    address eModePriceSource;
-    string eModeLabel;
     bool borrowableInIsolation;
     // v3.1
     bool virtualAccActive;
@@ -83,10 +58,7 @@ interface IUiPoolDataProviderV3 {
     address underlyingAsset;
     uint256 scaledATokenBalance;
     bool usageAsCollateralEnabledOnUser;
-    uint256 stableBorrowRate;
     uint256 scaledVariableDebt;
-    uint256 principalStableDebt;
-    uint256 stableBorrowLastUpdateTimestamp;
   }
 
   struct BaseCurrencyInfo {
@@ -96,6 +68,11 @@ interface IUiPoolDataProviderV3 {
     uint8 networkBaseTokenPriceDecimals;
   }
 
+  struct Emode {
+    uint8 id;
+    DataTypes.EModeCategory eMode;
+  }
+
   function getReservesList(
     IPoolAddressesProvider provider
   ) external view returns (address[] memory);
@@ -108,4 +85,11 @@ interface IUiPoolDataProviderV3 {
     IPoolAddressesProvider provider,
     address user
   ) external view returns (UserReserveData[] memory, uint8);
+
+  /**
+   * @dev Iterates the eModes mapping and returns all eModes found
+   * @notice The method assumes for id gaps <= 2 within the eMode definitions
+   * @return an array of eModes that were found in the eMode mapping
+   */
+  function getEModes(IPoolAddressesProvider provider) external view returns (Emode[] memory);
 }
diff --git a/src/core/contracts/misc/interfaces/IWETH.sol b/src/contracts/helpers/interfaces/IWETH.sol
similarity index 100%
rename from src/core/contracts/misc/interfaces/IWETH.sol
rename to src/contracts/helpers/interfaces/IWETH.sol
diff --git a/src/periphery/contracts/misc/interfaces/IWrappedTokenGatewayV3.sol b/src/contracts/helpers/interfaces/IWrappedTokenGatewayV3.sol
similarity index 64%
rename from src/periphery/contracts/misc/interfaces/IWrappedTokenGatewayV3.sol
rename to src/contracts/helpers/interfaces/IWrappedTokenGatewayV3.sol
index 38f4cadb..ae8f5980 100644
--- a/src/periphery/contracts/misc/interfaces/IWrappedTokenGatewayV3.sol
+++ b/src/contracts/helpers/interfaces/IWrappedTokenGatewayV3.sol
@@ -6,19 +6,9 @@ interface IWrappedTokenGatewayV3 {
 
   function withdrawETH(address pool, uint256 amount, address onBehalfOf) external;
 
-  function repayETH(
-    address pool,
-    uint256 amount,
-    uint256 rateMode,
-    address onBehalfOf
-  ) external payable;
+  function repayETH(address pool, uint256 amount, address onBehalfOf) external payable;
 
-  function borrowETH(
-    address pool,
-    uint256 amount,
-    uint256 interestRateMode,
-    uint16 referralCode
-  ) external;
+  function borrowETH(address pool, uint256 amount, uint16 referralCode) external;
 
   function withdrawETHWithPermit(
     address pool,
diff --git a/src/core/instances/ATokenInstance.sol b/src/contracts/instances/ATokenInstance.sol
similarity index 93%
rename from src/core/instances/ATokenInstance.sol
rename to src/contracts/instances/ATokenInstance.sol
index e778f91e..8e646385 100644
--- a/src/core/instances/ATokenInstance.sol
+++ b/src/contracts/instances/ATokenInstance.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AToken, IPool, IAaveIncentivesController, IInitializableAToken, Errors, VersionedInitializable} from '../contracts/protocol/tokenization/AToken.sol';
+import {AToken, IPool, IAaveIncentivesController, IInitializableAToken, Errors, VersionedInitializable} from '../protocol/tokenization/AToken.sol';
 
 contract ATokenInstance is AToken {
   uint256 public constant ATOKEN_REVISION = 1;
diff --git a/src/core/instances/L2PoolInstance.sol b/src/contracts/instances/L2PoolInstance.sol
similarity index 60%
rename from src/core/instances/L2PoolInstance.sol
rename to src/contracts/instances/L2PoolInstance.sol
index 80bd406f..0c61f19e 100644
--- a/src/core/instances/L2PoolInstance.sol
+++ b/src/contracts/instances/L2PoolInstance.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {L2Pool} from '../contracts/protocol/pool/L2Pool.sol';
-import {IPoolAddressesProvider} from '../contracts/interfaces/IPoolAddressesProvider.sol';
+import {L2Pool} from '../protocol/pool/L2Pool.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
 import {PoolInstance} from './PoolInstance.sol';
 
 contract L2PoolInstance is L2Pool, PoolInstance {
diff --git a/src/core/instances/PoolConfiguratorInstance.sol b/src/contracts/instances/PoolConfiguratorInstance.sol
similarity index 79%
rename from src/core/instances/PoolConfiguratorInstance.sol
rename to src/contracts/instances/PoolConfiguratorInstance.sol
index 03ae6105..7f7294fe 100644
--- a/src/core/instances/PoolConfiguratorInstance.sol
+++ b/src/contracts/instances/PoolConfiguratorInstance.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {PoolConfigurator, IPoolAddressesProvider, IPool, VersionedInitializable} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
+import {PoolConfigurator, IPoolAddressesProvider, IPool, VersionedInitializable} from '../protocol/pool/PoolConfigurator.sol';
 
 contract PoolConfiguratorInstance is PoolConfigurator {
-  uint256 public constant CONFIGURATOR_REVISION = 3;
+  uint256 public constant CONFIGURATOR_REVISION = 4;
 
   /// @inheritdoc VersionedInitializable
   function getRevision() internal pure virtual override returns (uint256) {
diff --git a/src/core/instances/PoolInstance.sol b/src/contracts/instances/PoolInstance.sol
similarity index 71%
rename from src/core/instances/PoolInstance.sol
rename to src/contracts/instances/PoolInstance.sol
index 0af51bbe..b032e63e 100644
--- a/src/core/instances/PoolInstance.sol
+++ b/src/contracts/instances/PoolInstance.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Pool} from '../contracts/protocol/pool/Pool.sol';
-import {IPoolAddressesProvider} from '../contracts/interfaces/IPoolAddressesProvider.sol';
-import {Errors} from '../contracts/protocol/libraries/helpers/Errors.sol';
+import {Pool} from '../protocol/pool/Pool.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
+import {Errors} from '../protocol/libraries/helpers/Errors.sol';
 
 contract PoolInstance is Pool {
-  uint256 public constant POOL_REVISION = 4;
+  uint256 public constant POOL_REVISION = 5;
 
   constructor(IPoolAddressesProvider provider) Pool(provider) {}
 
@@ -19,7 +19,6 @@ contract PoolInstance is Pool {
    */
   function initialize(IPoolAddressesProvider provider) external virtual override initializer {
     require(provider == ADDRESSES_PROVIDER, Errors.INVALID_ADDRESSES_PROVIDER);
-    _maxStableRateBorrowSizePercent = 0.25e4;
   }
 
   function getRevision() internal pure virtual override returns (uint256) {
diff --git a/src/core/instances/VariableDebtTokenInstance.sol b/src/contracts/instances/VariableDebtTokenInstance.sol
similarity index 91%
rename from src/core/instances/VariableDebtTokenInstance.sol
rename to src/contracts/instances/VariableDebtTokenInstance.sol
index 11ac68e6..b2c3dc89 100644
--- a/src/core/instances/VariableDebtTokenInstance.sol
+++ b/src/contracts/instances/VariableDebtTokenInstance.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {VariableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../contracts/protocol/tokenization/VariableDebtToken.sol';
+import {VariableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../protocol/tokenization/VariableDebtToken.sol';
 
 contract VariableDebtTokenInstance is VariableDebtToken {
   uint256 public constant DEBT_TOKEN_REVISION = 1;
diff --git a/src/core/contracts/interfaces/IACLManager.sol b/src/contracts/interfaces/IACLManager.sol
similarity index 100%
rename from src/core/contracts/interfaces/IACLManager.sol
rename to src/contracts/interfaces/IACLManager.sol
diff --git a/src/core/contracts/interfaces/IAToken.sol b/src/contracts/interfaces/IAToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IAToken.sol
rename to src/contracts/interfaces/IAToken.sol
diff --git a/src/core/contracts/interfaces/IAaveIncentivesController.sol b/src/contracts/interfaces/IAaveIncentivesController.sol
similarity index 100%
rename from src/core/contracts/interfaces/IAaveIncentivesController.sol
rename to src/contracts/interfaces/IAaveIncentivesController.sol
diff --git a/src/core/contracts/interfaces/IAaveOracle.sol b/src/contracts/interfaces/IAaveOracle.sol
similarity index 100%
rename from src/core/contracts/interfaces/IAaveOracle.sol
rename to src/contracts/interfaces/IAaveOracle.sol
diff --git a/src/core/contracts/interfaces/ICreditDelegationToken.sol b/src/contracts/interfaces/ICreditDelegationToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/ICreditDelegationToken.sol
rename to src/contracts/interfaces/ICreditDelegationToken.sol
diff --git a/src/core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol b/src/contracts/interfaces/IDefaultInterestRateStrategyV2.sol
similarity index 95%
rename from src/core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol
rename to src/contracts/interfaces/IDefaultInterestRateStrategyV2.sol
index 5b8b0149..938e2d8f 100644
--- a/src/core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol
+++ b/src/contracts/interfaces/IDefaultInterestRateStrategyV2.sol
@@ -10,16 +10,6 @@ import {IPoolAddressesProvider} from './IPoolAddressesProvider.sol';
  * @notice Interface of the default interest rate strategy used by the Aave protocol
  */
 interface IDefaultInterestRateStrategyV2 is IReserveInterestRateStrategy {
-  struct CalcInterestRatesLocalVars {
-    uint256 availableLiquidity;
-    uint256 totalDebt;
-    uint256 currentVariableBorrowRate;
-    uint256 currentLiquidityRate;
-    uint256 borrowUsageRatio;
-    uint256 supplyUsageRatio;
-    uint256 availableLiquidityPlusDebt;
-  }
-
   /**
    * @notice Holds the interest rate data for a given reserve
    *
diff --git a/src/core/contracts/interfaces/IDelegationToken.sol b/src/contracts/interfaces/IDelegationToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IDelegationToken.sol
rename to src/contracts/interfaces/IDelegationToken.sol
diff --git a/src/core/contracts/interfaces/IERC20WithPermit.sol b/src/contracts/interfaces/IERC20WithPermit.sol
similarity index 100%
rename from src/core/contracts/interfaces/IERC20WithPermit.sol
rename to src/contracts/interfaces/IERC20WithPermit.sol
diff --git a/src/core/contracts/interfaces/IInitializableAToken.sol b/src/contracts/interfaces/IInitializableAToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IInitializableAToken.sol
rename to src/contracts/interfaces/IInitializableAToken.sol
diff --git a/src/core/contracts/interfaces/IInitializableDebtToken.sol b/src/contracts/interfaces/IInitializableDebtToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IInitializableDebtToken.sol
rename to src/contracts/interfaces/IInitializableDebtToken.sol
diff --git a/src/core/contracts/interfaces/IL2Pool.sol b/src/contracts/interfaces/IL2Pool.sol
similarity index 88%
rename from src/core/contracts/interfaces/IL2Pool.sol
rename to src/contracts/interfaces/IL2Pool.sol
index 64f3e2eb..56dee912 100644
--- a/src/core/contracts/interfaces/IL2Pool.sol
+++ b/src/contracts/interfaces/IL2Pool.sol
@@ -92,24 +92,6 @@ interface IL2Pool {
    */
   function repayWithATokens(bytes32 args) external returns (uint256);
 
-  /**
-   * @notice Calldata efficient wrapper of the swapBorrowRateMode function
-   * @param args Arguments for the swapBorrowRateMode function packed in one bytes32
-   *    232 bits            8 bits             16 bits
-   * | 0-padding | shortenedInterestRateMode | assetId |
-   * @dev assetId is the index of the asset in the reservesList.
-   */
-  function swapBorrowRateMode(bytes32 args) external;
-
-  /**
-   * @notice Calldata efficient wrapper of the rebalanceStableBorrowRate function
-   * @param args Arguments for the rebalanceStableBorrowRate function packed in one bytes32
-   *    80 bits      160 bits     16 bits
-   * | 0-padding | user address | assetId |
-   * @dev assetId is the index of the asset in the reservesList.
-   */
-  function rebalanceStableBorrowRate(bytes32 args) external;
-
   /**
    * @notice Calldata efficient wrapper of the setUserUseReserveAsCollateral function
    * @param args Arguments for the setUserUseReserveAsCollateral function packed in one bytes32
diff --git a/src/core/contracts/interfaces/IPool.sol b/src/contracts/interfaces/IPool.sol
similarity index 89%
rename from src/core/contracts/interfaces/IPool.sol
rename to src/contracts/interfaces/IPool.sol
index 86becac3..01e1bcaf 100644
--- a/src/core/contracts/interfaces/IPool.sol
+++ b/src/contracts/interfaces/IPool.sol
@@ -67,7 +67,7 @@ interface IPool {
    * initiator of the transaction on flashLoan()
    * @param onBehalfOf The address that will be getting the debt
    * @param amount The amount borrowed out
-   * @param interestRateMode The rate mode: 1 for Stable, 2 for Variable
+   * @param interestRateMode The rate mode: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param borrowRate The numeric rate at which the user has borrowed, expressed in ray
    * @param referralCode The referral code used
    */
@@ -97,18 +97,6 @@ interface IPool {
     bool useATokens
   );
 
-  /**
-   * @dev Emitted on swapBorrowRateMode()
-   * @param reserve The address of the underlying asset of the reserve
-   * @param user The address of the user swapping his rate mode
-   * @param interestRateMode The current interest rate mode of the position being swapped: 1 for Stable, 2 for Variable
-   */
-  event SwapBorrowRateMode(
-    address indexed reserve,
-    address indexed user,
-    DataTypes.InterestRateMode interestRateMode
-  );
-
   /**
    * @dev Emitted on borrow(), repay() and liquidationCall() when using isolated assets
    * @param asset The address of the underlying asset of the reserve
@@ -137,20 +125,14 @@ interface IPool {
    */
   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);
 
-  /**
-   * @dev Emitted on rebalanceStableBorrowRate()
-   * @param reserve The address of the underlying asset of the reserve
-   * @param user The address of the user for which the rebalance has been executed
-   */
-  event RebalanceStableBorrowRate(address indexed reserve, address indexed user);
-
   /**
    * @dev Emitted on flashLoan()
    * @param target The address of the flash loan receiver contract
    * @param initiator The address initiating the flash loan
    * @param asset The address of the asset being flash borrowed
    * @param amount The amount flash borrowed
-   * @param interestRateMode The flashloan mode: 0 for regular flashloan, 1 for Stable debt, 2 for Variable debt
+   * @param interestRateMode The flashloan mode: 0 for regular flashloan,
+   *        1 for Stable (Deprecated on v3.2.0), 2 for Variable
    * @param premium The fee flash borrowed
    * @param referralCode The referral code used
    */
@@ -189,7 +171,7 @@ interface IPool {
    * @dev Emitted when the state of a reserve is updated.
    * @param reserve The address of the underlying asset of the reserve
    * @param liquidityRate The next liquidity rate
-   * @param stableBorrowRate The next stable borrow rate
+   * @param stableBorrowRate The next stable borrow rate @note deprecated on v3.2.0
    * @param variableBorrowRate The next variable borrow rate
    * @param liquidityIndex The next liquidity index
    * @param variableBorrowIndex The next variable borrow index
@@ -288,13 +270,12 @@ interface IPool {
 
   /**
    * @notice Allows users to borrow a specific `amount` of the reserve underlying asset, provided that the borrower
-   * already supplied enough collateral, or he was given enough allowance by a credit delegator on the
-   * corresponding debt token (StableDebtToken or VariableDebtToken)
+   * already supplied enough collateral, or he was given enough allowance by a credit delegator on the VariableDebtToken
    * - E.g. User borrows 100 USDC passing as `onBehalfOf` his own address, receiving the 100 USDC in his wallet
-   *   and 100 stable/variable debt tokens, depending on the `interestRateMode`
+   *   and 100 variable debt tokens
    * @param asset The address of the underlying asset to borrow
    * @param amount The amount to be borrowed
-   * @param interestRateMode The interest rate mode at which the user wants to borrow: 1 for Stable, 2 for Variable
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
    * @param onBehalfOf The address of the user who will receive the debt. Should be the address of the borrower itself
@@ -311,11 +292,11 @@ interface IPool {
 
   /**
    * @notice Repays a borrowed `amount` on a specific reserve, burning the equivalent debt tokens owned
-   * - E.g. User repays 100 USDC, burning 100 variable/stable debt tokens of the `onBehalfOf` address
+   * - E.g. User repays 100 USDC, burning 100 variable debt tokens of the `onBehalfOf` address
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param onBehalfOf The address of the user who will get his debt reduced/removed. Should be the address of the
    * user calling the function if he wants to reduce/remove his own debt, or the address of any other
    * other borrower whose debt should be removed
@@ -334,7 +315,7 @@ interface IPool {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param onBehalfOf Address of the user who will get his debt reduced/removed. Should be the address of the
    * user calling the function if he wants to reduce/remove his own debt, or the address of any other
    * other borrower whose debt should be removed
@@ -358,13 +339,13 @@ interface IPool {
   /**
    * @notice Repays a borrowed `amount` on a specific reserve using the reserve aTokens, burning the
    * equivalent debt tokens
-   * - E.g. User repays 100 USDC using 100 aUSDC, burning 100 variable/stable debt tokens
+   * - E.g. User repays 100 USDC using 100 aUSDC, burning 100 variable debt tokens
    * @dev  Passing uint256.max as amount will clean up any residual aToken dust balance, if the user aToken
    * balance is not enough to cover the whole debt
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 for Stable, 2 for Variable
+   * @param interestRateMode DEPRECATED in v3.2.0
    * @return The final amount repaid
    */
   function repayWithATokens(
@@ -373,32 +354,6 @@ interface IPool {
     uint256 interestRateMode
   ) external returns (uint256);
 
-  /**
-   * @notice Allows a borrower to swap his debt between stable and variable mode, or vice versa
-   * @param asset The address of the underlying asset borrowed
-   * @param interestRateMode The current interest rate mode of the position being swapped: 1 for Stable, 2 for Variable
-   */
-  function swapBorrowRateMode(address asset, uint256 interestRateMode) external;
-
-  /**
-   * @notice Permissionless method which allows anyone to swap a users stable debt to variable debt
-   * @dev Introduced in favor of stable rate deprecation
-   * @param asset The address of the underlying asset borrowed
-   * @param user The address of the user whose debt will be swapped from stable to variable
-   */
-  function swapToVariable(address asset, address user) external;
-
-  /**
-   * @notice Rebalances the stable interest rate of a user to the current stable rate defined on the reserve.
-   * - Users can be rebalanced if the following conditions are satisfied:
-   *     1. Usage ratio is above 95%
-   *     2. the current supply APY is below REBALANCE_UP_THRESHOLD * maxVariableBorrowRate, which means that too
-   *        much has been borrowed at a stable rate and suppliers are not earning enough
-   * @param asset The address of the underlying asset borrowed
-   * @param user The address of the user to be rebalanced
-   */
-  function rebalanceStableBorrowRate(address asset, address user) external;
-
   /**
    * @notice Allows suppliers to enable/disable a specific supplied asset as collateral
    * @param asset The address of the underlying asset supplied
@@ -435,9 +390,9 @@ interface IPool {
    * @param amounts The amounts of the assets being flash-borrowed
    * @param interestRateModes Types of the debt to open if the flash loan is not returned:
    *   0 -> Don't open any debt, just revert if funds can't be transferred from the receiver
-   *   1 -> Open debt at stable rate for the value of the amount flash-borrowed to the `onBehalfOf` address
+   *   1 -> Deprecated on v3.2.0
    *   2 -> Open debt at variable rate for the value of the amount flash-borrowed to the `onBehalfOf` address
-   * @param onBehalfOf The address  that will receive the debt in the case of using on `modes` 1 or 2
+   * @param onBehalfOf The address  that will receive the debt in the case of using 2 on `modes`
    * @param params Variadic packed params to pass to the receiver as extra information
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
@@ -502,14 +457,12 @@ interface IPool {
    * @dev Only callable by the PoolConfigurator contract
    * @param asset The address of the underlying asset of the reserve
    * @param aTokenAddress The address of the aToken that will be assigned to the reserve
-   * @param stableDebtAddress The address of the StableDebtToken that will be assigned to the reserve
    * @param variableDebtAddress The address of the VariableDebtToken that will be assigned to the reserve
    * @param interestRateStrategyAddress The address of the interest rate strategy contract
    */
   function initReserve(
     address asset,
     address aTokenAddress,
-    address stableDebtAddress,
     address variableDebtAddress,
     address interestRateStrategyAddress
   ) external;
@@ -517,6 +470,7 @@ interface IPool {
   /**
    * @notice Drop a reserve
    * @dev Only callable by the PoolConfigurator contract
+   * @dev Does not reset eMode flags, which must be considered when reusing the same reserve id for a different reserve.
    * @param asset The address of the underlying asset of the reserve
    */
   function dropReserve(address asset) external;
@@ -689,20 +643,70 @@ interface IPool {
   ) external;
 
   /**
-   * @notice Configures a new category for the eMode.
+   * @notice Configures a new or alters an existing collateral configuration of an eMode.
    * @dev In eMode, the protocol allows very high borrowing power to borrow assets of the same category.
    * The category 0 is reserved as it's the default for volatile assets
    * @param id The id of the category
    * @param config The configuration of the category
    */
-  function configureEModeCategory(uint8 id, DataTypes.EModeCategory memory config) external;
+  function configureEModeCategory(
+    uint8 id,
+    DataTypes.EModeCategoryBaseConfiguration memory config
+  ) external;
+
+  /**
+   * @notice Replaces the current eMode collateralBitmap.
+   * @param id The id of the category
+   * @param collateralBitmap The collateralBitmap of the category
+   */
+  function configureEModeCategoryCollateralBitmap(uint8 id, uint128 collateralBitmap) external;
+
+  /**
+   * @notice Replaces the current eMode borrowableBitmap.
+   * @param id The id of the category
+   * @param borrowableBitmap The borrowableBitmap of the category
+   */
+  function configureEModeCategoryBorrowableBitmap(uint8 id, uint128 borrowableBitmap) external;
 
   /**
    * @notice Returns the data of an eMode category
+   * @dev DEPRECATED use independent getters instead
    * @param id The id of the category
    * @return The configuration data of the category
    */
-  function getEModeCategoryData(uint8 id) external view returns (DataTypes.EModeCategory memory);
+  function getEModeCategoryData(
+    uint8 id
+  ) external view returns (DataTypes.EModeCategoryLegacy memory);
+
+  /**
+   * @notice Returns the label of an eMode category
+   * @param id The id of the category
+   * @return The label of the category
+   */
+  function getEModeCategoryLabel(uint8 id) external view returns (string memory);
+
+  /**
+   * @notice Returns the collateral config of an eMode category
+   * @param id The id of the category
+   * @return The ltv,lt,lb of the category
+   */
+  function getEModeCategoryCollateralConfig(
+    uint8 id
+  ) external view returns (DataTypes.CollateralConfig memory);
+
+  /**
+   * @notice Returns the collateralBitmap of an eMode category
+   * @param id The id of the category
+   * @return The collateralBitmap of the category
+   */
+  function getEModeCategoryCollateralBitmap(uint8 id) external view returns (uint128);
+
+  /**
+   * @notice Returns the borrowableBitmap of an eMode category
+   * @param id The id of the category
+   * @return The borrowableBitmap of the category
+   */
+  function getEModeCategoryBorrowableBitmap(uint8 id) external view returns (uint128);
 
   /**
    * @notice Allows a user to use the protocol in eMode
@@ -740,12 +744,6 @@ interface IPool {
    **/
   function getLiquidationGracePeriod(address asset) external returns (uint40);
 
-  /**
-   * @notice Returns the percentage of available liquidity that can be borrowed at once at stable rate
-   * @return The percentage of available liquidity to borrow, expressed in bps
-   */
-  function MAX_STABLE_RATE_BORROW_SIZE_PERCENT() external view returns (uint256);
-
   /**
    * @notice Returns the total fee on flash loans
    * @return The total fee on flashloans
diff --git a/src/core/contracts/interfaces/IPoolAddressesProvider.sol b/src/contracts/interfaces/IPoolAddressesProvider.sol
similarity index 100%
rename from src/core/contracts/interfaces/IPoolAddressesProvider.sol
rename to src/contracts/interfaces/IPoolAddressesProvider.sol
diff --git a/src/core/contracts/interfaces/IPoolAddressesProviderRegistry.sol b/src/contracts/interfaces/IPoolAddressesProviderRegistry.sol
similarity index 100%
rename from src/core/contracts/interfaces/IPoolAddressesProviderRegistry.sol
rename to src/contracts/interfaces/IPoolAddressesProviderRegistry.sol
diff --git a/src/core/contracts/interfaces/IPoolConfigurator.sol b/src/contracts/interfaces/IPoolConfigurator.sol
similarity index 89%
rename from src/core/contracts/interfaces/IPoolConfigurator.sol
rename to src/contracts/interfaces/IPoolConfigurator.sol
index 6ba397e5..977d316e 100644
--- a/src/core/contracts/interfaces/IPoolConfigurator.sol
+++ b/src/contracts/interfaces/IPoolConfigurator.sol
@@ -14,7 +14,7 @@ interface IPoolConfigurator {
    * @dev Emitted when a reserve is initialized.
    * @param asset The address of the underlying asset of the reserve
    * @param aToken The address of the associated aToken contract
-   * @param stableDebtToken The address of the associated stable rate debt token
+   * @param stableDebtToken, DEPRECATED in v3.2.0
    * @param variableDebtToken The address of the associated variable rate debt token
    * @param interestRateStrategyAddress The address of the interest rate strategy for the reserve
    */
@@ -61,13 +61,6 @@ interface IPoolConfigurator {
     uint256 liquidationBonus
   );
 
-  /**
-   * @dev Emitted when stable rate borrowing is enabled or disabled on a reserve
-   * @param asset The address of the underlying asset of the reserve
-   * @param enabled True if stable rate borrowing is enabled, false otherwise
-   */
-  event ReserveStableRateBorrowing(address indexed asset, bool enabled);
-
   /**
    * @dev Emitted when a reserve is activated or deactivated
    * @param asset The address of the underlying asset of the reserve
@@ -157,20 +150,28 @@ interface IPoolConfigurator {
   );
 
   /**
-   * @dev Emitted when the category of an asset in eMode is changed.
+   * @dev Emitted when an collateral configuration of an asset in an eMode is changed.
+   * @param asset The address of the underlying asset of the reserve
+   * @param categoryId The eMode category
+   * @param collateral True if the asset is enabled as collateral in the eMode, false otherwise.
+   */
+  event AssetCollateralInEModeChanged(address indexed asset, uint8 categoryId, bool collateral);
+
+  /**
+   * @dev Emitted when the borrowable configuration of an asset in an eMode changed.
    * @param asset The address of the underlying asset of the reserve
-   * @param oldCategoryId The old eMode asset category
-   * @param newCategoryId The new eMode asset category
+   * @param categoryId The eMode category
+   * @param borrowable True if the asset is enabled as borrowable in the eMode, false otherwise.
    */
-  event EModeAssetCategoryChanged(address indexed asset, uint8 oldCategoryId, uint8 newCategoryId);
+  event AssetBorrowableInEModeChanged(address indexed asset, uint8 categoryId, bool borrowable);
 
   /**
-   * @dev Emitted when a new eMode category is added.
+   * @dev Emitted when a new eMode category is added or an existing category is altered.
    * @param categoryId The new eMode category id
    * @param ltv The ltv for the asset category in eMode
    * @param liquidationThreshold The liquidationThreshold for the asset category in eMode
    * @param liquidationBonus The liquidationBonus for the asset category in eMode
-   * @param oracle The optional address of the price oracle specific for this category
+   * @param oracle DEPRECATED in v3.2.0
    * @param label A human readable identifier for the category
    */
   event EModeCategoryAdded(
@@ -213,18 +214,6 @@ interface IPoolConfigurator {
     address indexed implementation
   );
 
-  /**
-   * @dev Emitted when the implementation of a stable debt token is upgraded.
-   * @param asset The address of the underlying asset of the reserve
-   * @param proxy The stable debt token proxy address
-   * @param implementation The new aToken implementation
-   */
-  event StableDebtTokenUpgraded(
-    address indexed asset,
-    address indexed proxy,
-    address indexed implementation
-  );
-
   /**
    * @dev Emitted when the implementation of a variable debt token is upgraded.
    * @param asset The address of the underlying asset of the reserve
@@ -301,14 +290,6 @@ interface IPoolConfigurator {
    */
   function updateAToken(ConfiguratorInputTypes.UpdateATokenInput calldata input) external;
 
-  /**
-   * @notice Updates the stable debt token implementation for the reserve.
-   * @param input The stableDebtToken update parameters
-   */
-  function updateStableDebtToken(
-    ConfiguratorInputTypes.UpdateDebtTokenInput calldata input
-  ) external;
-
   /**
    * @notice Updates the variable debt token implementation for the asset.
    * @param input The variableDebtToken update parameters
@@ -319,7 +300,6 @@ interface IPoolConfigurator {
 
   /**
    * @notice Configures borrowing on a reserve.
-   * @dev Can only be disabled (set to false) if stable borrowing is disabled
    * @param asset The address of the underlying asset of the reserve
    * @param enabled True if borrowing needs to be enabled, false otherwise
    */
@@ -341,14 +321,6 @@ interface IPoolConfigurator {
     uint256 liquidationBonus
   ) external;
 
-  /**
-   * @notice Enable or disable stable rate borrowing on a reserve.
-   * @dev Can only be enabled (set to true) if borrowing is enabled
-   * @param asset The address of the underlying asset of the reserve
-   * @param enabled True if stable rate borrowing needs to be enabled, false otherwise
-   */
-  function setReserveStableRateBorrowing(address asset, bool enabled) external;
-
   /**
    * @notice Enable or disable flashloans on a reserve
    * @param asset The address of the underlying asset of the reserve
@@ -486,23 +458,28 @@ interface IPoolConfigurator {
   function setUnbackedMintCap(address asset, uint256 newUnbackedMintCap) external;
 
   /**
-   * @notice Assign an efficiency mode (eMode) category to asset.
+   * @notice Enables/disables an asset to be borrowable in a selected eMode.
+   * - eMode.borrowable always has less priority then reserve.borrowable
    * @param asset The address of the underlying asset of the reserve
-   * @param newCategoryId The new category id of the asset
+   * @param categoryId The eMode categoryId
+   * @param borrowable True if the asset should be borrowable in the given eMode category, false otherwise.
    */
-  function setAssetEModeCategory(address asset, uint8 newCategoryId) external;
+  function setAssetBorrowableInEMode(address asset, uint8 categoryId, bool borrowable) external;
 
   /**
-   * @notice Adds a new efficiency mode (eMode) category.
-   * @dev If zero is provided as oracle address, the default asset oracles will be used to compute the overall debt and
-   * overcollateralization of the users using this category.
-   * @dev The new ltv and liquidation threshold must be greater than the base
-   * ltvs and liquidation thresholds of all assets within the eMode category
+   * @notice Enables/disables an asset to be collateral in a selected eMode.
+   * @param asset The address of the underlying asset of the reserve
+   * @param categoryId The eMode categoryId
+   * @param collateral True if the asset should be collateral in the given eMode category, false otherwise.
+   */
+  function setAssetCollateralInEMode(address asset, uint8 categoryId, bool collateral) external;
+
+  /**
+   * @notice Adds a new efficiency mode (eMode) category or alters a existing one.
    * @param categoryId The id of the category to be configured
    * @param ltv The ltv associated with the category
    * @param liquidationThreshold The liquidation threshold associated with the category
    * @param liquidationBonus The liquidation bonus associated with the category
-   * @param oracle The oracle associated with the category
    * @param label A label identifying the category
    */
   function setEModeCategory(
@@ -510,7 +487,6 @@ interface IPoolConfigurator {
     uint16 ltv,
     uint16 liquidationThreshold,
     uint16 liquidationBonus,
-    address oracle,
     string calldata label
   ) external;
 
diff --git a/src/core/contracts/interfaces/IPoolDataProvider.sol b/src/contracts/interfaces/IPoolDataProvider.sol
similarity index 96%
rename from src/core/contracts/interfaces/IPoolDataProvider.sol
rename to src/contracts/interfaces/IPoolDataProvider.sol
index 2ec458b9..a9df8903 100644
--- a/src/core/contracts/interfaces/IPoolDataProvider.sol
+++ b/src/contracts/interfaces/IPoolDataProvider.sol
@@ -66,13 +66,6 @@ interface IPoolDataProvider {
       bool isFrozen
     );
 
-  /**
-   * @notice Returns the efficiency mode category of the reserve
-   * @param asset The address of the underlying asset of the reserve
-   * @return The eMode id of the reserve
-   */
-  function getReserveEModeCategory(address asset) external view returns (uint256);
-
   /**
    * @notice Returns the caps parameters of the reserve
    * @param asset The address of the underlying asset of the reserve
@@ -211,7 +204,7 @@ interface IPoolDataProvider {
    * @notice Returns the token addresses of the reserve
    * @param asset The address of the underlying asset of the reserve
    * @return aTokenAddress The AToken address of the reserve
-   * @return stableDebtTokenAddress The StableDebtToken address of the reserve
+   * @return stableDebtTokenAddress DEPRECATED in v3.2.0
    * @return variableDebtTokenAddress The VariableDebtToken address of the reserve
    */
   function getReserveTokensAddresses(
diff --git a/src/core/contracts/interfaces/IPriceOracle.sol b/src/contracts/interfaces/IPriceOracle.sol
similarity index 100%
rename from src/core/contracts/interfaces/IPriceOracle.sol
rename to src/contracts/interfaces/IPriceOracle.sol
diff --git a/src/core/contracts/interfaces/IPriceOracleGetter.sol b/src/contracts/interfaces/IPriceOracleGetter.sol
similarity index 100%
rename from src/core/contracts/interfaces/IPriceOracleGetter.sol
rename to src/contracts/interfaces/IPriceOracleGetter.sol
diff --git a/src/core/contracts/interfaces/IPriceOracleSentinel.sol b/src/contracts/interfaces/IPriceOracleSentinel.sol
similarity index 100%
rename from src/core/contracts/interfaces/IPriceOracleSentinel.sol
rename to src/contracts/interfaces/IPriceOracleSentinel.sol
diff --git a/src/core/contracts/interfaces/IReserveInterestRateStrategy.sol b/src/contracts/interfaces/IReserveInterestRateStrategy.sol
similarity index 89%
rename from src/core/contracts/interfaces/IReserveInterestRateStrategy.sol
rename to src/contracts/interfaces/IReserveInterestRateStrategy.sol
index cdd81565..e953cce5 100644
--- a/src/core/contracts/interfaces/IReserveInterestRateStrategy.sol
+++ b/src/contracts/interfaces/IReserveInterestRateStrategy.sol
@@ -21,10 +21,9 @@ interface IReserveInterestRateStrategy {
    * @notice Calculates the interest rates depending on the reserve's state and configurations
    * @param params The parameters needed to calculate interest rates
    * @return liquidityRate The liquidity rate expressed in ray
-   * @return stableBorrowRate The stable borrow rate expressed in ray
    * @return variableBorrowRate The variable borrow rate expressed in ray
    */
   function calculateInterestRates(
     DataTypes.CalculateInterestRatesParams memory params
-  ) external view returns (uint256, uint256, uint256);
+  ) external view returns (uint256, uint256);
 }
diff --git a/src/core/contracts/interfaces/IScaledBalanceToken.sol b/src/contracts/interfaces/IScaledBalanceToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IScaledBalanceToken.sol
rename to src/contracts/interfaces/IScaledBalanceToken.sol
diff --git a/src/core/contracts/interfaces/ISequencerOracle.sol b/src/contracts/interfaces/ISequencerOracle.sol
similarity index 100%
rename from src/core/contracts/interfaces/ISequencerOracle.sol
rename to src/contracts/interfaces/ISequencerOracle.sol
diff --git a/src/core/contracts/interfaces/IVariableDebtToken.sol b/src/contracts/interfaces/IVariableDebtToken.sol
similarity index 100%
rename from src/core/contracts/interfaces/IVariableDebtToken.sol
rename to src/contracts/interfaces/IVariableDebtToken.sol
diff --git a/src/core/contracts/misc/AaveOracle.sol b/src/contracts/misc/AaveOracle.sol
similarity index 100%
rename from src/core/contracts/misc/AaveOracle.sol
rename to src/contracts/misc/AaveOracle.sol
diff --git a/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol b/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol
similarity index 73%
rename from src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol
rename to src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol
index f90cfe91..3552cb77 100644
--- a/src/core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol
+++ b/src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
-import {WadRayMath} from '../libraries/math/WadRayMath.sol';
-import {PercentageMath} from '../libraries/math/PercentageMath.sol';
-import {DataTypes} from '../libraries/types/DataTypes.sol';
-import {Errors} from '../libraries/helpers/Errors.sol';
-import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';
-import {IReserveInterestRateStrategy} from '../../interfaces/IReserveInterestRateStrategy.sol';
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
+import {WadRayMath} from '../protocol/libraries/math/WadRayMath.sol';
+import {PercentageMath} from '../protocol/libraries/math/PercentageMath.sol';
+import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
+import {Errors} from '../protocol/libraries/helpers/Errors.sol';
+import {IDefaultInterestRateStrategyV2} from '../interfaces/IDefaultInterestRateStrategyV2.sol';
+import {IReserveInterestRateStrategy} from '../interfaces/IReserveInterestRateStrategy.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
 
 /**
  * @title DefaultReserveInterestRateStrategyV2 contract
@@ -22,6 +22,15 @@ contract DefaultReserveInterestRateStrategyV2 is IDefaultInterestRateStrategyV2
   using WadRayMath for uint256;
   using PercentageMath for uint256;
 
+  struct CalcInterestRatesLocalVars {
+    uint256 availableLiquidity;
+    uint256 currentVariableBorrowRate;
+    uint256 currentLiquidityRate;
+    uint256 borrowUsageRatio;
+    uint256 supplyUsageRatio;
+    uint256 availableLiquidityPlusDebt;
+  }
+
   /// @inheritdoc IDefaultInterestRateStrategyV2
   IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;
 
@@ -115,35 +124,33 @@ contract DefaultReserveInterestRateStrategyV2 is IDefaultInterestRateStrategyV2
   /// @inheritdoc IReserveInterestRateStrategy
   function calculateInterestRates(
     DataTypes.CalculateInterestRatesParams memory params
-  ) external view virtual override returns (uint256, uint256, uint256) {
+  ) external view virtual override returns (uint256, uint256) {
     InterestRateDataRay memory rateData = _rayifyRateData(_interestRateData[params.reserve]);
 
     // @note This is a short circuit to allow mintable assets (ex. GHO), which by definition cannot be supplied
     // and thus do not use virtual underlying balances.
     if (!params.usingVirtualBalance) {
-      return (0, 0, rateData.baseVariableBorrowRate);
+      return (0, rateData.baseVariableBorrowRate);
     }
 
     CalcInterestRatesLocalVars memory vars;
 
-    vars.totalDebt = params.totalStableDebt + params.totalVariableDebt;
-
     vars.currentLiquidityRate = 0;
     vars.currentVariableBorrowRate = rateData.baseVariableBorrowRate;
 
-    if (vars.totalDebt != 0) {
+    if (params.totalDebt != 0) {
       vars.availableLiquidity =
         params.virtualUnderlyingBalance +
         params.liquidityAdded -
         params.liquidityTaken;
 
-      vars.availableLiquidityPlusDebt = vars.availableLiquidity + vars.totalDebt;
-      vars.borrowUsageRatio = vars.totalDebt.rayDiv(vars.availableLiquidityPlusDebt);
-      vars.supplyUsageRatio = vars.totalDebt.rayDiv(
+      vars.availableLiquidityPlusDebt = vars.availableLiquidity + params.totalDebt;
+      vars.borrowUsageRatio = params.totalDebt.rayDiv(vars.availableLiquidityPlusDebt);
+      vars.supplyUsageRatio = params.totalDebt.rayDiv(
         vars.availableLiquidityPlusDebt + params.unbacked
       );
     } else {
-      return (0, 0, vars.currentVariableBorrowRate);
+      return (0, vars.currentVariableBorrowRate);
     }
 
     if (vars.borrowUsageRatio > rateData.optimalUsageRatio) {
@@ -161,44 +168,12 @@ contract DefaultReserveInterestRateStrategyV2 is IDefaultInterestRateStrategyV2
         .rayDiv(rateData.optimalUsageRatio);
     }
 
-    vars.currentLiquidityRate = _getOverallBorrowRate(
-      params.totalStableDebt,
-      params.totalVariableDebt,
-      vars.currentVariableBorrowRate,
-      params.averageStableBorrowRate
-    ).rayMul(vars.supplyUsageRatio).percentMul(
-        PercentageMath.PERCENTAGE_FACTOR - params.reserveFactor
-      );
-
-    return (vars.currentLiquidityRate, 0, vars.currentVariableBorrowRate);
-  }
-
-  /**
-   * @dev Calculates the overall borrow rate as the weighted average between the total variable debt and total stable
-   * debt
-   * @param totalStableDebt The total borrowed from the reserve at a stable rate
-   * @param totalVariableDebt The total borrowed from the reserve at a variable rate
-   * @param currentVariableBorrowRate The current variable borrow rate of the reserve
-   * @param currentAverageStableBorrowRate The current weighted average of all the stable rate loans
-   * @return The weighted averaged borrow rate
-   */
-  function _getOverallBorrowRate(
-    uint256 totalStableDebt,
-    uint256 totalVariableDebt,
-    uint256 currentVariableBorrowRate,
-    uint256 currentAverageStableBorrowRate
-  ) internal pure returns (uint256) {
-    uint256 totalDebt = totalStableDebt + totalVariableDebt;
-
-    uint256 weightedVariableRate = totalVariableDebt.wadToRay().rayMul(currentVariableBorrowRate);
-
-    uint256 weightedStableRate = totalStableDebt.wadToRay().rayMul(currentAverageStableBorrowRate);
-
-    uint256 overallBorrowRate = (weightedVariableRate + weightedStableRate).rayDiv(
-      totalDebt.wadToRay()
-    );
+    vars.currentLiquidityRate = vars
+      .currentVariableBorrowRate
+      .rayMul(vars.supplyUsageRatio)
+      .percentMul(PercentageMath.PERCENTAGE_FACTOR - params.reserveFactor);
 
-    return overallBorrowRate;
+    return (vars.currentLiquidityRate, vars.currentVariableBorrowRate);
   }
 
   /**
diff --git a/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol b/src/contracts/misc/PriceOracleSentinel.sol
similarity index 89%
rename from src/core/contracts/protocol/configuration/PriceOracleSentinel.sol
rename to src/contracts/misc/PriceOracleSentinel.sol
index 7947d2e6..29ffe1cb 100644
--- a/src/core/contracts/protocol/configuration/PriceOracleSentinel.sol
+++ b/src/contracts/misc/PriceOracleSentinel.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {Errors} from '../libraries/helpers/Errors.sol';
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {IPriceOracleSentinel} from '../../interfaces/IPriceOracleSentinel.sol';
-import {ISequencerOracle} from '../../interfaces/ISequencerOracle.sol';
-import {IACLManager} from '../../interfaces/IACLManager.sol';
+import {Errors} from '../protocol/libraries/helpers/Errors.sol';
+import {IPoolAddressesProvider} from '../interfaces/IPoolAddressesProvider.sol';
+import {IPriceOracleSentinel} from '../interfaces/IPriceOracleSentinel.sol';
+import {ISequencerOracle} from '../interfaces/ISequencerOracle.sol';
+import {IACLManager} from '../interfaces/IACLManager.sol';
 
 /**
  * @title PriceOracleSentinel
diff --git a/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol b/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol
similarity index 95%
rename from src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol
rename to src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol
index 06d2f827..252b4a4b 100644
--- a/src/core/contracts/protocol/libraries/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol
+++ b/src/contracts/misc/aave-upgradeability/BaseImmutableAdminUpgradeabilityProxy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {BaseUpgradeabilityProxy} from '../../../dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol';
+import {BaseUpgradeabilityProxy} from '../../dependencies/openzeppelin/upgradeability/BaseUpgradeabilityProxy.sol';
 
 /**
  * @title BaseImmutableAdminUpgradeabilityProxy
diff --git a/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol b/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol
similarity index 79%
rename from src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol
rename to src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol
index 0deceb5b..6913a19d 100644
--- a/src/core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol
+++ b/src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {InitializableUpgradeabilityProxy} from '../../../dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol';
-import {Proxy} from '../../../dependencies/openzeppelin/upgradeability/Proxy.sol';
+import {InitializableUpgradeabilityProxy} from '../../dependencies/openzeppelin/upgradeability/InitializableUpgradeabilityProxy.sol';
+import {Proxy} from '../../dependencies/openzeppelin/upgradeability/Proxy.sol';
 import {BaseImmutableAdminUpgradeabilityProxy} from './BaseImmutableAdminUpgradeabilityProxy.sol';
 
 /**
diff --git a/src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol b/src/contracts/misc/aave-upgradeability/VersionedInitializable.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol
rename to src/contracts/misc/aave-upgradeability/VersionedInitializable.sol
diff --git a/src/core/contracts/flashloan/base/FlashLoanReceiverBase.sol b/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol
similarity index 79%
rename from src/core/contracts/flashloan/base/FlashLoanReceiverBase.sol
rename to src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol
index cd43c2e1..55fbe6d2 100644
--- a/src/core/contracts/flashloan/base/FlashLoanReceiverBase.sol
+++ b/src/contracts/misc/flashloan/base/FlashLoanReceiverBase.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.10;
 
 import {IFlashLoanReceiver} from '../interfaces/IFlashLoanReceiver.sol';
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../interfaces/IPool.sol';
 
 /**
  * @title FlashLoanReceiverBase
diff --git a/src/core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol b/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol
similarity index 80%
rename from src/core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol
rename to src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol
index 25af62b2..2980a0cc 100644
--- a/src/core/contracts/flashloan/base/FlashLoanSimpleReceiverBase.sol
+++ b/src/contracts/misc/flashloan/base/FlashLoanSimpleReceiverBase.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.10;
 
 import {IFlashLoanSimpleReceiver} from '../interfaces/IFlashLoanSimpleReceiver.sol';
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../interfaces/IPool.sol';
 
 /**
  * @title FlashLoanSimpleReceiverBase
diff --git a/src/core/contracts/flashloan/interfaces/IFlashLoanReceiver.sol b/src/contracts/misc/flashloan/interfaces/IFlashLoanReceiver.sol
similarity index 90%
rename from src/core/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
rename to src/contracts/misc/flashloan/interfaces/IFlashLoanReceiver.sol
index fae79a9f..a3a55684 100644
--- a/src/core/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
+++ b/src/contracts/misc/flashloan/interfaces/IFlashLoanReceiver.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../interfaces/IPool.sol';
 
 /**
  * @title IFlashLoanReceiver
diff --git a/src/core/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol b/src/contracts/misc/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
similarity index 89%
rename from src/core/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
rename to src/contracts/misc/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
index 05c45739..bff21ae4 100644
--- a/src/core/contracts/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
+++ b/src/contracts/misc/flashloan/interfaces/IFlashLoanSimpleReceiver.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {IPool} from '../../interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../interfaces/IPool.sol';
 
 /**
  * @title IFlashLoanSimpleReceiver
diff --git a/src/periphery/contracts/mocks/ATokenMock.sol b/src/contracts/mocks/ATokenMock.sol
similarity index 100%
rename from src/periphery/contracts/mocks/ATokenMock.sol
rename to src/contracts/mocks/ATokenMock.sol
diff --git a/src/periphery/contracts/mocks/MockBadTransferStrategy.sol b/src/contracts/mocks/MockBadTransferStrategy.sol
similarity index 82%
rename from src/periphery/contracts/mocks/MockBadTransferStrategy.sol
rename to src/contracts/mocks/MockBadTransferStrategy.sol
index 2f62c89d..696b3396 100644
--- a/src/periphery/contracts/mocks/MockBadTransferStrategy.sol
+++ b/src/contracts/mocks/MockBadTransferStrategy.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.10;
 
 import {ITransferStrategyBase} from '../rewards/interfaces/ITransferStrategyBase.sol';
 import {TransferStrategyBase} from '../rewards/transfer-strategies/TransferStrategyBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title MockBadTransferStrategy
diff --git a/src/periphery/contracts/mocks/WETH9Mock.sol b/src/contracts/mocks/WETH9Mock.sol
similarity index 72%
rename from src/periphery/contracts/mocks/WETH9Mock.sol
rename to src/contracts/mocks/WETH9Mock.sol
index 1bc1bc48..2372ffeb 100644
--- a/src/periphery/contracts/mocks/WETH9Mock.sol
+++ b/src/contracts/mocks/WETH9Mock.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {WETH9} from '../dependencies/weth/WETH9.sol';
+import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
 
 contract WETH9Mock is WETH9, Ownable {
   constructor(string memory mockName, string memory mockSymbol, address owner) {
diff --git a/src/core/contracts/mocks/flashloan/MockFlashLoanReceiver.sol b/src/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
similarity index 96%
rename from src/core/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
rename to src/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
index 516b4b38..f8877274 100644
--- a/src/core/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
+++ b/src/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.10;
 import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {FlashLoanReceiverBase} from '../../flashloan/base/FlashLoanReceiverBase.sol';
+import {FlashLoanReceiverBase} from '../../misc/flashloan/base/FlashLoanReceiverBase.sol';
 import {MintableERC20} from '../tokens/MintableERC20.sol';
 
 contract MockFlashLoanReceiver is FlashLoanReceiverBase {
diff --git a/src/core/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol b/src/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol
similarity index 95%
rename from src/core/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol
rename to src/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol
index 1edd24a2..b3be47bc 100644
--- a/src/core/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol
+++ b/src/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol
@@ -6,7 +6,7 @@ import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {FlashLoanSimpleReceiverBase} from '../../flashloan/base/FlashLoanSimpleReceiverBase.sol';
+import {FlashLoanSimpleReceiverBase} from '../../misc/flashloan/base/FlashLoanSimpleReceiverBase.sol';
 import {MintableERC20} from '../tokens/MintableERC20.sol';
 
 contract MockFlashLoanSimpleReceiver is FlashLoanSimpleReceiverBase {
diff --git a/src/core/contracts/mocks/helpers/MockIncentivesController.sol b/src/contracts/mocks/helpers/MockIncentivesController.sol
similarity index 100%
rename from src/core/contracts/mocks/helpers/MockIncentivesController.sol
rename to src/contracts/mocks/helpers/MockIncentivesController.sol
diff --git a/src/core/contracts/mocks/helpers/MockL2Pool.sol b/src/contracts/mocks/helpers/MockL2Pool.sol
similarity index 68%
rename from src/core/contracts/mocks/helpers/MockL2Pool.sol
rename to src/contracts/mocks/helpers/MockL2Pool.sol
index c37a7f70..9035cddd 100644
--- a/src/core/contracts/mocks/helpers/MockL2Pool.sol
+++ b/src/contracts/mocks/helpers/MockL2Pool.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.10;
 
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {L2PoolInstance, PoolInstance} from '../../../instances/L2PoolInstance.sol';
-import {VersionedInitializable} from '../../protocol/libraries/aave-upgradeability/VersionedInitializable.sol';
+import {L2PoolInstance, PoolInstance} from '../../instances/L2PoolInstance.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 
 contract MockL2Pool is L2PoolInstance {
   function getRevision()
diff --git a/src/core/contracts/mocks/helpers/MockPeripheryContract.sol b/src/contracts/mocks/helpers/MockPeripheryContract.sol
similarity index 100%
rename from src/core/contracts/mocks/helpers/MockPeripheryContract.sol
rename to src/contracts/mocks/helpers/MockPeripheryContract.sol
diff --git a/src/core/contracts/mocks/helpers/MockPool.sol b/src/contracts/mocks/helpers/MockPool.sol
similarity index 92%
rename from src/core/contracts/mocks/helpers/MockPool.sol
rename to src/contracts/mocks/helpers/MockPool.sol
index c66b83a6..7a27bf14 100644
--- a/src/core/contracts/mocks/helpers/MockPool.sol
+++ b/src/contracts/mocks/helpers/MockPool.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
 
-import {PoolInstance} from '../../../instances/PoolInstance.sol';
+import {PoolInstance} from '../../instances/PoolInstance.sol';
 
 contract MockPoolInherited is PoolInstance {
   uint16 internal _maxNumberOfReserves = 128;
diff --git a/src/core/contracts/mocks/helpers/MockReserveConfiguration.sol b/src/contracts/mocks/helpers/MockReserveConfiguration.sol
similarity index 84%
rename from src/core/contracts/mocks/helpers/MockReserveConfiguration.sol
rename to src/contracts/mocks/helpers/MockReserveConfiguration.sol
index cce1cc9f..c5ef954c 100644
--- a/src/core/contracts/mocks/helpers/MockReserveConfiguration.sol
+++ b/src/contracts/mocks/helpers/MockReserveConfiguration.sol
@@ -69,16 +69,6 @@ contract MockReserveConfiguration {
     return configuration.getBorrowingEnabled();
   }
 
-  function setStableRateBorrowingEnabled(bool enabled) external {
-    DataTypes.ReserveConfigurationMap memory config = configuration;
-    config.setStableRateBorrowingEnabled(enabled);
-    configuration = config;
-  }
-
-  function getStableRateBorrowingEnabled() external view returns (bool) {
-    return configuration.getStableRateBorrowingEnabled();
-  }
-
   function setReserveFactor(uint256 reserveFactor) external {
     DataTypes.ReserveConfigurationMap memory config = configuration;
     config.setReserveFactor(reserveFactor);
@@ -99,16 +89,6 @@ contract MockReserveConfiguration {
     return configuration.getBorrowCap();
   }
 
-  function getEModeCategory() external view returns (uint256) {
-    return configuration.getEModeCategory();
-  }
-
-  function setEModeCategory(uint256 categoryId) external {
-    DataTypes.ReserveConfigurationMap memory config = configuration;
-    config.setEModeCategory(categoryId);
-    configuration = config;
-  }
-
   function setFlashLoanEnabled(bool enabled) external {
     DataTypes.ReserveConfigurationMap memory config = configuration;
     config.setFlashLoanEnabled(enabled);
@@ -149,15 +129,11 @@ contract MockReserveConfiguration {
     return configuration.getUnbackedMintCap();
   }
 
-  function getFlags() external view returns (bool, bool, bool, bool, bool) {
+  function getFlags() external view returns (bool, bool, bool, bool) {
     return configuration.getFlags();
   }
 
-  function getParams()
-    external
-    view
-    returns (uint256, uint256, uint256, uint256, uint256, uint256)
-  {
+  function getParams() external view returns (uint256, uint256, uint256, uint256, uint256) {
     return configuration.getParams();
   }
 
diff --git a/src/core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol b/src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
similarity index 100%
rename from src/core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
rename to src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
diff --git a/src/core/contracts/mocks/oracle/PriceOracle.sol b/src/contracts/mocks/oracle/PriceOracle.sol
similarity index 100%
rename from src/core/contracts/mocks/oracle/PriceOracle.sol
rename to src/contracts/mocks/oracle/PriceOracle.sol
diff --git a/src/core/contracts/mocks/oracle/SequencerOracle.sol b/src/contracts/mocks/oracle/SequencerOracle.sol
similarity index 100%
rename from src/core/contracts/mocks/oracle/SequencerOracle.sol
rename to src/contracts/mocks/oracle/SequencerOracle.sol
diff --git a/src/periphery/contracts/mocks/swap/MockParaSwapAugustus.sol b/src/contracts/mocks/swap/MockParaSwapAugustus.sol
similarity index 91%
rename from src/periphery/contracts/mocks/swap/MockParaSwapAugustus.sol
rename to src/contracts/mocks/swap/MockParaSwapAugustus.sol
index cf41670b..5970c3b7 100644
--- a/src/periphery/contracts/mocks/swap/MockParaSwapAugustus.sol
+++ b/src/contracts/mocks/swap/MockParaSwapAugustus.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IParaSwapAugustus} from '../../adapters/paraswap/interfaces/IParaSwapAugustus.sol';
+import {IParaSwapAugustus} from '../../extensions/paraswap-adapters/interfaces/IParaSwapAugustus.sol';
 import {MockParaSwapTokenTransferProxy} from './MockParaSwapTokenTransferProxy.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {MintableERC20} from 'aave-v3-core/contracts/mocks/tokens/MintableERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {MintableERC20} from '../tokens/MintableERC20.sol';
 
 contract MockParaSwapAugustus is IParaSwapAugustus {
   MockParaSwapTokenTransferProxy immutable TOKEN_TRANSFER_PROXY;
diff --git a/src/periphery/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol b/src/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol
similarity index 74%
rename from src/periphery/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol
rename to src/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol
index 5e34d659..82fa93f8 100644
--- a/src/periphery/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol
+++ b/src/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IParaSwapAugustusRegistry} from '../../adapters/paraswap/interfaces/IParaSwapAugustusRegistry.sol';
+import {IParaSwapAugustusRegistry} from '../../extensions/paraswap-adapters/interfaces/IParaSwapAugustusRegistry.sol';
 
 contract MockParaSwapAugustusRegistry is IParaSwapAugustusRegistry {
   address immutable AUGUSTUS;
diff --git a/src/periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol b/src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol
similarity index 88%
rename from src/periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol
rename to src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol
index efec5e9d..80f41d19 100644
--- a/src/periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol
+++ b/src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IFeeClaimer} from '../../adapters/paraswap/interfaces/IFeeClaimer.sol';
+import {IFeeClaimer} from '../../extensions/paraswap-adapters/interfaces/IFeeClaimer.sol';
 import {MockParaSwapTokenTransferProxy} from './MockParaSwapTokenTransferProxy.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {MintableERC20} from 'aave-v3-core/contracts/mocks/tokens/MintableERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
+import {MintableERC20} from '../tokens/MintableERC20.sol';
 
 contract MockParaSwapFeeClaimer is IFeeClaimer {
   MockParaSwapTokenTransferProxy immutable TOKEN_TRANSFER_PROXY;
diff --git a/src/periphery/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol b/src/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol
similarity index 60%
rename from src/periphery/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol
rename to src/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol
index 711012e8..b36e6a44 100644
--- a/src/periphery/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol
+++ b/src/contracts/mocks/swap/MockParaSwapTokenTransferProxy.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 contract MockParaSwapTokenTransferProxy is Ownable {
   function transferFrom(
diff --git a/src/periphery/contracts/mocks/testnet-helpers/Faucet.sol b/src/contracts/mocks/testnet-helpers/Faucet.sol
similarity index 95%
rename from src/periphery/contracts/mocks/testnet-helpers/Faucet.sol
rename to src/contracts/mocks/testnet-helpers/Faucet.sol
index 539aee46..47a2a3f6 100644
--- a/src/periphery/contracts/mocks/testnet-helpers/Faucet.sol
+++ b/src/contracts/mocks/testnet-helpers/Faucet.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
 import {TestnetERC20} from './TestnetERC20.sol';
 import {IFaucet} from './IFaucet.sol';
 
diff --git a/src/periphery/contracts/mocks/testnet-helpers/IFaucet.sol b/src/contracts/mocks/testnet-helpers/IFaucet.sol
similarity index 100%
rename from src/periphery/contracts/mocks/testnet-helpers/IFaucet.sol
rename to src/contracts/mocks/testnet-helpers/IFaucet.sol
diff --git a/src/periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol b/src/contracts/mocks/testnet-helpers/TestnetERC20.sol
similarity index 90%
rename from src/periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol
rename to src/contracts/mocks/testnet-helpers/TestnetERC20.sol
index 58e4ddf2..efe94186 100644
--- a/src/periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol
+++ b/src/contracts/mocks/testnet-helpers/TestnetERC20.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
-import {ERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/ERC20.sol';
-import {IERC20WithPermit} from 'aave-v3-core/contracts/interfaces/IERC20WithPermit.sol';
+import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
+import {ERC20} from '../../dependencies/openzeppelin/contracts/ERC20.sol';
+import {IERC20WithPermit} from '../../interfaces/IERC20WithPermit.sol';
 
 /**
  * @title TestnetERC20
diff --git a/src/core/contracts/mocks/tests/FlashloanAttacker.sol b/src/contracts/mocks/tests/FlashloanAttacker.sol
similarity index 95%
rename from src/core/contracts/mocks/tests/FlashloanAttacker.sol
rename to src/contracts/mocks/tests/FlashloanAttacker.sol
index 63d09b1b..9f32fbd9 100644
--- a/src/core/contracts/mocks/tests/FlashloanAttacker.sol
+++ b/src/contracts/mocks/tests/FlashloanAttacker.sol
@@ -6,7 +6,7 @@ import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {SafeMath} from '../../dependencies/openzeppelin/contracts/SafeMath.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {FlashLoanSimpleReceiverBase} from '../../flashloan/base/FlashLoanSimpleReceiverBase.sol';
+import {FlashLoanSimpleReceiverBase} from '../../misc/flashloan/base/FlashLoanSimpleReceiverBase.sol';
 import {MintableERC20} from '../tokens/MintableERC20.sol';
 import {IPool} from '../../interfaces/IPool.sol';
 import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
diff --git a/src/core/contracts/mocks/tests/MathUtilsWrapper.sol b/src/contracts/mocks/tests/MathUtilsWrapper.sol
similarity index 100%
rename from src/core/contracts/mocks/tests/MathUtilsWrapper.sol
rename to src/contracts/mocks/tests/MathUtilsWrapper.sol
diff --git a/src/core/contracts/mocks/tests/MockReserveInterestRateStrategy.sol b/src/contracts/mocks/tests/MockReserveInterestRateStrategy.sol
similarity index 69%
rename from src/core/contracts/mocks/tests/MockReserveInterestRateStrategy.sol
rename to src/contracts/mocks/tests/MockReserveInterestRateStrategy.sol
index 082d7651..d0df1d3d 100644
--- a/src/core/contracts/mocks/tests/MockReserveInterestRateStrategy.sol
+++ b/src/contracts/mocks/tests/MockReserveInterestRateStrategy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {DefaultReserveInterestRateStrategyV2} from '../../protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
+import {DefaultReserveInterestRateStrategyV2} from '../../misc/DefaultReserveInterestRateStrategyV2.sol';
 import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol';
 
 contract MockReserveInterestRateStrategy is DefaultReserveInterestRateStrategyV2 {
@@ -20,12 +20,7 @@ contract MockReserveInterestRateStrategy is DefaultReserveInterestRateStrategyV2
 
   function calculateInterestRates(
     DataTypes.CalculateInterestRatesParams memory
-  )
-    public
-    view
-    override
-    returns (uint256 liquidityRate, uint256 stableBorrowRate, uint256 variableBorrowRate)
-  {
-    return (_liquidityRate, 0, _variableBorrowRate);
+  ) public view override returns (uint256 liquidityRate, uint256 variableBorrowRate) {
+    return (_liquidityRate, _variableBorrowRate);
   }
 }
diff --git a/src/core/contracts/mocks/tests/PercentageMathWrapper.sol b/src/contracts/mocks/tests/PercentageMathWrapper.sol
similarity index 100%
rename from src/core/contracts/mocks/tests/PercentageMathWrapper.sol
rename to src/contracts/mocks/tests/PercentageMathWrapper.sol
diff --git a/src/core/contracts/mocks/tests/WadRayMathWrapper.sol b/src/contracts/mocks/tests/WadRayMathWrapper.sol
similarity index 100%
rename from src/core/contracts/mocks/tests/WadRayMathWrapper.sol
rename to src/contracts/mocks/tests/WadRayMathWrapper.sol
diff --git a/src/core/contracts/mocks/tokens/MintableDelegationERC20.sol b/src/contracts/mocks/tokens/MintableDelegationERC20.sol
similarity index 100%
rename from src/core/contracts/mocks/tokens/MintableDelegationERC20.sol
rename to src/contracts/mocks/tokens/MintableDelegationERC20.sol
diff --git a/src/core/contracts/mocks/tokens/MintableERC20.sol b/src/contracts/mocks/tokens/MintableERC20.sol
similarity index 100%
rename from src/core/contracts/mocks/tokens/MintableERC20.sol
rename to src/contracts/mocks/tokens/MintableERC20.sol
diff --git a/src/core/contracts/mocks/tokens/MockATokenRepayment.sol b/src/contracts/mocks/tokens/MockATokenRepayment.sol
similarity index 88%
rename from src/core/contracts/mocks/tokens/MockATokenRepayment.sol
rename to src/contracts/mocks/tokens/MockATokenRepayment.sol
index 4e2c0dd2..c0f77de5 100644
--- a/src/core/contracts/mocks/tokens/MockATokenRepayment.sol
+++ b/src/contracts/mocks/tokens/MockATokenRepayment.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {ATokenInstance} from '../../../instances/ATokenInstance.sol';
+import {ATokenInstance} from '../../instances/ATokenInstance.sol';
 import {IPool} from '../../interfaces/IPool.sol';
 
 contract MockATokenRepayment is ATokenInstance {
diff --git a/src/contracts/mocks/tokens/MockDebtTokens.sol b/src/contracts/mocks/tokens/MockDebtTokens.sol
new file mode 100644
index 00000000..a75db430
--- /dev/null
+++ b/src/contracts/mocks/tokens/MockDebtTokens.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.10;
+
+import {VariableDebtTokenInstance} from '../../instances/VariableDebtTokenInstance.sol';
+import {IPool} from '../../interfaces/IPool.sol';
+
+contract MockVariableDebtToken is VariableDebtTokenInstance {
+  constructor(IPool pool) VariableDebtTokenInstance(pool) {}
+
+  function getRevision() internal pure override returns (uint256) {
+    return 0x2;
+  }
+}
diff --git a/src/core/contracts/mocks/tokens/MockScaledToken.sol b/src/contracts/mocks/tokens/MockScaledToken.sol
similarity index 85%
rename from src/core/contracts/mocks/tokens/MockScaledToken.sol
rename to src/contracts/mocks/tokens/MockScaledToken.sol
index 854f4356..f3a26e2e 100644
--- a/src/core/contracts/mocks/tokens/MockScaledToken.sol
+++ b/src/contracts/mocks/tokens/MockScaledToken.sol
@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import 'aave-v3-core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol';
-import 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
+import '../../protocol/tokenization/base/ScaledBalanceTokenBase.sol';
+import '../../protocol/libraries/math/WadRayMath.sol';
 
 contract MockScaledToken is ScaledBalanceTokenBase {
   using WadRayMath for uint256;
diff --git a/src/core/contracts/mocks/tokens/WETH9Mocked.sol b/src/contracts/mocks/tokens/WETH9Mocked.sol
similarity index 100%
rename from src/core/contracts/mocks/tokens/WETH9Mocked.sol
rename to src/contracts/mocks/tokens/WETH9Mocked.sol
diff --git a/src/core/contracts/mocks/upgradeability/MockAToken.sol b/src/contracts/mocks/upgradeability/MockAToken.sol
similarity index 80%
rename from src/core/contracts/mocks/upgradeability/MockAToken.sol
rename to src/contracts/mocks/upgradeability/MockAToken.sol
index bcdc8c1c..14bbf1a8 100644
--- a/src/core/contracts/mocks/upgradeability/MockAToken.sol
+++ b/src/contracts/mocks/upgradeability/MockAToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {ATokenInstance} from '../../../instances/ATokenInstance.sol';
+import {ATokenInstance} from '../../instances/ATokenInstance.sol';
 import {IPool} from '../../interfaces/IPool.sol';
 
 contract MockAToken is ATokenInstance {
diff --git a/src/core/contracts/mocks/upgradeability/MockInitializableImplementation.sol b/src/contracts/mocks/upgradeability/MockInitializableImplementation.sol
similarity index 96%
rename from src/core/contracts/mocks/upgradeability/MockInitializableImplementation.sol
rename to src/contracts/mocks/upgradeability/MockInitializableImplementation.sol
index 9f63a598..ed48f44b 100644
--- a/src/core/contracts/mocks/upgradeability/MockInitializableImplementation.sol
+++ b/src/contracts/mocks/upgradeability/MockInitializableImplementation.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {VersionedInitializable} from '../../protocol/libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
 
 contract MockInitializableImple is VersionedInitializable {
diff --git a/src/core/contracts/mocks/upgradeability/MockVariableDebtToken.sol b/src/contracts/mocks/upgradeability/MockVariableDebtToken.sol
similarity index 77%
rename from src/core/contracts/mocks/upgradeability/MockVariableDebtToken.sol
rename to src/contracts/mocks/upgradeability/MockVariableDebtToken.sol
index 211821f5..a75db430 100644
--- a/src/core/contracts/mocks/upgradeability/MockVariableDebtToken.sol
+++ b/src/contracts/mocks/upgradeability/MockVariableDebtToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {VariableDebtTokenInstance} from '../../../instances/VariableDebtTokenInstance.sol';
+import {VariableDebtTokenInstance} from '../../instances/VariableDebtTokenInstance.sol';
 import {IPool} from '../../interfaces/IPool.sol';
 
 contract MockVariableDebtToken is VariableDebtTokenInstance {
diff --git a/src/core/contracts/protocol/configuration/ACLManager.sol b/src/contracts/protocol/configuration/ACLManager.sol
similarity index 100%
rename from src/core/contracts/protocol/configuration/ACLManager.sol
rename to src/contracts/protocol/configuration/ACLManager.sol
diff --git a/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol b/src/contracts/protocol/configuration/PoolAddressesProvider.sol
similarity index 98%
rename from src/core/contracts/protocol/configuration/PoolAddressesProvider.sol
rename to src/contracts/protocol/configuration/PoolAddressesProvider.sol
index 06fa9333..009f4e5c 100644
--- a/src/core/contracts/protocol/configuration/PoolAddressesProvider.sol
+++ b/src/contracts/protocol/configuration/PoolAddressesProvider.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
-import {InitializableImmutableAdminUpgradeabilityProxy} from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
+import {InitializableImmutableAdminUpgradeabilityProxy} from '../../misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
 
 /**
  * @title PoolAddressesProvider
diff --git a/src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol b/src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol
similarity index 100%
rename from src/core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol
rename to src/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol
diff --git a/src/contracts/protocol/libraries/configuration/EModeConfiguration.sol b/src/contracts/protocol/libraries/configuration/EModeConfiguration.sol
new file mode 100644
index 00000000..3bb69ef0
--- /dev/null
+++ b/src/contracts/protocol/libraries/configuration/EModeConfiguration.sol
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {Errors} from '../helpers/Errors.sol';
+import {DataTypes} from '../types/DataTypes.sol';
+import {ReserveConfiguration} from './ReserveConfiguration.sol';
+
+/**
+ * @title EModeConfiguration library
+ * @author BGD Labs
+ * @notice Implements the bitmap logic to handle the eMode configuration
+ */
+library EModeConfiguration {
+  /**
+   * @notice Sets a bit in a given bitmap that represents the reserve index range
+   * @dev The supplied bitmap is supposed to be a uint128 in which each bit represents a reserve
+   * @param bitmap The bitmap
+   * @param reserveIndex The index of the reserve in the bitmap
+   * @param enabled True if the reserveIndex should be enabled on the bitmap, false otherwise
+   * @return The altered bitmap
+   */
+  function setReserveBitmapBit(
+    uint128 bitmap,
+    uint256 reserveIndex,
+    bool enabled
+  ) internal pure returns (uint128) {
+    unchecked {
+      require(reserveIndex < ReserveConfiguration.MAX_RESERVES_COUNT, Errors.INVALID_RESERVE_INDEX);
+      uint128 bit = uint128(1 << reserveIndex);
+      if (enabled) {
+        return bitmap | bit;
+      } else {
+        return bitmap & ~bit;
+      }
+    }
+  }
+
+  /**
+   * @notice Validates if a reserveIndex is flagged as enabled on a given bitmap
+   * @param bitmap The bitmap
+   * @param reserveIndex The index of the reserve in the bitmap
+   * @return True if the reserveindex is flagged true
+   */
+  function isReserveEnabledOnBitmap(
+    uint128 bitmap,
+    uint256 reserveIndex
+  ) internal pure returns (bool) {
+    unchecked {
+      require(reserveIndex < ReserveConfiguration.MAX_RESERVES_COUNT, Errors.INVALID_RESERVE_INDEX);
+      return (bitmap >> reserveIndex) & 1 != 0;
+    }
+  }
+}
diff --git a/src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol b/src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
similarity index 89%
rename from src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
rename to src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
index 0408f3ce..43987f47 100644
--- a/src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
+++ b/src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol
@@ -17,7 +17,6 @@ library ReserveConfiguration {
   uint256 internal constant ACTIVE_MASK =                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant FROZEN_MASK =                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant BORROWING_MASK =                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFFFFFFFFFFFF; // prettier-ignore
-  uint256 internal constant STABLE_BORROWING_MASK =          0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant PAUSED_MASK =                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant BORROWABLE_IN_ISOLATION_MASK =   0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant SILOED_BORROWING_MASK =          0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFFFFFFFFFFFFFFF; // prettier-ignore
@@ -26,7 +25,7 @@ library ReserveConfiguration {
   uint256 internal constant BORROW_CAP_MASK =                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000FFFFFFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant SUPPLY_CAP_MASK =                0xFFFFFFFFFFFFFFFFFFFFFFFFFF000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant LIQUIDATION_PROTOCOL_FEE_MASK =  0xFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
-  uint256 internal constant EMODE_CATEGORY_MASK =            0xFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
+  //@notice there is an unoccupied hole of 8 bits from 168 to 176 left from pre 3.2 eModeCategory
   uint256 internal constant UNBACKED_MINT_CAP_MASK =         0xFFFFFFFFFFF000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant DEBT_CEILING_MASK =              0xF0000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
   uint256 internal constant VIRTUAL_ACC_ACTIVE_MASK =        0xEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; // prettier-ignore
@@ -38,7 +37,6 @@ library ReserveConfiguration {
   uint256 internal constant IS_ACTIVE_START_BIT_POSITION = 56;
   uint256 internal constant IS_FROZEN_START_BIT_POSITION = 57;
   uint256 internal constant BORROWING_ENABLED_START_BIT_POSITION = 58;
-  uint256 internal constant STABLE_BORROWING_ENABLED_START_BIT_POSITION = 59;
   uint256 internal constant IS_PAUSED_START_BIT_POSITION = 60;
   uint256 internal constant BORROWABLE_IN_ISOLATION_START_BIT_POSITION = 61;
   uint256 internal constant SILOED_BORROWING_START_BIT_POSITION = 62;
@@ -47,7 +45,7 @@ library ReserveConfiguration {
   uint256 internal constant BORROW_CAP_START_BIT_POSITION = 80;
   uint256 internal constant SUPPLY_CAP_START_BIT_POSITION = 116;
   uint256 internal constant LIQUIDATION_PROTOCOL_FEE_START_BIT_POSITION = 152;
-  uint256 internal constant EMODE_CATEGORY_START_BIT_POSITION = 168;
+  //@notice there is an unoccupied hole of 8 bits from 168 to 176 left from pre 3.2 eModeCategory
   uint256 internal constant UNBACKED_MINT_CAP_START_BIT_POSITION = 176;
   uint256 internal constant DEBT_CEILING_START_BIT_POSITION = 212;
   uint256 internal constant VIRTUAL_ACC_START_BIT_POSITION = 252;
@@ -60,7 +58,6 @@ library ReserveConfiguration {
   uint256 internal constant MAX_VALID_BORROW_CAP = 68719476735;
   uint256 internal constant MAX_VALID_SUPPLY_CAP = 68719476735;
   uint256 internal constant MAX_VALID_LIQUIDATION_PROTOCOL_FEE = 65535;
-  uint256 internal constant MAX_VALID_EMODE_CATEGORY = 255;
   uint256 internal constant MAX_VALID_UNBACKED_MINT_CAP = 68719476735;
   uint256 internal constant MAX_VALID_DEBT_CEILING = 1099511627775;
 
@@ -311,31 +308,6 @@ library ReserveConfiguration {
     return (self.data & ~BORROWING_MASK) != 0;
   }
 
-  /**
-   * @notice Enables or disables stable rate borrowing on the reserve
-   * @param self The reserve configuration
-   * @param enabled True if the stable rate borrowing needs to be enabled, false otherwise
-   */
-  function setStableRateBorrowingEnabled(
-    DataTypes.ReserveConfigurationMap memory self,
-    bool enabled
-  ) internal pure {
-    self.data =
-      (self.data & STABLE_BORROWING_MASK) |
-      (uint256(enabled ? 1 : 0) << STABLE_BORROWING_ENABLED_START_BIT_POSITION);
-  }
-
-  /**
-   * @notice Gets the stable rate borrowing state of the reserve
-   * @param self The reserve configuration
-   * @return The stable rate borrowing state
-   */
-  function getStableRateBorrowingEnabled(
-    DataTypes.ReserveConfigurationMap memory self
-  ) internal pure returns (bool) {
-    return (self.data & ~STABLE_BORROWING_MASK) != 0;
-  }
-
   /**
    * @notice Sets the reserve factor of the reserve
    * @param self The reserve configuration
@@ -496,31 +468,6 @@ library ReserveConfiguration {
     return (self.data & ~UNBACKED_MINT_CAP_MASK) >> UNBACKED_MINT_CAP_START_BIT_POSITION;
   }
 
-  /**
-   * @notice Sets the eMode asset category
-   * @param self The reserve configuration
-   * @param category The asset category when the user selects the eMode
-   */
-  function setEModeCategory(
-    DataTypes.ReserveConfigurationMap memory self,
-    uint256 category
-  ) internal pure {
-    require(category <= MAX_VALID_EMODE_CATEGORY, Errors.INVALID_EMODE_CATEGORY);
-
-    self.data = (self.data & EMODE_CATEGORY_MASK) | (category << EMODE_CATEGORY_START_BIT_POSITION);
-  }
-
-  /**
-   * @dev Gets the eMode asset category
-   * @param self The reserve configuration
-   * @return The eMode category for the asset
-   */
-  function getEModeCategory(
-    DataTypes.ReserveConfigurationMap memory self
-  ) internal pure returns (uint256) {
-    return (self.data & ~EMODE_CATEGORY_MASK) >> EMODE_CATEGORY_START_BIT_POSITION;
-  }
-
   /**
    * @notice Sets the flashloanable flag for the reserve
    * @param self The reserve configuration
@@ -579,19 +526,17 @@ library ReserveConfiguration {
    * @return The state flag representing active
    * @return The state flag representing frozen
    * @return The state flag representing borrowing enabled
-   * @return The state flag representing stableRateBorrowing enabled
    * @return The state flag representing paused
    */
   function getFlags(
     DataTypes.ReserveConfigurationMap memory self
-  ) internal pure returns (bool, bool, bool, bool, bool) {
+  ) internal pure returns (bool, bool, bool, bool) {
     uint256 dataLocal = self.data;
 
     return (
       (dataLocal & ~ACTIVE_MASK) != 0,
       (dataLocal & ~FROZEN_MASK) != 0,
       (dataLocal & ~BORROWING_MASK) != 0,
-      (dataLocal & ~STABLE_BORROWING_MASK) != 0,
       (dataLocal & ~PAUSED_MASK) != 0
     );
   }
@@ -604,11 +549,10 @@ library ReserveConfiguration {
    * @return The state param representing liquidation bonus
    * @return The state param representing reserve decimals
    * @return The state param representing reserve factor
-   * @return The state param representing eMode category
    */
   function getParams(
     DataTypes.ReserveConfigurationMap memory self
-  ) internal pure returns (uint256, uint256, uint256, uint256, uint256, uint256) {
+  ) internal pure returns (uint256, uint256, uint256, uint256, uint256) {
     uint256 dataLocal = self.data;
 
     return (
@@ -616,8 +560,7 @@ library ReserveConfiguration {
       (dataLocal & ~LIQUIDATION_THRESHOLD_MASK) >> LIQUIDATION_THRESHOLD_START_BIT_POSITION,
       (dataLocal & ~LIQUIDATION_BONUS_MASK) >> LIQUIDATION_BONUS_START_BIT_POSITION,
       (dataLocal & ~DECIMALS_MASK) >> RESERVE_DECIMALS_START_BIT_POSITION,
-      (dataLocal & ~RESERVE_FACTOR_MASK) >> RESERVE_FACTOR_START_BIT_POSITION,
-      (dataLocal & ~EMODE_CATEGORY_MASK) >> EMODE_CATEGORY_START_BIT_POSITION
+      (dataLocal & ~RESERVE_FACTOR_MASK) >> RESERVE_FACTOR_START_BIT_POSITION
     );
   }
 
diff --git a/src/core/contracts/protocol/libraries/configuration/UserConfiguration.sol b/src/contracts/protocol/libraries/configuration/UserConfiguration.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/configuration/UserConfiguration.sol
rename to src/contracts/protocol/libraries/configuration/UserConfiguration.sol
diff --git a/src/core/contracts/protocol/libraries/helpers/Errors.sol b/src/contracts/protocol/libraries/helpers/Errors.sol
similarity index 93%
rename from src/core/contracts/protocol/libraries/helpers/Errors.sol
rename to src/contracts/protocol/libraries/helpers/Errors.sol
index 36b75308..d3f564cb 100644
--- a/src/core/contracts/protocol/libraries/helpers/Errors.sol
+++ b/src/contracts/protocol/libraries/helpers/Errors.sol
@@ -37,17 +37,14 @@ library Errors {
   string public constant RESERVE_FROZEN = '28'; // 'Action cannot be performed because the reserve is frozen'
   string public constant RESERVE_PAUSED = '29'; // 'Action cannot be performed because the reserve is paused'
   string public constant BORROWING_NOT_ENABLED = '30'; // 'Borrowing is not enabled'
-  string public constant STABLE_BORROWING_NOT_ENABLED = '31'; // 'Stable borrowing is not enabled'
   string public constant NOT_ENOUGH_AVAILABLE_USER_BALANCE = '32'; // 'User cannot withdraw more than the available balance'
   string public constant INVALID_INTEREST_RATE_MODE_SELECTED = '33'; // 'Invalid interest rate mode selected'
   string public constant COLLATERAL_BALANCE_IS_ZERO = '34'; // 'The collateral balance is 0'
   string public constant HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD = '35'; // 'Health factor is lesser than the liquidation threshold'
   string public constant COLLATERAL_CANNOT_COVER_NEW_BORROW = '36'; // 'There is not enough collateral to cover a new borrow'
   string public constant COLLATERAL_SAME_AS_BORROWING_CURRENCY = '37'; // 'Collateral is (mostly) the same currency that is being borrowed'
-  string public constant AMOUNT_BIGGER_THAN_MAX_LOAN_SIZE_STABLE = '38'; // 'The requested amount is greater than the max loan size in stable rate mode'
   string public constant NO_DEBT_OF_SELECTED_TYPE = '39'; // 'For repayment of a specific type of debt, the user needs to have debt that type'
   string public constant NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF = '40'; // 'To repay on behalf of a user an explicit amount to repay is needed'
-  string public constant NO_OUTSTANDING_STABLE_DEBT = '41'; // 'User does not have outstanding stable rate debt on this reserve'
   string public constant NO_OUTSTANDING_VARIABLE_DEBT = '42'; // 'User does not have outstanding variable rate debt on this reserve'
   string public constant UNDERLYING_BALANCE_ZERO = '43'; // 'The underlying balance needs to be greater than 0'
   string public constant INTEREST_RATE_REBALANCE_CONDITIONS_NOT_MET = '44'; // 'Interest rate rebalance conditions were not met'
@@ -60,7 +57,6 @@ library Errors {
   string public constant UNBACKED_MINT_CAP_EXCEEDED = '52'; // 'Unbacked mint cap is exceeded'
   string public constant DEBT_CEILING_EXCEEDED = '53'; // 'Debt ceiling is exceeded'
   string public constant UNDERLYING_CLAIMABLE_RIGHTS_NOT_ZERO = '54'; // 'Claimable rights over underlying not zero (aToken supply or accruedToTreasury)'
-  string public constant STABLE_DEBT_NOT_ZERO = '55'; // 'Stable debt supply is not zero'
   string public constant VARIABLE_DEBT_SUPPLY_NOT_ZERO = '56'; // 'Variable debt supply is not zero'
   string public constant LTV_VALIDATION_FAILED = '57'; // 'Ltv validation failed'
   string public constant INCONSISTENT_EMODE_CATEGORY = '58'; // 'Inconsistent eMode category'
@@ -89,11 +85,9 @@ library Errors {
   string public constant DEBT_CEILING_NOT_ZERO = '81'; // 'Debt ceiling is not zero'
   string public constant ASSET_NOT_LISTED = '82'; // 'Asset is not listed'
   string public constant INVALID_OPTIMAL_USAGE_RATIO = '83'; // 'Invalid optimal usage ratio'
-  string public constant INVALID_OPTIMAL_STABLE_TO_TOTAL_DEBT_RATIO = '84'; // 'Invalid optimal stable to total debt ratio'
   string public constant UNDERLYING_CANNOT_BE_RESCUED = '85'; // 'The underlying asset cannot be rescued'
   string public constant ADDRESSES_PROVIDER_ALREADY_ADDED = '86'; // 'Reserve has already been added to reserve list'
   string public constant POOL_ADDRESSES_DO_NOT_MATCH = '87'; // 'The token implementation pool address and the pool address provided by the initializing pool do not match'
-  string public constant STABLE_BORROWING_ENABLED = '88'; // 'Stable borrowing is enabled'
   string public constant SILOED_BORROWING_VIOLATION = '89'; // 'User is trying to borrow multiple assets including a siloed one'
   string public constant RESERVE_DEBT_NOT_ZERO = '90'; // the total debt of the reserve needs to be 0
   string public constant FLASHLOAN_DISABLED = '91'; // FlashLoaning for this asset is disabled
@@ -105,4 +99,5 @@ library Errors {
   string public constant LIQUIDATION_GRACE_SENTINEL_CHECK_FAILED = '97'; // 'Liquidation grace sentinel validation failed'
   string public constant INVALID_GRACE_PERIOD = '98'; // Grace period above a valid range
   string public constant INVALID_FREEZE_STATE = '99'; // Reserve is already in the passed freeze state
+  string public constant NOT_BORROWABLE_IN_EMODE = '100'; // Asset not borrowable in eMode
 }
diff --git a/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol b/src/contracts/protocol/libraries/logic/BorrowLogic.sol
similarity index 57%
rename from src/core/contracts/protocol/libraries/logic/BorrowLogic.sol
rename to src/contracts/protocol/libraries/logic/BorrowLogic.sol
index cdcf0101..c4ed26ed 100644
--- a/src/core/contracts/protocol/libraries/logic/BorrowLogic.sol
+++ b/src/contracts/protocol/libraries/logic/BorrowLogic.sol
@@ -4,12 +4,10 @@ pragma solidity ^0.8.10;
 import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol';
 import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
-import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';
 import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';
 import {IAToken} from '../../../interfaces/IAToken.sol';
 import {UserConfiguration} from '../configuration/UserConfiguration.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
-import {Helpers} from '../helpers/Helpers.sol';
 import {DataTypes} from '../types/DataTypes.sol';
 import {ValidationLogic} from './ValidationLogic.sol';
 import {ReserveLogic} from './ReserveLogic.sol';
@@ -45,12 +43,6 @@ library BorrowLogic {
     uint256 amount,
     bool useATokens
   );
-  event RebalanceStableBorrowRate(address indexed reserve, address indexed user);
-  event SwapBorrowRateMode(
-    address indexed reserve,
-    address indexed user,
-    DataTypes.InterestRateMode interestRateMode
-  );
   event IsolationModeTotalDebtUpdated(address indexed asset, uint256 totalDebt);
   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);
 
@@ -94,7 +86,6 @@ library BorrowLogic {
         userAddress: params.onBehalfOf,
         amount: params.amount,
         interestRateMode: params.interestRateMode,
-        maxStableLoanPercent: params.maxStableRateBorrowSizePercent,
         reservesCount: params.reservesCount,
         oracle: params.oracle,
         userEModeCategory: params.userEModeCategory,
@@ -105,27 +96,11 @@ library BorrowLogic {
       })
     );
 
-    uint256 currentStableRate = 0;
     bool isFirstBorrowing = false;
 
-    if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {
-      currentStableRate = reserve.currentStableBorrowRate;
-
-      (
-        isFirstBorrowing,
-        reserveCache.nextTotalStableDebt,
-        reserveCache.nextAvgStableBorrowRate
-      ) = IStableDebtToken(reserveCache.stableDebtTokenAddress).mint(
-        params.user,
-        params.onBehalfOf,
-        params.amount,
-        currentStableRate
-      );
-    } else {
-      (isFirstBorrowing, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(
-        reserveCache.variableDebtTokenAddress
-      ).mint(params.user, params.onBehalfOf, params.amount, reserveCache.nextVariableBorrowIndex);
-    }
+    (isFirstBorrowing, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(
+      reserveCache.variableDebtTokenAddress
+    ).mint(params.user, params.onBehalfOf, params.amount, reserveCache.nextVariableBorrowIndex);
 
     if (isFirstBorrowing) {
       userConfig.setBorrowing(reserve.id, true);
@@ -159,10 +134,8 @@ library BorrowLogic {
       params.user,
       params.onBehalfOf,
       params.amount,
-      params.interestRateMode,
-      params.interestRateMode == DataTypes.InterestRateMode.STABLE
-        ? currentStableRate
-        : reserve.currentVariableBorrowRate,
+      DataTypes.InterestRateMode.VARIABLE,
+      reserve.currentVariableBorrowRate,
       params.referralCode
     );
   }
@@ -188,9 +161,8 @@ library BorrowLogic {
     DataTypes.ReserveCache memory reserveCache = reserve.cache();
     reserve.updateState(reserveCache);
 
-    (uint256 stableDebt, uint256 variableDebt) = Helpers.getUserCurrentDebt(
-      params.onBehalfOf,
-      reserveCache
+    uint256 variableDebt = IERC20(reserveCache.variableDebtTokenAddress).balanceOf(
+      params.onBehalfOf
     );
 
     ValidationLogic.validateRepay(
@@ -198,13 +170,10 @@ library BorrowLogic {
       params.amount,
       params.interestRateMode,
       params.onBehalfOf,
-      stableDebt,
       variableDebt
     );
 
-    uint256 paybackAmount = params.interestRateMode == DataTypes.InterestRateMode.STABLE
-      ? stableDebt
-      : variableDebt;
+    uint256 paybackAmount = variableDebt;
 
     // Allows a user to repay with aTokens without leaving dust from interest.
     if (params.useATokens && params.amount == type(uint256).max) {
@@ -215,15 +184,8 @@ library BorrowLogic {
       paybackAmount = params.amount;
     }
 
-    if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {
-      (reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(
-        reserveCache.stableDebtTokenAddress
-      ).burn(params.onBehalfOf, paybackAmount);
-    } else {
-      reserveCache.nextScaledVariableDebt = IVariableDebtToken(
-        reserveCache.variableDebtTokenAddress
-      ).burn(params.onBehalfOf, paybackAmount, reserveCache.nextVariableBorrowIndex);
-    }
+    reserveCache.nextScaledVariableDebt = IVariableDebtToken(reserveCache.variableDebtTokenAddress)
+      .burn(params.onBehalfOf, paybackAmount, reserveCache.nextVariableBorrowIndex);
 
     reserve.updateInterestRatesAndVirtualBalance(
       reserveCache,
@@ -232,7 +194,7 @@ library BorrowLogic {
       0
     );
 
-    if (stableDebt + variableDebt - paybackAmount == 0) {
+    if (variableDebt - paybackAmount == 0) {
       userConfig.setBorrowing(reserve.id, false);
     }
 
@@ -269,90 +231,4 @@ library BorrowLogic {
 
     return paybackAmount;
   }
-
-  /**
-   * @notice Implements the rebalance stable borrow rate feature. In case of liquidity crunches on the protocol, stable
-   * rate borrows might need to be rebalanced to bring back equilibrium between the borrow and supply APYs.
-   * @dev The rules that define if a position can be rebalanced are implemented in `ValidationLogic.validateRebalanceStableBorrowRate()`
-   * @dev Emits the `RebalanceStableBorrowRate()` event
-   * @param reserve The state of the reserve of the asset being repaid
-   * @param asset The asset of the position being rebalanced
-   * @param user The user being rebalanced
-   */
-  function executeRebalanceStableBorrowRate(
-    DataTypes.ReserveData storage reserve,
-    address asset,
-    address user
-  ) external {
-    DataTypes.ReserveCache memory reserveCache = reserve.cache();
-    reserve.updateState(reserveCache);
-
-    ValidationLogic.validateRebalanceStableBorrowRate(reserve, reserveCache, asset);
-
-    IStableDebtToken stableDebtToken = IStableDebtToken(reserveCache.stableDebtTokenAddress);
-    uint256 stableDebt = IERC20(address(stableDebtToken)).balanceOf(user);
-
-    stableDebtToken.burn(user, stableDebt);
-
-    (, reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = stableDebtToken
-      .mint(user, user, stableDebt, reserve.currentStableBorrowRate);
-
-    reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);
-
-    emit RebalanceStableBorrowRate(asset, user);
-  }
-
-  /**
-   * @notice Implements the swap borrow rate feature. Borrowers can swap from variable to stable positions at any time.
-   * @dev Emits the `Swap()` event
-   * @param reserve The of the reserve of the asset being repaid
-   * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets
-   * @param asset The asset of the position being swapped
-   * @param user The user whose debt position is being swapped
-   * @param interestRateMode The current interest rate mode of the position being swapped
-   */
-  function executeSwapBorrowRateMode(
-    DataTypes.ReserveData storage reserve,
-    DataTypes.UserConfigurationMap storage userConfig,
-    address asset,
-    address user,
-    DataTypes.InterestRateMode interestRateMode
-  ) external {
-    DataTypes.ReserveCache memory reserveCache = reserve.cache();
-
-    reserve.updateState(reserveCache);
-
-    (uint256 stableDebt, uint256 variableDebt) = Helpers.getUserCurrentDebt(user, reserveCache);
-
-    ValidationLogic.validateSwapRateMode(
-      reserve,
-      reserveCache,
-      userConfig,
-      stableDebt,
-      variableDebt,
-      interestRateMode
-    );
-
-    if (interestRateMode == DataTypes.InterestRateMode.STABLE) {
-      (reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(
-        reserveCache.stableDebtTokenAddress
-      ).burn(user, stableDebt);
-
-      (, reserveCache.nextScaledVariableDebt) = IVariableDebtToken(
-        reserveCache.variableDebtTokenAddress
-      ).mint(user, user, stableDebt, reserveCache.nextVariableBorrowIndex);
-    } else {
-      reserveCache.nextScaledVariableDebt = IVariableDebtToken(
-        reserveCache.variableDebtTokenAddress
-      ).burn(user, variableDebt, reserveCache.nextVariableBorrowIndex);
-
-      (, reserveCache.nextTotalStableDebt, reserveCache.nextAvgStableBorrowRate) = IStableDebtToken(
-        reserveCache.stableDebtTokenAddress
-      ).mint(user, user, variableDebt, reserve.currentStableBorrowRate);
-    }
-
-    reserve.updateInterestRatesAndVirtualBalance(reserveCache, asset, 0, 0);
-
-    emit SwapBorrowRateMode(asset, user, interestRateMode);
-  }
 }
diff --git a/src/core/contracts/protocol/libraries/logic/BridgeLogic.sol b/src/contracts/protocol/libraries/logic/BridgeLogic.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/logic/BridgeLogic.sol
rename to src/contracts/protocol/libraries/logic/BridgeLogic.sol
diff --git a/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol b/src/contracts/protocol/libraries/logic/CalldataLogic.sol
similarity index 81%
rename from src/core/contracts/protocol/libraries/logic/CalldataLogic.sol
rename to src/contracts/protocol/libraries/logic/CalldataLogic.sol
index 505a2541..742cbcbf 100644
--- a/src/core/contracts/protocol/libraries/logic/CalldataLogic.sol
+++ b/src/contracts/protocol/libraries/logic/CalldataLogic.sol
@@ -86,7 +86,7 @@ library CalldataLogic {
    * @param args The packed borrow params
    * @return The address of the underlying reserve
    * @return The amount to borrow
-   * @return The interestRateMode, 1 for stable or 2 for variable debt
+   * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)
    * @return The referralCode
    */
   function decodeBorrowParams(
@@ -114,7 +114,7 @@ library CalldataLogic {
    * @param args The packed repay params
    * @return The address of the underlying reserve
    * @return The amount to repay
-   * @return The interestRateMode, 1 for stable or 2 for variable debt
+   * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)
    */
   function decodeRepayParams(
     mapping(uint256 => address) storage reservesList,
@@ -143,7 +143,7 @@ library CalldataLogic {
    * @param args The packed repay with permit params
    * @return The address of the underlying reserve
    * @return The amount to repay
-   * @return The interestRateMode, 1 for stable or 2 for variable debt
+   * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)
    * @return The deadline of the permit
    * @return The V value of the permit signature
    */
@@ -167,48 +167,6 @@ library CalldataLogic {
     return (asset, amount, interestRateMode, deadline, permitV);
   }
 
-  /**
-   * @notice Decodes compressed swap borrow rate mode params to standard params
-   * @param reservesList The addresses of all the active reserves
-   * @param args The packed swap borrow rate mode params
-   * @return The address of the underlying reserve
-   * @return The interest rate mode, 1 for stable 2 for variable debt
-   */
-  function decodeSwapBorrowRateModeParams(
-    mapping(uint256 => address) storage reservesList,
-    bytes32 args
-  ) internal view returns (address, uint256) {
-    uint16 assetId;
-    uint256 interestRateMode;
-
-    assembly {
-      assetId := and(args, 0xFFFF)
-      interestRateMode := and(shr(16, args), 0xFF)
-    }
-
-    return (reservesList[assetId], interestRateMode);
-  }
-
-  /**
-   * @notice Decodes compressed rebalance stable borrow rate params to standard params
-   * @param reservesList The addresses of all the active reserves
-   * @param args The packed rabalance stable borrow rate params
-   * @return The address of the underlying reserve
-   * @return The address of the user to rebalance
-   */
-  function decodeRebalanceStableBorrowRateParams(
-    mapping(uint256 => address) storage reservesList,
-    bytes32 args
-  ) internal view returns (address, address) {
-    uint16 assetId;
-    address user;
-    assembly {
-      assetId := and(args, 0xFFFF)
-      user := and(shr(16, args), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    }
-    return (reservesList[assetId], user);
-  }
-
   /**
    * @notice Decodes compressed set user use reserve as collateral params to standard params
    * @param reservesList The addresses of all the active reserves
diff --git a/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol b/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol
similarity index 77%
rename from src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol
rename to src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol
index 01580d9e..c6b08dcc 100644
--- a/src/core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol
+++ b/src/contracts/protocol/libraries/logic/ConfiguratorLogic.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.10;
 import {IPool} from '../../../interfaces/IPool.sol';
 import {IInitializableAToken} from '../../../interfaces/IInitializableAToken.sol';
 import {IInitializableDebtToken} from '../../../interfaces/IInitializableDebtToken.sol';
-import {InitializableImmutableAdminUpgradeabilityProxy} from '../aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
+import {InitializableImmutableAdminUpgradeabilityProxy} from '../../../misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
 import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
 import {DataTypes} from '../types/DataTypes.sol';
@@ -33,11 +33,6 @@ library ConfiguratorLogic {
     address indexed proxy,
     address indexed implementation
   );
-  event StableDebtTokenUpgraded(
-    address indexed asset,
-    address indexed proxy,
-    address indexed implementation
-  );
   event VariableDebtTokenUpgraded(
     address indexed asset,
     address indexed proxy,
@@ -45,7 +40,7 @@ library ConfiguratorLogic {
   );
 
   /**
-   * @notice Initialize a reserve by creating and initializing aToken, stable debt token and variable debt token
+   * @notice Initialize a reserve by creating and initializing aToken and variable debt token
    * @dev Emits the `ReserveInitialized` event
    * @param pool The Pool in which the reserve will be initialized
    * @param input The needed parameters for the initialization
@@ -73,20 +68,6 @@ library ConfiguratorLogic {
       )
     );
 
-    address stableDebtTokenProxyAddress = _initTokenWithProxy(
-      input.stableDebtTokenImpl,
-      abi.encodeWithSelector(
-        IInitializableDebtToken.initialize.selector,
-        pool,
-        input.underlyingAsset,
-        input.incentivesController,
-        underlyingAssetDecimals,
-        input.stableDebtTokenName,
-        input.stableDebtTokenSymbol,
-        input.params
-      )
-    );
-
     address variableDebtTokenProxyAddress = _initTokenWithProxy(
       input.variableDebtTokenImpl,
       abi.encodeWithSelector(
@@ -104,7 +85,6 @@ library ConfiguratorLogic {
     pool.initReserve(
       input.underlyingAsset,
       aTokenProxyAddress,
-      stableDebtTokenProxyAddress,
       variableDebtTokenProxyAddress,
       input.interestRateStrategyAddress
     );
@@ -128,7 +108,7 @@ library ConfiguratorLogic {
     emit ReserveInitialized(
       input.underlyingAsset,
       aTokenProxyAddress,
-      stableDebtTokenProxyAddress,
+      address(0),
       variableDebtTokenProxyAddress,
       input.interestRateStrategyAddress
     );
@@ -146,7 +126,7 @@ library ConfiguratorLogic {
   ) external {
     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);
 
-    (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();
+    (, , , uint256 decimals, ) = cachedPool.getConfiguration(input.asset).getParams();
 
     bytes memory encodedCall = abi.encodeWithSelector(
       IInitializableAToken.initialize.selector,
@@ -165,44 +145,6 @@ library ConfiguratorLogic {
     emit ATokenUpgraded(input.asset, reserveData.aTokenAddress, input.implementation);
   }
 
-  /**
-   * @notice Updates the stable debt token implementation and initializes it
-   * @dev Emits the `StableDebtTokenUpgraded` event
-   * @param cachedPool The Pool containing the reserve with the stable debt token
-   * @param input The parameters needed for the initialize call
-   */
-  function executeUpdateStableDebtToken(
-    IPool cachedPool,
-    ConfiguratorInputTypes.UpdateDebtTokenInput calldata input
-  ) external {
-    DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);
-
-    (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();
-
-    bytes memory encodedCall = abi.encodeWithSelector(
-      IInitializableDebtToken.initialize.selector,
-      cachedPool,
-      input.asset,
-      input.incentivesController,
-      decimals,
-      input.name,
-      input.symbol,
-      input.params
-    );
-
-    _upgradeTokenImplementation(
-      reserveData.stableDebtTokenAddress,
-      input.implementation,
-      encodedCall
-    );
-
-    emit StableDebtTokenUpgraded(
-      input.asset,
-      reserveData.stableDebtTokenAddress,
-      input.implementation
-    );
-  }
-
   /**
    * @notice Updates the variable debt token implementation and initializes it
    * @dev Emits the `VariableDebtTokenUpgraded` event
@@ -215,7 +157,7 @@ library ConfiguratorLogic {
   ) external {
     DataTypes.ReserveDataLegacy memory reserveData = cachedPool.getReserveData(input.asset);
 
-    (, , , uint256 decimals, , ) = cachedPool.getConfiguration(input.asset).getParams();
+    (, , , uint256 decimals, ) = cachedPool.getConfiguration(input.asset).getParams();
 
     bytes memory encodedCall = abi.encodeWithSelector(
       IInitializableDebtToken.initialize.selector,
diff --git a/src/core/contracts/protocol/libraries/logic/EModeLogic.sol b/src/contracts/protocol/libraries/logic/EModeLogic.sol
similarity index 60%
rename from src/core/contracts/protocol/libraries/logic/EModeLogic.sol
rename to src/contracts/protocol/libraries/logic/EModeLogic.sol
index b61e440c..647fc7e7 100644
--- a/src/core/contracts/protocol/libraries/logic/EModeLogic.sol
+++ b/src/contracts/protocol/libraries/logic/EModeLogic.sol
@@ -46,66 +46,27 @@ library EModeLogic {
     DataTypes.UserConfigurationMap storage userConfig,
     DataTypes.ExecuteSetUserEModeParams memory params
   ) external {
+    if (usersEModeCategory[msg.sender] == params.categoryId) return;
+
     ValidationLogic.validateSetUserEMode(
-      reservesData,
-      reservesList,
       eModeCategories,
       userConfig,
       params.reservesCount,
       params.categoryId
     );
 
-    uint8 prevCategoryId = usersEModeCategory[msg.sender];
     usersEModeCategory[msg.sender] = params.categoryId;
 
-    if (prevCategoryId != 0) {
-      ValidationLogic.validateHealthFactor(
-        reservesData,
-        reservesList,
-        eModeCategories,
-        userConfig,
-        msg.sender,
-        params.categoryId,
-        params.reservesCount,
-        params.oracle
-      );
-    }
+    ValidationLogic.validateHealthFactor(
+      reservesData,
+      reservesList,
+      eModeCategories,
+      userConfig,
+      msg.sender,
+      params.categoryId,
+      params.reservesCount,
+      params.oracle
+    );
     emit UserEModeSet(msg.sender, params.categoryId);
   }
-
-  /**
-   * @notice Gets the eMode configuration and calculates the eMode asset price if a custom oracle is configured
-   * @dev The eMode asset price returned is 0 if no oracle is specified
-   * @param category The user eMode category
-   * @param oracle The price oracle
-   * @return The eMode ltv
-   * @return The eMode liquidation threshold
-   * @return The eMode asset price
-   */
-  function getEModeConfiguration(
-    DataTypes.EModeCategory storage category,
-    IPriceOracleGetter oracle
-  ) internal view returns (uint256, uint256, uint256) {
-    uint256 eModeAssetPrice = 0;
-    address eModePriceSource = category.priceSource;
-
-    if (eModePriceSource != address(0)) {
-      eModeAssetPrice = oracle.getAssetPrice(eModePriceSource);
-    }
-
-    return (category.ltv, category.liquidationThreshold, eModeAssetPrice);
-  }
-
-  /**
-   * @notice Checks if eMode is active for a user and if yes, if the asset belongs to the eMode category chosen
-   * @param eModeUserCategory The user eMode category
-   * @param eModeAssetCategory The asset eMode category
-   * @return True if eMode is active and the asset belongs to the eMode category chosen by the user, false otherwise
-   */
-  function isInEModeCategory(
-    uint256 eModeUserCategory,
-    uint256 eModeAssetCategory
-  ) internal pure returns (bool) {
-    return (eModeUserCategory != 0 && eModeAssetCategory == eModeUserCategory);
-  }
 }
diff --git a/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol b/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol
similarity index 88%
rename from src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol
rename to src/contracts/protocol/libraries/logic/FlashLoanLogic.sol
index f6edf532..31ffb288 100644
--- a/src/core/contracts/protocol/libraries/logic/FlashLoanLogic.sol
+++ b/src/contracts/protocol/libraries/logic/FlashLoanLogic.sol
@@ -6,8 +6,8 @@ import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.so
 import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {IAToken} from '../../../interfaces/IAToken.sol';
 import {IPool} from '../../../interfaces/IPool.sol';
-import {IFlashLoanReceiver} from '../../../flashloan/interfaces/IFlashLoanReceiver.sol';
-import {IFlashLoanSimpleReceiver} from '../../../flashloan/interfaces/IFlashLoanSimpleReceiver.sol';
+import {IFlashLoanReceiver} from '../../../misc/flashloan/interfaces/IFlashLoanReceiver.sol';
+import {IFlashLoanSimpleReceiver} from '../../../misc/flashloan/interfaces/IFlashLoanSimpleReceiver.sol';
 import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
 import {Errors} from '../helpers/Errors.sol';
@@ -46,7 +46,6 @@ library FlashLoanLogic {
   // Helper struct for internal variables used in the `executeFlashLoan` function
   struct FlashLoanLocalVars {
     IFlashLoanReceiver receiver;
-    uint256 i;
     address currentAsset;
     uint256 currentAmount;
     uint256[] totalPremiums;
@@ -89,20 +88,18 @@ library FlashLoanLogic {
       ? (0, 0)
       : (params.flashLoanPremiumTotal, params.flashLoanPremiumToProtocol);
 
-    for (vars.i = 0; vars.i < params.assets.length; vars.i++) {
-      vars.currentAmount = params.amounts[vars.i];
-      vars.totalPremiums[vars.i] = DataTypes.InterestRateMode(params.interestRateModes[vars.i]) ==
+    for (uint256 i = 0; i < params.assets.length; i++) {
+      vars.currentAmount = params.amounts[i];
+      vars.totalPremiums[i] = DataTypes.InterestRateMode(params.interestRateModes[i]) ==
         DataTypes.InterestRateMode.NONE
         ? vars.currentAmount.percentMul(vars.flashloanPremiumTotal)
         : 0;
 
-      if (reservesData[params.assets[vars.i]].configuration.getIsVirtualAccActive()) {
-        reservesData[params.assets[vars.i]].virtualUnderlyingBalance -= vars
-          .currentAmount
-          .toUint128();
+      if (reservesData[params.assets[i]].configuration.getIsVirtualAccActive()) {
+        reservesData[params.assets[i]].virtualUnderlyingBalance -= vars.currentAmount.toUint128();
       }
 
-      IAToken(reservesData[params.assets[vars.i]].aTokenAddress).transferUnderlyingTo(
+      IAToken(reservesData[params.assets[i]].aTokenAddress).transferUnderlyingTo(
         params.receiverAddress,
         vars.currentAmount
       );
@@ -119,13 +116,12 @@ library FlashLoanLogic {
       Errors.INVALID_FLASHLOAN_EXECUTOR_RETURN
     );
 
-    for (vars.i = 0; vars.i < params.assets.length; vars.i++) {
-      vars.currentAsset = params.assets[vars.i];
-      vars.currentAmount = params.amounts[vars.i];
+    for (uint256 i = 0; i < params.assets.length; i++) {
+      vars.currentAsset = params.assets[i];
+      vars.currentAmount = params.amounts[i];
 
       if (
-        DataTypes.InterestRateMode(params.interestRateModes[vars.i]) ==
-        DataTypes.InterestRateMode.NONE
+        DataTypes.InterestRateMode(params.interestRateModes[i]) == DataTypes.InterestRateMode.NONE
       ) {
         _handleFlashLoanRepayment(
           reservesData[vars.currentAsset],
@@ -133,7 +129,7 @@ library FlashLoanLogic {
             asset: vars.currentAsset,
             receiverAddress: params.receiverAddress,
             amount: vars.currentAmount,
-            totalPremium: vars.totalPremiums[vars.i],
+            totalPremium: vars.totalPremiums[i],
             flashLoanPremiumToProtocol: vars.flashloanPremiumToProtocol,
             referralCode: params.referralCode
           })
@@ -151,11 +147,9 @@ library FlashLoanLogic {
             user: msg.sender,
             onBehalfOf: params.onBehalfOf,
             amount: vars.currentAmount,
-            interestRateMode: DataTypes.InterestRateMode(params.interestRateModes[vars.i]),
+            interestRateMode: DataTypes.InterestRateMode(params.interestRateModes[i]),
             referralCode: params.referralCode,
             releaseUnderlying: false,
-            maxStableRateBorrowSizePercent: IPool(params.pool)
-              .MAX_STABLE_RATE_BORROW_SIZE_PERCENT(),
             reservesCount: IPool(params.pool).getReservesCount(),
             oracle: IPoolAddressesProvider(params.addressesProvider).getPriceOracle(),
             userEModeCategory: IPool(params.pool).getUserEMode(params.onBehalfOf).toUint8(),
@@ -169,7 +163,7 @@ library FlashLoanLogic {
           msg.sender,
           vars.currentAsset,
           vars.currentAmount,
-          DataTypes.InterestRateMode(params.interestRateModes[vars.i]),
+          DataTypes.InterestRateMode(params.interestRateModes[i]),
           0,
           params.referralCode
         );
@@ -275,7 +269,7 @@ library FlashLoanLogic {
       msg.sender,
       params.asset,
       params.amount,
-      DataTypes.InterestRateMode(0),
+      DataTypes.InterestRateMode.NONE,
       params.totalPremium,
       params.referralCode
     );
diff --git a/src/core/contracts/protocol/libraries/logic/GenericLogic.sol b/src/contracts/protocol/libraries/logic/GenericLogic.sol
similarity index 87%
rename from src/core/contracts/protocol/libraries/logic/GenericLogic.sol
rename to src/contracts/protocol/libraries/logic/GenericLogic.sol
index 3342316e..cd5b83c6 100644
--- a/src/core/contracts/protocol/libraries/logic/GenericLogic.sol
+++ b/src/contracts/protocol/libraries/logic/GenericLogic.sol
@@ -6,6 +6,7 @@ import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';
 import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
 import {UserConfiguration} from '../configuration/UserConfiguration.sol';
+import {EModeConfiguration} from '../configuration/EModeConfiguration.sol';
 import {PercentageMath} from '../math/PercentageMath.sol';
 import {WadRayMath} from '../math/WadRayMath.sol';
 import {DataTypes} from '../types/DataTypes.sol';
@@ -37,10 +38,8 @@ library GenericLogic {
     uint256 totalDebtInBaseCurrency;
     uint256 avgLtv;
     uint256 avgLiquidationThreshold;
-    uint256 eModeAssetPrice;
     uint256 eModeLtv;
     uint256 eModeLiqThreshold;
-    uint256 eModeAssetCategory;
     address currentReserveAddress;
     bool hasZeroLtvCollateral;
     bool isInEModeCategory;
@@ -74,11 +73,8 @@ library GenericLogic {
     CalculateUserAccountDataVars memory vars;
 
     if (params.userEModeCategory != 0) {
-      (vars.eModeLtv, vars.eModeLiqThreshold, vars.eModeAssetPrice) = EModeLogic
-        .getEModeConfiguration(
-          eModeCategories[params.userEModeCategory],
-          IPriceOracleGetter(params.oracle)
-        );
+      vars.eModeLtv = eModeCategories[params.userEModeCategory].ltv;
+      vars.eModeLiqThreshold = eModeCategories[params.userEModeCategory].liquidationThreshold;
     }
 
     while (vars.i < params.reservesCount) {
@@ -100,23 +96,15 @@ library GenericLogic {
 
       DataTypes.ReserveData storage currentReserve = reservesData[vars.currentReserveAddress];
 
-      (
-        vars.ltv,
-        vars.liquidationThreshold,
-        ,
-        vars.decimals,
-        ,
-        vars.eModeAssetCategory
-      ) = currentReserve.configuration.getParams();
+      (vars.ltv, vars.liquidationThreshold, , vars.decimals, ) = currentReserve
+        .configuration
+        .getParams();
 
       unchecked {
         vars.assetUnit = 10 ** vars.decimals;
       }
 
-      vars.assetPrice = vars.eModeAssetPrice != 0 &&
-        params.userEModeCategory == vars.eModeAssetCategory
-        ? vars.eModeAssetPrice
-        : IPriceOracleGetter(params.oracle).getAssetPrice(vars.currentReserveAddress);
+      vars.assetPrice = IPriceOracleGetter(params.oracle).getAssetPrice(vars.currentReserveAddress);
 
       if (vars.liquidationThreshold != 0 && params.userConfig.isUsingAsCollateral(vars.i)) {
         vars.userBalanceInBaseCurrency = _getUserBalanceInBaseCurrency(
@@ -128,10 +116,12 @@ library GenericLogic {
 
         vars.totalCollateralInBaseCurrency += vars.userBalanceInBaseCurrency;
 
-        vars.isInEModeCategory = EModeLogic.isInEModeCategory(
-          params.userEModeCategory,
-          vars.eModeAssetCategory
-        );
+        vars.isInEModeCategory =
+          params.userEModeCategory != 0 &&
+          EModeConfiguration.isReserveEnabledOnBitmap(
+            eModeCategories[params.userEModeCategory].collateralBitmap,
+            vars.i
+          );
 
         if (vars.ltv != 0) {
           vars.avgLtv +=
@@ -199,7 +189,7 @@ library GenericLogic {
   ) internal pure returns (uint256) {
     uint256 availableBorrowsInBaseCurrency = totalCollateralInBaseCurrency.percentMul(ltv);
 
-    if (availableBorrowsInBaseCurrency < totalDebtInBaseCurrency) {
+    if (availableBorrowsInBaseCurrency <= totalDebtInBaseCurrency) {
       return 0;
     }
 
@@ -209,7 +199,7 @@ library GenericLogic {
 
   /**
    * @notice Calculates total debt of the user in the based currency used to normalize the values of the assets
-   * @dev This fetches the `balanceOf` of the stable and variable debt tokens for the user. For gas reasons, the
+   * @dev This fetches the `balanceOf` of the variable debt token for the user. For gas reasons, the
    * variable debt balance is calculated by fetching `scaledBalancesOf` normalized debt, which is cheaper than
    * fetching `balanceOf`
    * @param user The address of the user
@@ -228,14 +218,11 @@ library GenericLogic {
     uint256 userTotalDebt = IScaledBalanceToken(reserve.variableDebtTokenAddress).scaledBalanceOf(
       user
     );
-    if (userTotalDebt != 0) {
-      userTotalDebt = userTotalDebt.rayMul(reserve.getNormalizedDebt());
+    if (userTotalDebt == 0) {
+      return 0;
     }
 
-    userTotalDebt = userTotalDebt + IERC20(reserve.stableDebtTokenAddress).balanceOf(user);
-
-    userTotalDebt = assetPrice * userTotalDebt;
-
+    userTotalDebt = userTotalDebt.rayMul(reserve.getNormalizedDebt()) * assetPrice;
     unchecked {
       return userTotalDebt / assetUnit;
     }
diff --git a/src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol b/src/contracts/protocol/libraries/logic/IsolationModeLogic.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/logic/IsolationModeLogic.sol
rename to src/contracts/protocol/libraries/logic/IsolationModeLogic.sol
diff --git a/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol b/src/contracts/protocol/libraries/logic/LiquidationLogic.sol
similarity index 81%
rename from src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol
rename to src/contracts/protocol/libraries/logic/LiquidationLogic.sol
index 158cd46f..8f4c35f6 100644
--- a/src/core/contracts/protocol/libraries/logic/LiquidationLogic.sol
+++ b/src/contracts/protocol/libraries/logic/LiquidationLogic.sol
@@ -5,7 +5,6 @@ import {IERC20} from '../../../dependencies/openzeppelin/contracts//IERC20.sol';
 import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {PercentageMath} from '../../libraries/math/PercentageMath.sol';
 import {WadRayMath} from '../../libraries/math/WadRayMath.sol';
-import {Helpers} from '../../libraries/helpers/Helpers.sol';
 import {DataTypes} from '../../libraries/types/DataTypes.sol';
 import {ReserveLogic} from './ReserveLogic.sol';
 import {ValidationLogic} from './ValidationLogic.sol';
@@ -14,8 +13,8 @@ import {IsolationModeLogic} from './IsolationModeLogic.sol';
 import {EModeLogic} from './EModeLogic.sol';
 import {UserConfiguration} from '../../libraries/configuration/UserConfiguration.sol';
 import {ReserveConfiguration} from '../../libraries/configuration/ReserveConfiguration.sol';
+import {EModeConfiguration} from '../../libraries/configuration/EModeConfiguration.sol';
 import {IAToken} from '../../../interfaces/IAToken.sol';
-import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';
 import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';
 import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';
 
@@ -69,15 +68,12 @@ library LiquidationLogic {
 
   struct LiquidationCallLocalVars {
     uint256 userCollateralBalance;
-    uint256 userVariableDebt;
     uint256 userTotalDebt;
     uint256 actualDebtToLiquidate;
     uint256 actualCollateralToLiquidate;
     uint256 liquidationBonus;
     uint256 healthFactor;
     uint256 liquidationProtocolFeeAmount;
-    address collateralPriceSource;
-    address debtPriceSource;
     IAToken collateralAToken;
     DataTypes.ReserveCache debtReserveCache;
   }
@@ -121,7 +117,7 @@ library LiquidationLogic {
       })
     );
 
-    (vars.userVariableDebt, vars.userTotalDebt, vars.actualDebtToLiquidate) = _calculateDebt(
+    (vars.userTotalDebt, vars.actualDebtToLiquidate) = _calculateDebt(
       vars.debtReserveCache,
       params,
       vars.healthFactor
@@ -139,12 +135,18 @@ library LiquidationLogic {
       })
     );
 
-    (
-      vars.collateralAToken,
-      vars.collateralPriceSource,
-      vars.debtPriceSource,
-      vars.liquidationBonus
-    ) = _getConfigurationData(eModeCategories, collateralReserve, params);
+    vars.collateralAToken = IAToken(collateralReserve.aTokenAddress);
+    if (
+      params.userEModeCategory != 0 &&
+      EModeConfiguration.isReserveEnabledOnBitmap(
+        eModeCategories[params.userEModeCategory].collateralBitmap,
+        collateralReserve.id
+      )
+    ) {
+      vars.liquidationBonus = eModeCategories[params.userEModeCategory].liquidationBonus;
+    } else {
+      vars.liquidationBonus = collateralReserve.configuration.getLiquidationBonus();
+    }
 
     vars.userCollateralBalance = vars.collateralAToken.balanceOf(params.user);
 
@@ -155,8 +157,8 @@ library LiquidationLogic {
     ) = _calculateAvailableCollateralToLiquidate(
       collateralReserve,
       vars.debtReserveCache,
-      vars.collateralPriceSource,
-      vars.debtPriceSource,
+      params.collateralAsset,
+      params.debtAsset,
       vars.actualDebtToLiquidate,
       vars.userCollateralBalance,
       vars.liquidationBonus,
@@ -325,29 +327,9 @@ library LiquidationLogic {
     DataTypes.ExecuteLiquidationCallParams memory params,
     LiquidationCallLocalVars memory vars
   ) internal {
-    if (vars.userVariableDebt >= vars.actualDebtToLiquidate) {
-      vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(
-        vars.debtReserveCache.variableDebtTokenAddress
-      ).burn(
-          params.user,
-          vars.actualDebtToLiquidate,
-          vars.debtReserveCache.nextVariableBorrowIndex
-        );
-    } else {
-      // If the user doesn't have variable debt, no need to try to burn variable debt tokens
-      if (vars.userVariableDebt != 0) {
-        vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(
-          vars.debtReserveCache.variableDebtTokenAddress
-        ).burn(params.user, vars.userVariableDebt, vars.debtReserveCache.nextVariableBorrowIndex);
-      }
-      (
-        vars.debtReserveCache.nextTotalStableDebt,
-        vars.debtReserveCache.nextAvgStableBorrowRate
-      ) = IStableDebtToken(vars.debtReserveCache.stableDebtTokenAddress).burn(
-        params.user,
-        vars.actualDebtToLiquidate - vars.userVariableDebt
-      );
-    }
+    vars.debtReserveCache.nextScaledVariableDebt = IVariableDebtToken(
+      vars.debtReserveCache.variableDebtTokenAddress
+    ).burn(params.user, vars.actualDebtToLiquidate, vars.debtReserveCache.nextVariableBorrowIndex);
   }
 
   /**
@@ -357,7 +339,6 @@ library LiquidationLogic {
    * @param debtReserveCache The reserve cache data object of the debt reserve
    * @param params The additional parameters needed to execute the liquidation function
    * @param healthFactor The health factor of the position
-   * @return The variable debt of the user
    * @return The total debt of the user
    * @return The actual debt to liquidate as a function of the closeFactor
    */
@@ -365,71 +346,22 @@ library LiquidationLogic {
     DataTypes.ReserveCache memory debtReserveCache,
     DataTypes.ExecuteLiquidationCallParams memory params,
     uint256 healthFactor
-  ) internal view returns (uint256, uint256, uint256) {
-    (uint256 userStableDebt, uint256 userVariableDebt) = Helpers.getUserCurrentDebt(
-      params.user,
-      debtReserveCache
+  ) internal view returns (uint256, uint256) {
+    uint256 userVariableDebt = IERC20(debtReserveCache.variableDebtTokenAddress).balanceOf(
+      params.user
     );
 
-    uint256 userTotalDebt = userStableDebt + userVariableDebt;
-
     uint256 closeFactor = healthFactor > CLOSE_FACTOR_HF_THRESHOLD
       ? DEFAULT_LIQUIDATION_CLOSE_FACTOR
       : MAX_LIQUIDATION_CLOSE_FACTOR;
 
-    uint256 maxLiquidatableDebt = userTotalDebt.percentMul(closeFactor);
+    uint256 maxLiquidatableDebt = userVariableDebt.percentMul(closeFactor);
 
     uint256 actualDebtToLiquidate = params.debtToCover > maxLiquidatableDebt
       ? maxLiquidatableDebt
       : params.debtToCover;
 
-    return (userVariableDebt, userTotalDebt, actualDebtToLiquidate);
-  }
-
-  /**
-   * @notice Returns the configuration data for the debt and the collateral reserves.
-   * @param eModeCategories The configuration of all the efficiency mode categories
-   * @param collateralReserve The data of the collateral reserve
-   * @param params The additional parameters needed to execute the liquidation function
-   * @return The collateral aToken
-   * @return The address to use as price source for the collateral
-   * @return The address to use as price source for the debt
-   * @return The liquidation bonus to apply to the collateral
-   */
-  function _getConfigurationData(
-    mapping(uint8 => DataTypes.EModeCategory) storage eModeCategories,
-    DataTypes.ReserveData storage collateralReserve,
-    DataTypes.ExecuteLiquidationCallParams memory params
-  ) internal view returns (IAToken, address, address, uint256) {
-    IAToken collateralAToken = IAToken(collateralReserve.aTokenAddress);
-    uint256 liquidationBonus = collateralReserve.configuration.getLiquidationBonus();
-
-    address collateralPriceSource = params.collateralAsset;
-    address debtPriceSource = params.debtAsset;
-
-    if (params.userEModeCategory != 0) {
-      address eModePriceSource = eModeCategories[params.userEModeCategory].priceSource;
-
-      if (
-        EModeLogic.isInEModeCategory(
-          params.userEModeCategory,
-          collateralReserve.configuration.getEModeCategory()
-        )
-      ) {
-        liquidationBonus = eModeCategories[params.userEModeCategory].liquidationBonus;
-
-        if (eModePriceSource != address(0)) {
-          collateralPriceSource = eModePriceSource;
-        }
-      }
-
-      // when in eMode, debt will always be in the same eMode category, can skip matching category check
-      if (eModePriceSource != address(0)) {
-        debtPriceSource = eModePriceSource;
-      }
-    }
-
-    return (collateralAToken, collateralPriceSource, debtPriceSource, liquidationBonus);
+    return (userVariableDebt, actualDebtToLiquidate);
   }
 
   struct AvailableCollateralToLiquidateLocalVars {
diff --git a/src/core/contracts/protocol/libraries/logic/PoolLogic.sol b/src/contracts/protocol/libraries/logic/PoolLogic.sol
similarity index 99%
rename from src/core/contracts/protocol/libraries/logic/PoolLogic.sol
rename to src/contracts/protocol/libraries/logic/PoolLogic.sol
index 92138fe8..1558fe55 100644
--- a/src/core/contracts/protocol/libraries/logic/PoolLogic.sol
+++ b/src/contracts/protocol/libraries/logic/PoolLogic.sol
@@ -43,7 +43,6 @@ library PoolLogic {
     require(Address.isContract(params.asset), Errors.NOT_CONTRACT);
     reservesData[params.asset].init(
       params.aTokenAddress,
-      params.stableDebtAddress,
       params.variableDebtAddress,
       params.interestRateStrategyAddress
     );
diff --git a/src/core/contracts/protocol/libraries/logic/ReserveLogic.sol b/src/contracts/protocol/libraries/logic/ReserveLogic.sol
similarity index 74%
rename from src/core/contracts/protocol/libraries/logic/ReserveLogic.sol
rename to src/contracts/protocol/libraries/logic/ReserveLogic.sol
index dedcfb61..dd5c637d 100644
--- a/src/core/contracts/protocol/libraries/logic/ReserveLogic.sol
+++ b/src/contracts/protocol/libraries/logic/ReserveLogic.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.10;
 
 import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IStableDebtToken} from '../../../interfaces/IStableDebtToken.sol';
 import {IVariableDebtToken} from '../../../interfaces/IVariableDebtToken.sol';
 import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
@@ -133,14 +132,12 @@ library ReserveLogic {
    * @notice Initializes a reserve.
    * @param reserve The reserve object
    * @param aTokenAddress The address of the overlying atoken contract
-   * @param stableDebtTokenAddress The address of the overlying stable debt token contract
    * @param variableDebtTokenAddress The address of the overlying variable debt token contract
    * @param interestRateStrategyAddress The address of the interest rate strategy contract
    */
   function init(
     DataTypes.ReserveData storage reserve,
     address aTokenAddress,
-    address stableDebtTokenAddress,
     address variableDebtTokenAddress,
     address interestRateStrategyAddress
   ) internal {
@@ -149,20 +146,12 @@ library ReserveLogic {
     reserve.liquidityIndex = uint128(WadRayMath.RAY);
     reserve.variableBorrowIndex = uint128(WadRayMath.RAY);
     reserve.aTokenAddress = aTokenAddress;
-    reserve.stableDebtTokenAddress = stableDebtTokenAddress;
     reserve.variableDebtTokenAddress = variableDebtTokenAddress;
     reserve.interestRateStrategyAddress = interestRateStrategyAddress;
   }
 
-  struct UpdateInterestRatesAndVirtualBalanceLocalVars {
-    uint256 nextLiquidityRate;
-    uint256 nextStableRate;
-    uint256 nextVariableRate;
-    uint256 totalVariableDebt;
-  }
-
   /**
-   * @notice Updates the reserve current stable borrow rate, the current variable borrow rate and the current liquidity rate.
+   * @notice Updates the reserve current variable borrow rate and the current liquidity rate.
    * @param reserve The reserve reserve to be updated
    * @param reserveCache The caching layer for the reserve data
    * @param reserveAddress The address of the reserve to be updated
@@ -176,34 +165,27 @@ library ReserveLogic {
     uint256 liquidityAdded,
     uint256 liquidityTaken
   ) internal {
-    UpdateInterestRatesAndVirtualBalanceLocalVars memory vars;
-
-    vars.totalVariableDebt = reserveCache.nextScaledVariableDebt.rayMul(
+    uint256 totalVariableDebt = reserveCache.nextScaledVariableDebt.rayMul(
       reserveCache.nextVariableBorrowIndex
     );
 
-    (
-      vars.nextLiquidityRate,
-      vars.nextStableRate,
-      vars.nextVariableRate
-    ) = IReserveInterestRateStrategy(reserve.interestRateStrategyAddress).calculateInterestRates(
-      DataTypes.CalculateInterestRatesParams({
-        unbacked: reserve.unbacked,
-        liquidityAdded: liquidityAdded,
-        liquidityTaken: liquidityTaken,
-        totalStableDebt: reserveCache.nextTotalStableDebt,
-        totalVariableDebt: vars.totalVariableDebt,
-        averageStableBorrowRate: reserveCache.nextAvgStableBorrowRate,
-        reserveFactor: reserveCache.reserveFactor,
-        reserve: reserveAddress,
-        usingVirtualBalance: reserve.configuration.getIsVirtualAccActive(),
-        virtualUnderlyingBalance: reserve.virtualUnderlyingBalance
-      })
-    );
+    (uint256 nextLiquidityRate, uint256 nextVariableRate) = IReserveInterestRateStrategy(
+      reserve.interestRateStrategyAddress
+    ).calculateInterestRates(
+        DataTypes.CalculateInterestRatesParams({
+          unbacked: reserve.unbacked,
+          liquidityAdded: liquidityAdded,
+          liquidityTaken: liquidityTaken,
+          totalDebt: totalVariableDebt,
+          reserveFactor: reserveCache.reserveFactor,
+          reserve: reserveAddress,
+          usingVirtualBalance: reserve.configuration.getIsVirtualAccActive(),
+          virtualUnderlyingBalance: reserve.virtualUnderlyingBalance
+        })
+      );
 
-    reserve.currentLiquidityRate = vars.nextLiquidityRate.toUint128();
-    reserve.currentStableBorrowRate = vars.nextStableRate.toUint128();
-    reserve.currentVariableBorrowRate = vars.nextVariableRate.toUint128();
+    reserve.currentLiquidityRate = nextLiquidityRate.toUint128();
+    reserve.currentVariableBorrowRate = nextVariableRate.toUint128();
 
     // Only affect virtual balance if the reserve uses it
     if (reserve.configuration.getIsVirtualAccActive()) {
@@ -217,23 +199,14 @@ library ReserveLogic {
 
     emit ReserveDataUpdated(
       reserveAddress,
-      vars.nextLiquidityRate,
-      vars.nextStableRate,
-      vars.nextVariableRate,
+      nextLiquidityRate,
+      0,
+      nextVariableRate,
       reserveCache.nextLiquidityIndex,
       reserveCache.nextVariableBorrowIndex
     );
   }
 
-  struct AccrueToTreasuryLocalVars {
-    uint256 prevTotalStableDebt;
-    uint256 prevTotalVariableDebt;
-    uint256 currTotalVariableDebt;
-    uint256 cumulatedStableInterest;
-    uint256 totalDebtAccrued;
-    uint256 amountToMint;
-  }
-
   /**
    * @notice Mints part of the repaid interest to the reserve treasury as a function of the reserve factor for the
    * specific asset.
@@ -244,47 +217,27 @@ library ReserveLogic {
     DataTypes.ReserveData storage reserve,
     DataTypes.ReserveCache memory reserveCache
   ) internal {
-    AccrueToTreasuryLocalVars memory vars;
-
     if (reserveCache.reserveFactor == 0) {
       return;
     }
 
     //calculate the total variable debt at moment of the last interaction
-    vars.prevTotalVariableDebt = reserveCache.currScaledVariableDebt.rayMul(
+    uint256 prevTotalVariableDebt = reserveCache.currScaledVariableDebt.rayMul(
       reserveCache.currVariableBorrowIndex
     );
 
     //calculate the new total variable debt after accumulation of the interest on the index
-    vars.currTotalVariableDebt = reserveCache.currScaledVariableDebt.rayMul(
+    uint256 currTotalVariableDebt = reserveCache.currScaledVariableDebt.rayMul(
       reserveCache.nextVariableBorrowIndex
     );
 
-    //calculate the stable debt until the last timestamp update
-    vars.cumulatedStableInterest = MathUtils.calculateCompoundedInterest(
-      reserveCache.currAvgStableBorrowRate,
-      reserveCache.stableDebtLastUpdateTimestamp,
-      reserveCache.reserveLastUpdateTimestamp
-    );
+    //debt accrued is the sum of the current debt minus the sum of the debt at the last update
+    uint256 totalDebtAccrued = currTotalVariableDebt - prevTotalVariableDebt;
 
-    vars.prevTotalStableDebt = reserveCache.currPrincipalStableDebt.rayMul(
-      vars.cumulatedStableInterest
-    );
+    uint256 amountToMint = totalDebtAccrued.percentMul(reserveCache.reserveFactor);
 
-    //debt accrued is the sum of the current debt minus the sum of the debt at the last update
-    vars.totalDebtAccrued =
-      vars.currTotalVariableDebt +
-      reserveCache.currTotalStableDebt -
-      vars.prevTotalVariableDebt -
-      vars.prevTotalStableDebt;
-
-    vars.amountToMint = vars.totalDebtAccrued.percentMul(reserveCache.reserveFactor);
-
-    if (vars.amountToMint != 0) {
-      reserve.accruedToTreasury += vars
-        .amountToMint
-        .rayDiv(reserveCache.nextLiquidityIndex)
-        .toUint128();
+    if (amountToMint != 0) {
+      reserve.accruedToTreasury += amountToMint.rayDiv(reserveCache.nextLiquidityIndex).toUint128();
     }
   }
 
@@ -347,7 +300,6 @@ library ReserveLogic {
     reserveCache.currVariableBorrowRate = reserve.currentVariableBorrowRate;
 
     reserveCache.aTokenAddress = reserve.aTokenAddress;
-    reserveCache.stableDebtTokenAddress = reserve.stableDebtTokenAddress;
     reserveCache.variableDebtTokenAddress = reserve.variableDebtTokenAddress;
 
     reserveCache.reserveLastUpdateTimestamp = reserve.lastUpdateTimestamp;
@@ -356,18 +308,6 @@ library ReserveLogic {
       reserveCache.variableDebtTokenAddress
     ).scaledTotalSupply();
 
-    (
-      reserveCache.currPrincipalStableDebt,
-      reserveCache.currTotalStableDebt,
-      reserveCache.currAvgStableBorrowRate,
-      reserveCache.stableDebtLastUpdateTimestamp
-    ) = IStableDebtToken(reserveCache.stableDebtTokenAddress).getSupplyData();
-
-    // by default the actions are considered as not affecting the debt balances.
-    // if the action involves mint/burn of debt, the cache needs to be updated
-    reserveCache.nextTotalStableDebt = reserveCache.currTotalStableDebt;
-    reserveCache.nextAvgStableBorrowRate = reserveCache.currAvgStableBorrowRate;
-
     return reserveCache;
   }
 }
diff --git a/src/core/contracts/protocol/libraries/logic/SupplyLogic.sol b/src/contracts/protocol/libraries/logic/SupplyLogic.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/logic/SupplyLogic.sol
rename to src/contracts/protocol/libraries/logic/SupplyLogic.sol
diff --git a/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol b/src/contracts/protocol/libraries/logic/ValidationLogic.sol
similarity index 74%
rename from src/core/contracts/protocol/libraries/logic/ValidationLogic.sol
rename to src/contracts/protocol/libraries/logic/ValidationLogic.sol
index 79c734c0..e08a30e8 100644
--- a/src/core/contracts/protocol/libraries/logic/ValidationLogic.sol
+++ b/src/contracts/protocol/libraries/logic/ValidationLogic.sol
@@ -5,6 +5,7 @@ import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {Address} from '../../../dependencies/openzeppelin/contracts/Address.sol';
 import {GPv2SafeERC20} from '../../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {IReserveInterestRateStrategy} from '../../../interfaces/IReserveInterestRateStrategy.sol';
+import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';
 import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol';
 import {IAToken} from '../../../interfaces/IAToken.sol';
 import {IPriceOracleSentinel} from '../../../interfaces/IPriceOracleSentinel.sol';
@@ -12,6 +13,7 @@ import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider
 import {IAccessControl} from '../../../dependencies/openzeppelin/contracts/IAccessControl.sol';
 import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol';
 import {UserConfiguration} from '../configuration/UserConfiguration.sol';
+import {EModeConfiguration} from '../configuration/EModeConfiguration.sol';
 import {Errors} from '../helpers/Errors.sol';
 import {WadRayMath} from '../math/WadRayMath.sol';
 import {PercentageMath} from '../math/PercentageMath.sol';
@@ -69,9 +71,7 @@ library ValidationLogic {
   ) internal view {
     require(amount != 0, Errors.INVALID_AMOUNT);
 
-    (bool isActive, bool isFrozen, , , bool isPaused) = reserveCache
-      .reserveConfiguration
-      .getFlags();
+    (bool isActive, bool isFrozen, , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
     require(isActive, Errors.RESERVE_INACTIVE);
     require(!isPaused, Errors.RESERVE_PAUSED);
     require(!isFrozen, Errors.RESERVE_FROZEN);
@@ -101,7 +101,7 @@ library ValidationLogic {
     require(amount != 0, Errors.INVALID_AMOUNT);
     require(amount <= userBalance, Errors.NOT_ENOUGH_AVAILABLE_USER_BALANCE);
 
-    (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
+    (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
     require(isActive, Errors.RESERVE_INACTIVE);
     require(!isPaused, Errors.RESERVE_PAUSED);
   }
@@ -119,13 +119,11 @@ library ValidationLogic {
     uint256 borrowCap;
     uint256 amountInBaseCurrency;
     uint256 assetUnit;
-    address eModePriceSource;
     address siloedBorrowingAddress;
     bool isActive;
     bool isFrozen;
     bool isPaused;
     bool borrowingEnabled;
-    bool stableRateBorrowingEnabled;
     bool siloedBorrowingEnabled;
   }
 
@@ -146,13 +144,10 @@ library ValidationLogic {
 
     ValidateBorrowLocalVars memory vars;
 
-    (
-      vars.isActive,
-      vars.isFrozen,
-      vars.borrowingEnabled,
-      vars.stableRateBorrowingEnabled,
-      vars.isPaused
-    ) = params.reserveCache.reserveConfiguration.getFlags();
+    (vars.isActive, vars.isFrozen, vars.borrowingEnabled, vars.isPaused) = params
+      .reserveCache
+      .reserveConfiguration
+      .getFlags();
 
     require(vars.isActive, Errors.RESERVE_INACTIVE);
     require(!vars.isPaused, Errors.RESERVE_PAUSED);
@@ -172,8 +167,7 @@ library ValidationLogic {
 
     //validate interest rate mode
     require(
-      params.interestRateMode == DataTypes.InterestRateMode.VARIABLE ||
-        params.interestRateMode == DataTypes.InterestRateMode.STABLE,
+      params.interestRateMode == DataTypes.InterestRateMode.VARIABLE,
       Errors.INVALID_INTEREST_RATE_MODE_SELECTED
     );
 
@@ -188,10 +182,7 @@ library ValidationLogic {
         params.reserveCache.nextVariableBorrowIndex
       );
 
-      vars.totalDebt =
-        params.reserveCache.currTotalStableDebt +
-        vars.totalSupplyVariableDebt +
-        params.amount;
+      vars.totalDebt = vars.totalSupplyVariableDebt + params.amount;
 
       unchecked {
         require(vars.totalDebt <= vars.borrowCap * vars.assetUnit, Errors.BORROW_CAP_EXCEEDED);
@@ -218,10 +209,12 @@ library ValidationLogic {
 
     if (params.userEModeCategory != 0) {
       require(
-        params.reserveCache.reserveConfiguration.getEModeCategory() == params.userEModeCategory,
-        Errors.INCONSISTENT_EMODE_CATEGORY
+        EModeConfiguration.isReserveEnabledOnBitmap(
+          eModeCategories[params.userEModeCategory].borrowableBitmap,
+          reservesData[params.asset].id
+        ),
+        Errors.NOT_BORROWABLE_IN_EMODE
       );
-      vars.eModePriceSource = eModeCategories[params.userEModeCategory].priceSource;
     }
 
     (
@@ -253,9 +246,7 @@ library ValidationLogic {
     );
 
     vars.amountInBaseCurrency =
-      IPriceOracleGetter(params.oracle).getAssetPrice(
-        vars.eModePriceSource != address(0) ? vars.eModePriceSource : params.asset
-      ) *
+      IPriceOracleGetter(params.oracle).getAssetPrice(params.asset) *
       params.amount;
     unchecked {
       vars.amountInBaseCurrency /= vars.assetUnit;
@@ -270,35 +261,6 @@ library ValidationLogic {
       Errors.COLLATERAL_CANNOT_COVER_NEW_BORROW
     );
 
-    /**
-     * Following conditions need to be met if the user is borrowing at a stable rate:
-     * 1. Reserve must be enabled for stable rate borrowing
-     * 2. Users cannot borrow from the reserve if their collateral is (mostly) the same currency
-     *    they are borrowing, to prevent abuses.
-     * 3. Users will be able to borrow only a portion of the total available liquidity
-     */
-
-    if (params.interestRateMode == DataTypes.InterestRateMode.STABLE) {
-      //check if the borrow mode is stable and if stable rate borrowing is enabled on this reserve
-
-      require(vars.stableRateBorrowingEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
-
-      require(
-        !params.userConfig.isUsingAsCollateral(reservesData[params.asset].id) ||
-          params.reserveCache.reserveConfiguration.getLtv() == 0 ||
-          params.amount > IERC20(params.reserveCache.aTokenAddress).balanceOf(params.userAddress),
-        Errors.COLLATERAL_SAME_AS_BORROWING_CURRENCY
-      );
-
-      vars.availableLiquidity = reservesData[params.asset].virtualUnderlyingBalance;
-
-      //calculate the max available loan size in stable rate mode as a percentage of the
-      //available liquidity
-      uint256 maxLoanSizeStable = vars.availableLiquidity.percentMul(params.maxStableLoanPercent);
-
-      require(params.amount <= maxLoanSizeStable, Errors.AMOUNT_BIGGER_THAN_MAX_LOAN_SIZE_STABLE);
-    }
-
     if (params.userConfig.isBorrowingAny()) {
       (vars.siloedBorrowingEnabled, vars.siloedBorrowingAddress) = params
         .userConfig
@@ -319,125 +281,31 @@ library ValidationLogic {
    * @notice Validates a repay action.
    * @param reserveCache The cached data of the reserve
    * @param amountSent The amount sent for the repayment. Can be an actual value or uint(-1)
-   * @param interestRateMode The interest rate mode of the debt being repaid
    * @param onBehalfOf The address of the user msg.sender is repaying for
-   * @param stableDebt The borrow balance of the user
-   * @param variableDebt The borrow balance of the user
+   * @param debt The borrow balance of the user
    */
   function validateRepay(
     DataTypes.ReserveCache memory reserveCache,
     uint256 amountSent,
     DataTypes.InterestRateMode interestRateMode,
     address onBehalfOf,
-    uint256 stableDebt,
-    uint256 variableDebt
+    uint256 debt
   ) internal view {
     require(amountSent != 0, Errors.INVALID_AMOUNT);
+    require(
+      interestRateMode == DataTypes.InterestRateMode.VARIABLE,
+      Errors.INVALID_INTEREST_RATE_MODE_SELECTED
+    );
     require(
       amountSent != type(uint256).max || msg.sender == onBehalfOf,
       Errors.NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF
     );
 
-    (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
+    (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
     require(isActive, Errors.RESERVE_INACTIVE);
     require(!isPaused, Errors.RESERVE_PAUSED);
 
-    require(
-      (stableDebt != 0 && interestRateMode == DataTypes.InterestRateMode.STABLE) ||
-        (variableDebt != 0 && interestRateMode == DataTypes.InterestRateMode.VARIABLE),
-      Errors.NO_DEBT_OF_SELECTED_TYPE
-    );
-  }
-
-  /**
-   * @notice Validates a swap of borrow rate mode.
-   * @param reserve The reserve state on which the user is swapping the rate
-   * @param reserveCache The cached data of the reserve
-   * @param userConfig The user reserves configuration
-   * @param stableDebt The stable debt of the user
-   * @param variableDebt The variable debt of the user
-   * @param currentRateMode The rate mode of the debt being swapped
-   */
-  function validateSwapRateMode(
-    DataTypes.ReserveData storage reserve,
-    DataTypes.ReserveCache memory reserveCache,
-    DataTypes.UserConfigurationMap storage userConfig,
-    uint256 stableDebt,
-    uint256 variableDebt,
-    DataTypes.InterestRateMode currentRateMode
-  ) internal view {
-    (bool isActive, , , bool stableRateEnabled, bool isPaused) = reserveCache
-      .reserveConfiguration
-      .getFlags();
-    require(isActive, Errors.RESERVE_INACTIVE);
-    require(!isPaused, Errors.RESERVE_PAUSED);
-
-    if (currentRateMode == DataTypes.InterestRateMode.STABLE) {
-      require(stableDebt != 0, Errors.NO_OUTSTANDING_STABLE_DEBT);
-    } else if (currentRateMode == DataTypes.InterestRateMode.VARIABLE) {
-      require(variableDebt != 0, Errors.NO_OUTSTANDING_VARIABLE_DEBT);
-      /**
-       * user wants to swap to stable, before swapping we need to ensure that
-       * 1. stable borrow rate is enabled on the reserve
-       * 2. user is not trying to abuse the reserve by supplying
-       * more collateral than he is borrowing, artificially lowering
-       * the interest rate, borrowing at variable, and switching to stable
-       */
-      require(stableRateEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
-
-      require(
-        !userConfig.isUsingAsCollateral(reserve.id) ||
-          reserveCache.reserveConfiguration.getLtv() == 0 ||
-          stableDebt + variableDebt > IERC20(reserveCache.aTokenAddress).balanceOf(msg.sender),
-        Errors.COLLATERAL_SAME_AS_BORROWING_CURRENCY
-      );
-    } else {
-      revert(Errors.INVALID_INTEREST_RATE_MODE_SELECTED);
-    }
-  }
-
-  /**
-   * @notice Validates a stable borrow rate rebalance action.
-   * @dev Rebalancing is accepted when depositors are earning <= 90% of their earnings in pure supply/demand market (variable rate only)
-   * For this to be the case, there has to be quite large stable debt with an interest rate below the current variable rate.
-   * @param reserve The reserve state on which the user is getting rebalanced
-   * @param reserveCache The cached state of the reserve
-   * @param reserveAddress The address of the reserve
-   */
-  function validateRebalanceStableBorrowRate(
-    DataTypes.ReserveData storage reserve,
-    DataTypes.ReserveCache memory reserveCache,
-    address reserveAddress
-  ) internal view {
-    (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
-    require(isActive, Errors.RESERVE_INACTIVE);
-    require(!isPaused, Errors.RESERVE_PAUSED);
-
-    uint256 totalDebt = IERC20(reserveCache.stableDebtTokenAddress).totalSupply() +
-      IERC20(reserveCache.variableDebtTokenAddress).totalSupply();
-
-    (uint256 liquidityRateVariableDebtOnly, , ) = IReserveInterestRateStrategy(
-      reserve.interestRateStrategyAddress
-    ).calculateInterestRates(
-        DataTypes.CalculateInterestRatesParams({
-          unbacked: reserve.unbacked,
-          liquidityAdded: 0,
-          liquidityTaken: 0,
-          totalStableDebt: 0,
-          totalVariableDebt: totalDebt,
-          averageStableBorrowRate: 0,
-          reserveFactor: reserveCache.reserveFactor,
-          reserve: reserveAddress,
-          usingVirtualBalance: reserve.configuration.getIsVirtualAccActive(),
-          virtualUnderlyingBalance: reserve.virtualUnderlyingBalance
-        })
-      );
-
-    require(
-      reserveCache.currLiquidityRate <=
-        liquidityRateVariableDebtOnly.percentMul(REBALANCE_UP_LIQUIDITY_RATE_THRESHOLD),
-      Errors.INTEREST_RATE_REBALANCE_CONDITIONS_NOT_MET
-    );
+    require(debt != 0, Errors.NO_DEBT_OF_SELECTED_TYPE);
   }
 
   /**
@@ -451,7 +319,7 @@ library ValidationLogic {
   ) internal pure {
     require(userBalance != 0, Errors.UNDERLYING_BALANCE_ZERO);
 
-    (bool isActive, , , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
+    (bool isActive, , , bool isPaused) = reserveCache.reserveConfiguration.getFlags();
     require(isActive, Errors.RESERVE_INACTIVE);
     require(!isPaused, Errors.RESERVE_PAUSED);
   }
@@ -518,11 +386,11 @@ library ValidationLogic {
   ) internal view {
     ValidateLiquidationCallLocalVars memory vars;
 
-    (vars.collateralReserveActive, , , , vars.collateralReservePaused) = collateralReserve
+    (vars.collateralReserveActive, , , vars.collateralReservePaused) = collateralReserve
       .configuration
       .getFlags();
 
-    (vars.principalReserveActive, , , , vars.principalReservePaused) = params
+    (vars.principalReserveActive, , , vars.principalReservePaused) = params
       .debtReserveCache
       .reserveConfiguration
       .getFlags();
@@ -663,7 +531,6 @@ library ValidationLogic {
   ) internal view {
     require(asset != address(0), Errors.ZERO_ADDRESS_NOT_VALID);
     require(reserve.id != 0 || reservesList[0] == asset, Errors.ASSET_NOT_LISTED);
-    require(IERC20(reserve.stableDebtTokenAddress).totalSupply() == 0, Errors.STABLE_DEBT_NOT_ZERO);
     require(
       IERC20(reserve.variableDebtTokenAddress).totalSupply() == 0,
       Errors.VARIABLE_DEBT_SUPPLY_NOT_ZERO
@@ -676,24 +543,21 @@ library ValidationLogic {
 
   /**
    * @notice Validates the action of setting efficiency mode.
-   * @param reservesData The state of all the reserves
-   * @param reservesList The addresses of all the active reserves
    * @param eModeCategories a mapping storing configurations for all efficiency mode categories
    * @param userConfig the user configuration
    * @param reservesCount The total number of valid reserves
    * @param categoryId The id of the category
    */
   function validateSetUserEMode(
-    mapping(address => DataTypes.ReserveData) storage reservesData,
-    mapping(uint256 => address) storage reservesList,
     mapping(uint8 => DataTypes.EModeCategory) storage eModeCategories,
     DataTypes.UserConfigurationMap memory userConfig,
     uint256 reservesCount,
     uint8 categoryId
   ) internal view {
+    DataTypes.EModeCategory storage eModeCategory = eModeCategories[categoryId];
     // category is invalid if the liq threshold is not set
     require(
-      categoryId == 0 || eModeCategories[categoryId].liquidationThreshold != 0,
+      categoryId == 0 || eModeCategory.liquidationThreshold != 0,
       Errors.INCONSISTENT_EMODE_CATEGORY
     );
 
@@ -708,11 +572,9 @@ library ValidationLogic {
       unchecked {
         for (uint256 i = 0; i < reservesCount; i++) {
           if (userConfig.isBorrowing(i)) {
-            DataTypes.ReserveConfigurationMap memory configuration = reservesData[reservesList[i]]
-              .configuration;
             require(
-              configuration.getEModeCategory() == categoryId,
-              Errors.INCONSISTENT_EMODE_CATEGORY
+              EModeConfiguration.isReserveEnabledOnBitmap(eModeCategory.borrowableBitmap, i),
+              Errors.NOT_BORROWABLE_IN_EMODE
             );
           }
         }
diff --git a/src/core/contracts/protocol/libraries/math/MathUtils.sol b/src/contracts/protocol/libraries/math/MathUtils.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/math/MathUtils.sol
rename to src/contracts/protocol/libraries/math/MathUtils.sol
diff --git a/src/core/contracts/protocol/libraries/math/PercentageMath.sol b/src/contracts/protocol/libraries/math/PercentageMath.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/math/PercentageMath.sol
rename to src/contracts/protocol/libraries/math/PercentageMath.sol
diff --git a/src/core/contracts/protocol/libraries/math/WadRayMath.sol b/src/contracts/protocol/libraries/math/WadRayMath.sol
similarity index 100%
rename from src/core/contracts/protocol/libraries/math/WadRayMath.sol
rename to src/contracts/protocol/libraries/math/WadRayMath.sol
diff --git a/src/core/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol b/src/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol
similarity index 89%
rename from src/core/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol
rename to src/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol
index 7a80594e..7894871b 100644
--- a/src/core/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol
+++ b/src/contracts/protocol/libraries/types/ConfiguratorInputTypes.sol
@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 library ConfiguratorInputTypes {
   struct InitReserveInput {
     address aTokenImpl;
-    address stableDebtTokenImpl;
     address variableDebtTokenImpl;
     bool useVirtualBalance;
     address interestRateStrategyAddress;
@@ -15,8 +14,6 @@ library ConfiguratorInputTypes {
     string aTokenSymbol;
     string variableDebtTokenName;
     string variableDebtTokenSymbol;
-    string stableDebtTokenName;
-    string stableDebtTokenSymbol;
     bytes params;
     bytes interestRateData;
   }
diff --git a/src/core/contracts/protocol/libraries/types/DataTypes.sol b/src/contracts/protocol/libraries/types/DataTypes.sol
similarity index 89%
rename from src/core/contracts/protocol/libraries/types/DataTypes.sol
rename to src/contracts/protocol/libraries/types/DataTypes.sol
index 64f3e891..13c12c99 100644
--- a/src/core/contracts/protocol/libraries/types/DataTypes.sol
+++ b/src/contracts/protocol/libraries/types/DataTypes.sol
@@ -17,7 +17,7 @@ library DataTypes {
     uint128 variableBorrowIndex;
     //the current variable borrow rate. Expressed in ray
     uint128 currentVariableBorrowRate;
-    //the current stable borrow rate. Expressed in ray
+    // DEPRECATED on v3.2.0
     uint128 currentStableBorrowRate;
     //timestamp of last update
     uint40 lastUpdateTimestamp;
@@ -25,7 +25,7 @@ library DataTypes {
     uint16 id;
     //aToken address
     address aTokenAddress;
-    //stableDebtToken address
+    // DEPRECATED on v3.2.0
     address stableDebtTokenAddress;
     //variableDebtToken address
     address variableDebtTokenAddress;
@@ -50,8 +50,8 @@ library DataTypes {
     uint128 variableBorrowIndex;
     //the current variable borrow rate. Expressed in ray
     uint128 currentVariableBorrowRate;
-    //the current stable borrow rate. Expressed in ray
-    uint128 currentStableBorrowRate;
+    // DEPRECATED on v3.2.0
+    uint128 __deprecatedStableBorrowRate;
     //timestamp of last update
     uint40 lastUpdateTimestamp;
     //the id of the reserve. Represents the position in the list of the active reserves
@@ -60,8 +60,8 @@ library DataTypes {
     uint40 liquidationGracePeriodUntil;
     //aToken address
     address aTokenAddress;
-    //stableDebtToken address
-    address stableDebtTokenAddress;
+    // DEPRECATED on v3.2.0
+    address __deprecatedStableDebtTokenAddress;
     //variableDebtToken address
     address variableDebtTokenAddress;
     //address of the interest rate strategy
@@ -84,7 +84,7 @@ library DataTypes {
     //bit 56: reserve is active
     //bit 57: reserve is frozen
     //bit 58: borrowing is enabled
-    //bit 59: stable rate borrowing enabled
+    //bit 59: DEPRECATED: stable rate borrowing enabled
     //bit 60: asset is paused
     //bit 61: borrowing in isolation mode is enabled
     //bit 62: siloed borrowing enabled
@@ -93,7 +93,7 @@ library DataTypes {
     //bit 80-115: borrow cap in whole tokens, borrowCap == 0 => no cap
     //bit 116-151: supply cap in whole tokens, supplyCap == 0 => no cap
     //bit 152-167: liquidation protocol fee
-    //bit 168-175: eMode category
+    //bit 168-175: DEPRECATED: eMode category
     //bit 176-211: unbacked mint cap in whole tokens, unbackedMintCap == 0 => minting disabled
     //bit 212-251: debt ceiling for isolation mode with (ReserveConfiguration::DEBT_CEILING_DECIMALS) decimals
     //bit 252: virtual accounting is enabled for the reserve
@@ -111,30 +111,49 @@ library DataTypes {
     uint256 data;
   }
 
-  struct EModeCategory {
+  // DEPRECATED: kept for backwards compatibility, might be removed in a future version
+  struct EModeCategoryLegacy {
     // each eMode category has a custom ltv and liquidation threshold
     uint16 ltv;
     uint16 liquidationThreshold;
     uint16 liquidationBonus;
-    // each eMode category may or may not have a custom oracle to override the individual assets price oracles
+    // DEPRECATED
     address priceSource;
     string label;
   }
 
+  struct CollateralConfig {
+    uint16 ltv;
+    uint16 liquidationThreshold;
+    uint16 liquidationBonus;
+  }
+
+  struct EModeCategoryBaseConfiguration {
+    uint16 ltv;
+    uint16 liquidationThreshold;
+    uint16 liquidationBonus;
+    string label;
+  }
+
+  struct EModeCategory {
+    // each eMode category has a custom ltv and liquidation threshold
+    uint16 ltv;
+    uint16 liquidationThreshold;
+    uint16 liquidationBonus;
+    uint128 collateralBitmap;
+    string label;
+    uint128 borrowableBitmap;
+  }
+
   enum InterestRateMode {
     NONE,
-    STABLE,
+    __DEPRECATED,
     VARIABLE
   }
 
   struct ReserveCache {
     uint256 currScaledVariableDebt;
     uint256 nextScaledVariableDebt;
-    uint256 currPrincipalStableDebt;
-    uint256 currAvgStableBorrowRate;
-    uint256 currTotalStableDebt;
-    uint256 nextAvgStableBorrowRate;
-    uint256 nextTotalStableDebt;
     uint256 currLiquidityIndex;
     uint256 nextLiquidityIndex;
     uint256 currVariableBorrowIndex;
@@ -144,10 +163,8 @@ library DataTypes {
     uint256 reserveFactor;
     ReserveConfigurationMap reserveConfiguration;
     address aTokenAddress;
-    address stableDebtTokenAddress;
     address variableDebtTokenAddress;
     uint40 reserveLastUpdateTimestamp;
-    uint40 stableDebtLastUpdateTimestamp;
   }
 
   struct ExecuteLiquidationCallParams {
@@ -177,7 +194,6 @@ library DataTypes {
     InterestRateMode interestRateMode;
     uint16 referralCode;
     bool releaseUnderlying;
-    uint256 maxStableRateBorrowSizePercent;
     uint256 reservesCount;
     address oracle;
     uint8 userEModeCategory;
@@ -229,7 +245,6 @@ library DataTypes {
     uint16 referralCode;
     uint256 flashLoanPremiumToProtocol;
     uint256 flashLoanPremiumTotal;
-    uint256 maxStableRateBorrowSizePercent;
     uint256 reservesCount;
     address addressesProvider;
     address pool;
@@ -271,7 +286,6 @@ library DataTypes {
     address userAddress;
     uint256 amount;
     InterestRateMode interestRateMode;
-    uint256 maxStableLoanPercent;
     uint256 reservesCount;
     address oracle;
     uint8 userEModeCategory;
@@ -292,9 +306,7 @@ library DataTypes {
     uint256 unbacked;
     uint256 liquidityAdded;
     uint256 liquidityTaken;
-    uint256 totalStableDebt;
-    uint256 totalVariableDebt;
-    uint256 averageStableBorrowRate;
+    uint256 totalDebt;
     uint256 reserveFactor;
     address reserve;
     bool usingVirtualBalance;
@@ -304,7 +316,6 @@ library DataTypes {
   struct InitReserveParams {
     address asset;
     address aTokenAddress;
-    address stableDebtAddress;
     address variableDebtAddress;
     address interestRateStrategyAddress;
     uint16 reservesCount;
diff --git a/src/core/contracts/protocol/pool/L2Pool.sol b/src/contracts/protocol/pool/L2Pool.sol
similarity index 86%
rename from src/core/contracts/protocol/pool/L2Pool.sol
rename to src/contracts/protocol/pool/L2Pool.sol
index 801c20e8..d8925717 100644
--- a/src/core/contracts/protocol/pool/L2Pool.sol
+++ b/src/contracts/protocol/pool/L2Pool.sol
@@ -79,24 +79,6 @@ abstract contract L2Pool is Pool, IL2Pool {
     return repayWithATokens(asset, amount, interestRateMode);
   }
 
-  /// @inheritdoc IL2Pool
-  function swapBorrowRateMode(bytes32 args) external override {
-    (address asset, uint256 interestRateMode) = CalldataLogic.decodeSwapBorrowRateModeParams(
-      _reservesList,
-      args
-    );
-    swapBorrowRateMode(asset, interestRateMode);
-  }
-
-  /// @inheritdoc IL2Pool
-  function rebalanceStableBorrowRate(bytes32 args) external override {
-    (address asset, address user) = CalldataLogic.decodeRebalanceStableBorrowRateParams(
-      _reservesList,
-      args
-    );
-    rebalanceStableBorrowRate(asset, user);
-  }
-
   /// @inheritdoc IL2Pool
   function setUserUseReserveAsCollateral(bytes32 args) external override {
     (address asset, bool useAsCollateral) = CalldataLogic.decodeSetUserUseReserveAsCollateralParams(
diff --git a/src/core/contracts/protocol/pool/Pool.sol b/src/contracts/protocol/pool/Pool.sol
similarity index 90%
rename from src/core/contracts/protocol/pool/Pool.sol
rename to src/contracts/protocol/pool/Pool.sol
index 4397323d..f4a9812e 100644
--- a/src/core/contracts/protocol/pool/Pool.sol
+++ b/src/contracts/protocol/pool/Pool.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {Errors} from '../libraries/helpers/Errors.sol';
 import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';
 import {PoolLogic} from '../libraries/logic/PoolLogic.sol';
@@ -28,8 +28,7 @@ import {PoolStorage} from './PoolStorage.sol';
  *   # Withdraw
  *   # Borrow
  *   # Repay
- *   # Swap their loans between variable and stable rate
- *   # Enable/disable their supplied assets as collateral rebalance stable rate borrow positions
+ *   # Enable/disable their supplied assets as collateral
  *   # Liquidate positions
  *   # Execute Flash Loans
  * @dev To be covered by a proxy contract, owned by the PoolAddressesProvider of the specific market
@@ -230,7 +229,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
         interestRateMode: DataTypes.InterestRateMode(interestRateMode),
         referralCode: referralCode,
         releaseUnderlying: true,
-        maxStableRateBorrowSizePercent: _maxStableRateBorrowSizePercent,
         reservesCount: _reservesCount,
         oracle: ADDRESSES_PROVIDER.getPriceOracle(),
         userEModeCategory: _usersEModeCategory[onBehalfOf],
@@ -317,33 +315,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
       );
   }
 
-  /// @inheritdoc IPool
-  function swapBorrowRateMode(address asset, uint256 interestRateMode) public virtual override {
-    BorrowLogic.executeSwapBorrowRateMode(
-      _reserves[asset],
-      _usersConfig[msg.sender],
-      asset,
-      msg.sender,
-      DataTypes.InterestRateMode(interestRateMode)
-    );
-  }
-
-  /// @inheritdoc IPool
-  function swapToVariable(address asset, address user) public virtual override {
-    BorrowLogic.executeSwapBorrowRateMode(
-      _reserves[asset],
-      _usersConfig[user],
-      asset,
-      user,
-      DataTypes.InterestRateMode.STABLE
-    );
-  }
-
-  /// @inheritdoc IPool
-  function rebalanceStableBorrowRate(address asset, address user) public virtual override {
-    BorrowLogic.executeRebalanceStableBorrowRate(_reserves[asset], asset, user);
-  }
-
   /// @inheritdoc IPool
   function setUserUseReserveAsCollateral(
     address asset,
@@ -409,7 +380,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
       referralCode: referralCode,
       flashLoanPremiumToProtocol: _flashLoanPremiumToProtocol,
       flashLoanPremiumTotal: _flashLoanPremiumTotal,
-      maxStableRateBorrowSizePercent: _maxStableRateBorrowSizePercent,
       reservesCount: _reservesCount,
       addressesProvider: address(ADDRESSES_PROVIDER),
       pool: address(this),
@@ -472,11 +442,9 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
     res.currentLiquidityRate = reserve.currentLiquidityRate;
     res.variableBorrowIndex = reserve.variableBorrowIndex;
     res.currentVariableBorrowRate = reserve.currentVariableBorrowRate;
-    res.currentStableBorrowRate = reserve.currentStableBorrowRate;
     res.lastUpdateTimestamp = reserve.lastUpdateTimestamp;
     res.id = reserve.id;
     res.aTokenAddress = reserve.aTokenAddress;
-    res.stableDebtTokenAddress = reserve.stableDebtTokenAddress;
     res.variableDebtTokenAddress = reserve.variableDebtTokenAddress;
     res.interestRateStrategyAddress = reserve.interestRateStrategyAddress;
     res.accruedToTreasury = reserve.accruedToTreasury;
@@ -583,11 +551,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
     return _reservesList[id];
   }
 
-  /// @inheritdoc IPool
-  function MAX_STABLE_RATE_BORROW_SIZE_PERCENT() public view virtual override returns (uint256) {
-    return _maxStableRateBorrowSizePercent;
-  }
-
   /// @inheritdoc IPool
   function BRIDGE_PROTOCOL_FEE() public view virtual override returns (uint256) {
     return _bridgeProtocolFee;
@@ -641,7 +604,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
   function initReserve(
     address asset,
     address aTokenAddress,
-    address stableDebtAddress,
     address variableDebtAddress,
     address interestRateStrategyAddress
   ) external virtual override onlyPoolConfigurator {
@@ -652,7 +614,6 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
         DataTypes.InitReserveParams({
           asset: asset,
           aTokenAddress: aTokenAddress,
-          stableDebtAddress: stableDebtAddress,
           variableDebtAddress: variableDebtAddress,
           interestRateStrategyAddress: interestRateStrategyAddress,
           reservesCount: _reservesCount,
@@ -725,18 +686,76 @@ abstract contract Pool is VersionedInitializable, PoolStorage, IPool {
   /// @inheritdoc IPool
   function configureEModeCategory(
     uint8 id,
-    DataTypes.EModeCategory memory category
+    DataTypes.EModeCategoryBaseConfiguration memory category
+  ) external virtual override onlyPoolConfigurator {
+    // category 0 is reserved for volatile heterogeneous assets and it's always disabled
+    require(id != 0, Errors.EMODE_CATEGORY_RESERVED);
+    _eModeCategories[id].ltv = category.ltv;
+    _eModeCategories[id].liquidationThreshold = category.liquidationThreshold;
+    _eModeCategories[id].liquidationBonus = category.liquidationBonus;
+    _eModeCategories[id].label = category.label;
+  }
+
+  /// @inheritdoc IPool
+  function configureEModeCategoryCollateralBitmap(
+    uint8 id,
+    uint128 collateralBitmap
   ) external virtual override onlyPoolConfigurator {
     // category 0 is reserved for volatile heterogeneous assets and it's always disabled
     require(id != 0, Errors.EMODE_CATEGORY_RESERVED);
-    _eModeCategories[id] = category;
+    _eModeCategories[id].collateralBitmap = collateralBitmap;
+  }
+
+  /// @inheritdoc IPool
+  function configureEModeCategoryBorrowableBitmap(
+    uint8 id,
+    uint128 borrowableBitmap
+  ) external virtual override onlyPoolConfigurator {
+    // category 0 is reserved for volatile heterogeneous assets and it's always disabled
+    require(id != 0, Errors.EMODE_CATEGORY_RESERVED);
+    _eModeCategories[id].borrowableBitmap = borrowableBitmap;
   }
 
   /// @inheritdoc IPool
   function getEModeCategoryData(
     uint8 id
-  ) external view virtual override returns (DataTypes.EModeCategory memory) {
-    return _eModeCategories[id];
+  ) external view virtual override returns (DataTypes.EModeCategoryLegacy memory) {
+    DataTypes.EModeCategory memory category = _eModeCategories[id];
+    return
+      DataTypes.EModeCategoryLegacy({
+        ltv: category.ltv,
+        liquidationThreshold: category.liquidationThreshold,
+        liquidationBonus: category.liquidationBonus,
+        priceSource: address(0),
+        label: category.label
+      });
+  }
+
+  /// @inheritdoc IPool
+  function getEModeCategoryCollateralConfig(
+    uint8 id
+  ) external view returns (DataTypes.CollateralConfig memory) {
+    return
+      DataTypes.CollateralConfig({
+        ltv: _eModeCategories[id].ltv,
+        liquidationThreshold: _eModeCategories[id].liquidationThreshold,
+        liquidationBonus: _eModeCategories[id].liquidationBonus
+      });
+  }
+
+  /// @inheritdoc IPool
+  function getEModeCategoryLabel(uint8 id) external view returns (string memory) {
+    return _eModeCategories[id].label;
+  }
+
+  /// @inheritdoc IPool
+  function getEModeCategoryCollateralBitmap(uint8 id) external view returns (uint128) {
+    return _eModeCategories[id].collateralBitmap;
+  }
+
+  /// @inheritdoc IPool
+  function getEModeCategoryBorrowableBitmap(uint8 id) external view returns (uint128) {
+    return _eModeCategories[id].borrowableBitmap;
   }
 
   /// @inheritdoc IPool
diff --git a/src/core/contracts/protocol/pool/PoolConfigurator.sol b/src/contracts/protocol/pool/PoolConfigurator.sol
similarity index 89%
rename from src/core/contracts/protocol/pool/PoolConfigurator.sol
rename to src/contracts/protocol/pool/PoolConfigurator.sol
index 9a6ced2c..778ee79b 100644
--- a/src/core/contracts/protocol/pool/PoolConfigurator.sol
+++ b/src/contracts/protocol/pool/PoolConfigurator.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';
+import {EModeConfiguration} from '../libraries/configuration/EModeConfiguration.sol';
 import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
 import {IDefaultInterestRateStrategyV2} from '../../interfaces/IDefaultInterestRateStrategyV2.sol';
 import {Errors} from '../libraries/helpers/Errors.sol';
@@ -104,13 +105,6 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
     ConfiguratorLogic.executeUpdateAToken(_pool, input);
   }
 
-  /// @inheritdoc IPoolConfigurator
-  function updateStableDebtToken(
-    ConfiguratorInputTypes.UpdateDebtTokenInput calldata input
-  ) external override onlyPoolAdmin {
-    ConfiguratorLogic.executeUpdateStableDebtToken(_pool, input);
-  }
-
   /// @inheritdoc IPoolConfigurator
   function updateVariableDebtToken(
     ConfiguratorInputTypes.UpdateDebtTokenInput calldata input
@@ -121,9 +115,6 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
   /// @inheritdoc IPoolConfigurator
   function setReserveBorrowing(address asset, bool enabled) external override onlyRiskOrPoolAdmins {
     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
-    if (!enabled) {
-      require(!currentConfig.getStableRateBorrowingEnabled(), Errors.STABLE_BORROWING_ENABLED);
-    }
     currentConfig.setBorrowingEnabled(enabled);
     _pool.setConfiguration(asset, currentConfig);
     emit ReserveBorrowing(asset, enabled);
@@ -181,20 +172,6 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
     emit CollateralConfigurationChanged(asset, newLtv, liquidationThreshold, liquidationBonus);
   }
 
-  /// @inheritdoc IPoolConfigurator
-  function setReserveStableRateBorrowing(
-    address asset,
-    bool enabled
-  ) external override onlyRiskOrPoolAdmins {
-    DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
-    if (enabled) {
-      require(currentConfig.getBorrowingEnabled(), Errors.BORROWING_NOT_ENABLED);
-    }
-    currentConfig.setStableRateBorrowingEnabled(enabled);
-    _pool.setConfiguration(asset, currentConfig);
-    emit ReserveStableRateBorrowing(asset, enabled);
-  }
-
   /// @inheritdoc IPoolConfigurator
   function setReserveFlashLoaning(
     address asset,
@@ -397,7 +374,6 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
     uint16 ltv,
     uint16 liquidationThreshold,
     uint16 liquidationBonus,
-    address oracle,
     string calldata label
   ) external override onlyRiskOrPoolAdmins {
     require(ltv != 0, Errors.INVALID_EMODE_CATEGORY_PARAMS);
@@ -420,53 +396,57 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
       Errors.INVALID_EMODE_CATEGORY_PARAMS
     );
 
-    address[] memory reserves = _pool.getReservesList();
-    for (uint256 i = 0; i < reserves.length; i++) {
-      DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(reserves[i]);
-      if (categoryId == currentConfig.getEModeCategory()) {
-        uint256 currentLtv = currentConfig.getFrozen()
-          ? _pendingLtv[reserves[i]]
-          : currentConfig.getLtv();
-        require(ltv > currentLtv, Errors.INVALID_EMODE_CATEGORY_PARAMS);
-
-        require(
-          liquidationThreshold > currentConfig.getLiquidationThreshold(),
-          Errors.INVALID_EMODE_CATEGORY_PARAMS
-        );
-      }
-    }
+    DataTypes.EModeCategoryBaseConfiguration memory categoryData;
+    categoryData.ltv = ltv;
+    categoryData.liquidationThreshold = liquidationThreshold;
+    categoryData.liquidationBonus = liquidationBonus;
+    categoryData.label = label;
 
-    _pool.configureEModeCategory(
+    _pool.configureEModeCategory(categoryId, categoryData);
+    emit EModeCategoryAdded(
       categoryId,
-      DataTypes.EModeCategory({
-        ltv: ltv,
-        liquidationThreshold: liquidationThreshold,
-        liquidationBonus: liquidationBonus,
-        priceSource: oracle,
-        label: label
-      })
+      ltv,
+      liquidationThreshold,
+      liquidationBonus,
+      address(0),
+      label
     );
-    emit EModeCategoryAdded(categoryId, ltv, liquidationThreshold, liquidationBonus, oracle, label);
   }
 
   /// @inheritdoc IPoolConfigurator
-  function setAssetEModeCategory(
+  function setAssetCollateralInEMode(
     address asset,
-    uint8 newCategoryId
+    uint8 categoryId,
+    bool allowed
   ) external override onlyRiskOrPoolAdmins {
-    DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
+    uint128 collateralBitmap = _pool.getEModeCategoryCollateralBitmap(categoryId);
+    DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);
+    require(reserveData.id != 0 || _pool.getReservesList()[0] == asset, Errors.ASSET_NOT_LISTED);
+    collateralBitmap = EModeConfiguration.setReserveBitmapBit(
+      collateralBitmap,
+      reserveData.id,
+      allowed
+    );
+    _pool.configureEModeCategoryCollateralBitmap(categoryId, collateralBitmap);
+    emit AssetCollateralInEModeChanged(asset, categoryId, allowed);
+  }
 
-    if (newCategoryId != 0) {
-      DataTypes.EModeCategory memory categoryData = _pool.getEModeCategoryData(newCategoryId);
-      require(
-        categoryData.liquidationThreshold > currentConfig.getLiquidationThreshold(),
-        Errors.INVALID_EMODE_CATEGORY_ASSIGNMENT
-      );
-    }
-    uint256 oldCategoryId = currentConfig.getEModeCategory();
-    currentConfig.setEModeCategory(newCategoryId);
-    _pool.setConfiguration(asset, currentConfig);
-    emit EModeAssetCategoryChanged(asset, uint8(oldCategoryId), newCategoryId);
+  /// @inheritdoc IPoolConfigurator
+  function setAssetBorrowableInEMode(
+    address asset,
+    uint8 categoryId,
+    bool borrowable
+  ) external override onlyRiskOrPoolAdmins {
+    uint128 borrowableBitmap = _pool.getEModeCategoryBorrowableBitmap(categoryId);
+    DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);
+    require(reserveData.id != 0 || _pool.getReservesList()[0] == asset, Errors.ASSET_NOT_LISTED);
+    borrowableBitmap = EModeConfiguration.setReserveBitmapBit(
+      borrowableBitmap,
+      reserveData.id,
+      borrowable
+    );
+    _pool.configureEModeCategoryBorrowableBitmap(categoryId, borrowableBitmap);
+    emit AssetBorrowableInEModeChanged(asset, categoryId, borrowable);
   }
 
   /// @inheritdoc IPoolConfigurator
diff --git a/src/core/contracts/protocol/pool/PoolStorage.sol b/src/contracts/protocol/pool/PoolStorage.sol
similarity index 93%
rename from src/core/contracts/protocol/pool/PoolStorage.sol
rename to src/contracts/protocol/pool/PoolStorage.sol
index ccf22b3f..719461e4 100644
--- a/src/core/contracts/protocol/pool/PoolStorage.sol
+++ b/src/contracts/protocol/pool/PoolStorage.sol
@@ -43,8 +43,8 @@ contract PoolStorage {
   // FlashLoan premium paid to protocol treasury, expressed in bps
   uint128 internal _flashLoanPremiumToProtocol;
 
-  // Available liquidity that can be borrowed at once at stable rate, expressed in bps
-  uint64 internal _maxStableRateBorrowSizePercent;
+  // DEPRECATED on v3.2.0
+  uint64 internal __DEPRECATED_maxStableRateBorrowSizePercent;
 
   // Maximum number of active reserves there have been in the protocol. It is the upper bound of the reserves list
   uint16 internal _reservesCount;
diff --git a/src/core/contracts/protocol/tokenization/AToken.sol b/src/contracts/protocol/tokenization/AToken.sol
similarity index 98%
rename from src/core/contracts/protocol/tokenization/AToken.sol
rename to src/contracts/protocol/tokenization/AToken.sol
index 126801bf..47ba03d9 100644
--- a/src/core/contracts/protocol/tokenization/AToken.sol
+++ b/src/contracts/protocol/tokenization/AToken.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.10;
 import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
 import {SafeCast} from '../../dependencies/openzeppelin/contracts/SafeCast.sol';
-import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {Errors} from '../libraries/helpers/Errors.sol';
 import {WadRayMath} from '../libraries/math/WadRayMath.sol';
 import {IPool} from '../../interfaces/IPool.sol';
diff --git a/src/core/contracts/protocol/tokenization/VariableDebtToken.sol b/src/contracts/protocol/tokenization/VariableDebtToken.sol
similarity index 97%
rename from src/core/contracts/protocol/tokenization/VariableDebtToken.sol
rename to src/contracts/protocol/tokenization/VariableDebtToken.sol
index 0987494b..37494c85 100644
--- a/src/core/contracts/protocol/tokenization/VariableDebtToken.sol
+++ b/src/contracts/protocol/tokenization/VariableDebtToken.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {SafeCast} from '../../dependencies/openzeppelin/contracts/SafeCast.sol';
-import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {WadRayMath} from '../libraries/math/WadRayMath.sol';
 import {Errors} from '../libraries/helpers/Errors.sol';
 import {IPool} from '../../interfaces/IPool.sol';
diff --git a/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol b/src/contracts/protocol/tokenization/base/DebtTokenBase.sol
similarity index 96%
rename from src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol
rename to src/contracts/protocol/tokenization/base/DebtTokenBase.sol
index 8dc79203..626b6d8b 100644
--- a/src/core/contracts/protocol/tokenization/base/DebtTokenBase.sol
+++ b/src/contracts/protocol/tokenization/base/DebtTokenBase.sol
@@ -3,14 +3,14 @@ pragma solidity ^0.8.10;
 
 import {Context} from '../../../dependencies/openzeppelin/contracts/Context.sol';
 import {Errors} from '../../libraries/helpers/Errors.sol';
-import {VersionedInitializable} from '../../libraries/aave-upgradeability/VersionedInitializable.sol';
+import {VersionedInitializable} from '../../../misc/aave-upgradeability/VersionedInitializable.sol';
 import {ICreditDelegationToken} from '../../../interfaces/ICreditDelegationToken.sol';
 import {EIP712Base} from './EIP712Base.sol';
 
 /**
  * @title DebtTokenBase
  * @author Aave
- * @notice Base contract for different types of debt tokens, like StableDebtToken or VariableDebtToken
+ * @notice Base contract for different types of debt tokens, like VariableDebtToken
  */
 abstract contract DebtTokenBase is
   VersionedInitializable,
diff --git a/src/core/contracts/protocol/tokenization/base/EIP712Base.sol b/src/contracts/protocol/tokenization/base/EIP712Base.sol
similarity index 100%
rename from src/core/contracts/protocol/tokenization/base/EIP712Base.sol
rename to src/contracts/protocol/tokenization/base/EIP712Base.sol
diff --git a/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol b/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol
similarity index 98%
rename from src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol
rename to src/contracts/protocol/tokenization/base/IncentivizedERC20.sol
index a20cd05f..4bca0483 100644
--- a/src/core/contracts/protocol/tokenization/base/IncentivizedERC20.sol
+++ b/src/contracts/protocol/tokenization/base/IncentivizedERC20.sol
@@ -41,8 +41,7 @@ abstract contract IncentivizedERC20 is Context, IERC20Detailed {
   /**
    * @dev UserState - additionalData is a flexible field.
    * ATokens and VariableDebtTokens use this field store the index of the
-   * user's last supply/withdrawal/borrow/repayment. StableDebtTokens use
-   * this field to store the user's stable rate.
+   * user's last supply/withdrawal/borrow/repayment.
    */
   struct UserState {
     uint128 balance;
diff --git a/src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol b/src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol
similarity index 100%
rename from src/core/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol
rename to src/contracts/protocol/tokenization/base/MintableIncentivizedERC20.sol
diff --git a/src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol b/src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
similarity index 100%
rename from src/core/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
rename to src/contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
diff --git a/src/periphery/contracts/rewards/EmissionManager.sol b/src/contracts/rewards/EmissionManager.sol
similarity index 95%
rename from src/periphery/contracts/rewards/EmissionManager.sol
rename to src/contracts/rewards/EmissionManager.sol
index 19138df8..b18473ff 100644
--- a/src/periphery/contracts/rewards/EmissionManager.sol
+++ b/src/contracts/rewards/EmissionManager.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
-import {IEACAggregatorProxy} from '../misc/interfaces/IEACAggregatorProxy.sol';
+import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
+import {IEACAggregatorProxy} from '../helpers/interfaces/IEACAggregatorProxy.sol';
 import {IEmissionManager} from './interfaces/IEmissionManager.sol';
 import {ITransferStrategyBase} from './interfaces/ITransferStrategyBase.sol';
 import {IRewardsController} from './interfaces/IRewardsController.sol';
diff --git a/src/periphery/contracts/rewards/RewardsController.sol b/src/contracts/rewards/RewardsController.sol
similarity index 96%
rename from src/periphery/contracts/rewards/RewardsController.sol
rename to src/contracts/rewards/RewardsController.sol
index 0c369a60..3a817f60 100644
--- a/src/periphery/contracts/rewards/RewardsController.sol
+++ b/src/contracts/rewards/RewardsController.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {VersionedInitializable} from 'aave-v3-core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol';
-import {SafeCast} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
-import {IScaledBalanceToken} from 'aave-v3-core/contracts/interfaces/IScaledBalanceToken.sol';
+import {VersionedInitializable} from '../misc/aave-upgradeability/VersionedInitializable.sol';
+import {SafeCast} from '../dependencies/openzeppelin/contracts/SafeCast.sol';
+import {IScaledBalanceToken} from '../interfaces/IScaledBalanceToken.sol';
 import {RewardsDistributor} from './RewardsDistributor.sol';
 import {IRewardsController} from './interfaces/IRewardsController.sol';
 import {ITransferStrategyBase} from './interfaces/ITransferStrategyBase.sol';
 import {RewardsDataTypes} from './libraries/RewardsDataTypes.sol';
-import {IEACAggregatorProxy} from '../misc/interfaces/IEACAggregatorProxy.sol';
+import {IEACAggregatorProxy} from '../helpers/interfaces/IEACAggregatorProxy.sol';
 
 /**
  * @title RewardsController
diff --git a/src/periphery/contracts/rewards/RewardsDistributor.sol b/src/contracts/rewards/RewardsDistributor.sol
similarity index 98%
rename from src/periphery/contracts/rewards/RewardsDistributor.sol
rename to src/contracts/rewards/RewardsDistributor.sol
index 5a76bb1e..3969a6fd 100644
--- a/src/periphery/contracts/rewards/RewardsDistributor.sol
+++ b/src/contracts/rewards/RewardsDistributor.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IScaledBalanceToken} from 'aave-v3-core/contracts/interfaces/IScaledBalanceToken.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {SafeCast} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
+import {IScaledBalanceToken} from '../interfaces/IScaledBalanceToken.sol';
+import {IERC20Detailed} from '../dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {SafeCast} from '../dependencies/openzeppelin/contracts/SafeCast.sol';
 import {IRewardsDistributor} from './interfaces/IRewardsDistributor.sol';
 import {RewardsDataTypes} from './libraries/RewardsDataTypes.sol';
 
diff --git a/src/periphery/contracts/rewards/interfaces/IEmissionManager.sol b/src/contracts/rewards/interfaces/IEmissionManager.sol
similarity index 98%
rename from src/periphery/contracts/rewards/interfaces/IEmissionManager.sol
rename to src/contracts/rewards/interfaces/IEmissionManager.sol
index 2f1f7eac..4853af21 100644
--- a/src/periphery/contracts/rewards/interfaces/IEmissionManager.sol
+++ b/src/contracts/rewards/interfaces/IEmissionManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IEACAggregatorProxy} from '../../misc/interfaces/IEACAggregatorProxy.sol';
+import {IEACAggregatorProxy} from '../../helpers/interfaces/IEACAggregatorProxy.sol';
 import {RewardsDataTypes} from '../libraries/RewardsDataTypes.sol';
 import {ITransferStrategyBase} from './ITransferStrategyBase.sol';
 import {IRewardsController} from './IRewardsController.sol';
diff --git a/src/periphery/contracts/rewards/interfaces/IPullRewardsTransferStrategy.sol b/src/contracts/rewards/interfaces/IPullRewardsTransferStrategy.sol
similarity index 100%
rename from src/periphery/contracts/rewards/interfaces/IPullRewardsTransferStrategy.sol
rename to src/contracts/rewards/interfaces/IPullRewardsTransferStrategy.sol
diff --git a/src/periphery/contracts/rewards/interfaces/IRewardsController.sol b/src/contracts/rewards/interfaces/IRewardsController.sol
similarity index 99%
rename from src/periphery/contracts/rewards/interfaces/IRewardsController.sol
rename to src/contracts/rewards/interfaces/IRewardsController.sol
index 952da7cb..cdb2ac29 100644
--- a/src/periphery/contracts/rewards/interfaces/IRewardsController.sol
+++ b/src/contracts/rewards/interfaces/IRewardsController.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import {IRewardsDistributor} from './IRewardsDistributor.sol';
 import {ITransferStrategyBase} from './ITransferStrategyBase.sol';
-import {IEACAggregatorProxy} from '../../misc/interfaces/IEACAggregatorProxy.sol';
+import {IEACAggregatorProxy} from '../../helpers/interfaces/IEACAggregatorProxy.sol';
 import {RewardsDataTypes} from '../libraries/RewardsDataTypes.sol';
 
 /**
diff --git a/src/periphery/contracts/rewards/interfaces/IRewardsDistributor.sol b/src/contracts/rewards/interfaces/IRewardsDistributor.sol
similarity index 100%
rename from src/periphery/contracts/rewards/interfaces/IRewardsDistributor.sol
rename to src/contracts/rewards/interfaces/IRewardsDistributor.sol
diff --git a/src/periphery/contracts/rewards/interfaces/IStakedToken.sol b/src/contracts/rewards/interfaces/IStakedToken.sol
similarity index 100%
rename from src/periphery/contracts/rewards/interfaces/IStakedToken.sol
rename to src/contracts/rewards/interfaces/IStakedToken.sol
diff --git a/src/periphery/contracts/rewards/interfaces/IStakedTokenTransferStrategy.sol b/src/contracts/rewards/interfaces/IStakedTokenTransferStrategy.sol
similarity index 100%
rename from src/periphery/contracts/rewards/interfaces/IStakedTokenTransferStrategy.sol
rename to src/contracts/rewards/interfaces/IStakedTokenTransferStrategy.sol
diff --git a/src/periphery/contracts/rewards/interfaces/ITransferStrategyBase.sol b/src/contracts/rewards/interfaces/ITransferStrategyBase.sol
similarity index 100%
rename from src/periphery/contracts/rewards/interfaces/ITransferStrategyBase.sol
rename to src/contracts/rewards/interfaces/ITransferStrategyBase.sol
diff --git a/src/periphery/contracts/rewards/libraries/RewardsDataTypes.sol b/src/contracts/rewards/libraries/RewardsDataTypes.sol
similarity index 94%
rename from src/periphery/contracts/rewards/libraries/RewardsDataTypes.sol
rename to src/contracts/rewards/libraries/RewardsDataTypes.sol
index 4cafda32..38fe87c5 100644
--- a/src/periphery/contracts/rewards/libraries/RewardsDataTypes.sol
+++ b/src/contracts/rewards/libraries/RewardsDataTypes.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.10;
 
 import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';
-import {IEACAggregatorProxy} from '../../misc/interfaces/IEACAggregatorProxy.sol';
+import {IEACAggregatorProxy} from '../../helpers/interfaces/IEACAggregatorProxy.sol';
 
 library RewardsDataTypes {
   struct RewardsConfigInput {
diff --git a/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol b/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol
similarity index 88%
rename from src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol
rename to src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol
index 46620b3e..dc4b5a9b 100644
--- a/src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol
+++ b/src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.10;
 import {IPullRewardsTransferStrategy} from '../interfaces/IPullRewardsTransferStrategy.sol';
 import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';
 import {TransferStrategyBase} from './TransferStrategyBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title PullRewardsTransferStrategy
diff --git a/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol b/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol
similarity index 92%
rename from src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol
rename to src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol
index bb3901c3..9ca6f8c3 100644
--- a/src/periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol
+++ b/src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol
@@ -5,8 +5,8 @@ import {IStakedToken} from '../interfaces/IStakedToken.sol';
 import {IStakedTokenTransferStrategy} from '../interfaces/IStakedTokenTransferStrategy.sol';
 import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';
 import {TransferStrategyBase} from './TransferStrategyBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title StakedTokenTransferStrategy
diff --git a/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol b/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol
similarity index 89%
rename from src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol
rename to src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol
index 2f26b958..5064606d 100644
--- a/src/periphery/contracts/rewards/transfer-strategies/TransferStrategyBase.sol
+++ b/src/contracts/rewards/transfer-strategies/TransferStrategyBase.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.10;
 
 import {ITransferStrategyBase} from '../interfaces/ITransferStrategyBase.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 
 /**
  * @title TransferStrategyStorage
diff --git a/src/periphery/contracts/treasury/Collector.sol b/src/contracts/treasury/Collector.sol
similarity index 96%
rename from src/periphery/contracts/treasury/Collector.sol
rename to src/contracts/treasury/Collector.sol
index 22cf3e2f..daf6b7a3 100644
--- a/src/periphery/contracts/treasury/Collector.sol
+++ b/src/contracts/treasury/Collector.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import {ICollector} from './ICollector.sol';
 import {ReentrancyGuard} from '../dependencies/openzeppelin/ReentrancyGuard.sol';
-import {VersionedInitializable} from '../../../core/contracts/protocol/libraries/aave-upgradeability/VersionedInitializable.sol';
-import {IERC20} from '../../../core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {SafeERC20} from '../../../core/contracts/dependencies/openzeppelin/contracts/SafeERC20.sol';
-import {Address} from '../../../core/contracts/dependencies/openzeppelin/contracts/Address.sol';
+import {VersionedInitializable} from '../misc/aave-upgradeability/VersionedInitializable.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
+import {SafeERC20} from '../dependencies/openzeppelin/contracts/SafeERC20.sol';
+import {Address} from '../dependencies/openzeppelin/contracts/Address.sol';
 
 /**
  * @title Collector
diff --git a/src/periphery/contracts/treasury/ICollector.sol b/src/contracts/treasury/ICollector.sol
similarity index 98%
rename from src/periphery/contracts/treasury/ICollector.sol
rename to src/contracts/treasury/ICollector.sol
index ae92353d..94103d48 100644
--- a/src/periphery/contracts/treasury/ICollector.sol
+++ b/src/contracts/treasury/ICollector.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20} from '../../../core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
 
 interface ICollector {
   struct Stream {
diff --git a/src/periphery/contracts/treasury/IRevenueSplitter.sol b/src/contracts/treasury/IRevenueSplitter.sol
similarity index 97%
rename from src/periphery/contracts/treasury/IRevenueSplitter.sol
rename to src/contracts/treasury/IRevenueSplitter.sol
index 0bb36044..00911e3a 100644
--- a/src/periphery/contracts/treasury/IRevenueSplitter.sol
+++ b/src/contracts/treasury/IRevenueSplitter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
 
 interface IRevenueSplitterErrors {
   error InvalidPercentSplit();
diff --git a/src/periphery/contracts/treasury/RevenueSplitter.sol b/src/contracts/treasury/RevenueSplitter.sol
similarity index 85%
rename from src/periphery/contracts/treasury/RevenueSplitter.sol
rename to src/contracts/treasury/RevenueSplitter.sol
index e926551a..3936467c 100644
--- a/src/periphery/contracts/treasury/RevenueSplitter.sol
+++ b/src/contracts/treasury/RevenueSplitter.sol
@@ -2,10 +2,10 @@
 pragma solidity ^0.8.19;
 
 import {IRevenueSplitter} from './IRevenueSplitter.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {GPv2SafeERC20} from 'aave-v3-core/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {ReentrancyGuard} from 'aave-v3-periphery/contracts/dependencies/openzeppelin/ReentrancyGuard.sol';
+import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol';
+import {GPv2SafeERC20} from '../dependencies/gnosis/contracts/GPv2SafeERC20.sol';
+import {PercentageMath} from '../protocol/libraries/math/PercentageMath.sol';
+import {ReentrancyGuard} from '../dependencies/openzeppelin/ReentrancyGuard.sol';
 
 /**
  * @title RevenueSplitter
diff --git a/src/core/contracts/interfaces/IStableDebtToken.sol b/src/core/contracts/interfaces/IStableDebtToken.sol
deleted file mode 100644
index fa976676..00000000
--- a/src/core/contracts/interfaces/IStableDebtToken.sol
+++ /dev/null
@@ -1,139 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import {IInitializableDebtToken} from './IInitializableDebtToken.sol';
-
-/**
- * @title IStableDebtToken
- * @author Aave
- * @notice Defines the interface for the stable debt token
- * @dev It does not inherit from IERC20 to save in code size
- */
-interface IStableDebtToken is IInitializableDebtToken {
-  /**
-   * @dev Emitted when new stable debt is minted
-   * @param user The address of the user who triggered the minting
-   * @param onBehalfOf The recipient of stable debt tokens
-   * @param amount The amount minted (user entered amount + balance increase from interest)
-   * @param currentBalance The balance of the user based on the previous balance and balance increase from interest
-   * @param balanceIncrease The increase in balance since the last action of the user 'onBehalfOf'
-   * @param newRate The rate of the debt after the minting
-   * @param avgStableRate The next average stable rate after the minting
-   * @param newTotalSupply The next total supply of the stable debt token after the action
-   */
-  event Mint(
-    address indexed user,
-    address indexed onBehalfOf,
-    uint256 amount,
-    uint256 currentBalance,
-    uint256 balanceIncrease,
-    uint256 newRate,
-    uint256 avgStableRate,
-    uint256 newTotalSupply
-  );
-
-  /**
-   * @dev Emitted when new stable debt is burned
-   * @param from The address from which the debt will be burned
-   * @param amount The amount being burned (user entered amount - balance increase from interest)
-   * @param currentBalance The balance of the user based on the previous balance and balance increase from interest
-   * @param balanceIncrease The increase in balance since the last action of 'from'
-   * @param avgStableRate The next average stable rate after the burning
-   * @param newTotalSupply The next total supply of the stable debt token after the action
-   */
-  event Burn(
-    address indexed from,
-    uint256 amount,
-    uint256 currentBalance,
-    uint256 balanceIncrease,
-    uint256 avgStableRate,
-    uint256 newTotalSupply
-  );
-
-  /**
-   * @notice Mints debt token to the `onBehalfOf` address.
-   * @dev The resulting rate is the weighted average between the rate of the new debt
-   * and the rate of the previous debt
-   * @param user The address receiving the borrowed underlying, being the delegatee in case
-   * of credit delegate, or same as `onBehalfOf` otherwise
-   * @param onBehalfOf The address receiving the debt tokens
-   * @param amount The amount of debt tokens to mint
-   * @param rate The rate of the debt being minted
-   * @return True if it is the first borrow, false otherwise
-   * @return The total stable debt
-   * @return The average stable borrow rate
-   */
-  function mint(
-    address user,
-    address onBehalfOf,
-    uint256 amount,
-    uint256 rate
-  ) external returns (bool, uint256, uint256);
-
-  /**
-   * @notice Burns debt of `user`
-   * @dev The resulting rate is the weighted average between the rate of the new debt
-   * and the rate of the previous debt
-   * @dev In some instances, a burn transaction will emit a mint event
-   * if the amount to burn is less than the interest the user earned
-   * @param from The address from which the debt will be burned
-   * @param amount The amount of debt tokens getting burned
-   * @return The total stable debt
-   * @return The average stable borrow rate
-   */
-  function burn(address from, uint256 amount) external returns (uint256, uint256);
-
-  /**
-   * @notice Returns the average rate of all the stable rate loans.
-   * @return The average stable rate
-   */
-  function getAverageStableRate() external view returns (uint256);
-
-  /**
-   * @notice Returns the stable rate of the user debt
-   * @param user The address of the user
-   * @return The stable rate of the user
-   */
-  function getUserStableRate(address user) external view returns (uint256);
-
-  /**
-   * @notice Returns the timestamp of the last update of the user
-   * @param user The address of the user
-   * @return The timestamp
-   */
-  function getUserLastUpdated(address user) external view returns (uint40);
-
-  /**
-   * @notice Returns the principal, the total supply, the average stable rate and the timestamp for the last update
-   * @return The principal
-   * @return The total supply
-   * @return The average stable rate
-   * @return The timestamp of the last update
-   */
-  function getSupplyData() external view returns (uint256, uint256, uint256, uint40);
-
-  /**
-   * @notice Returns the timestamp of the last update of the total supply
-   * @return The timestamp
-   */
-  function getTotalSupplyLastUpdated() external view returns (uint40);
-
-  /**
-   * @notice Returns the total supply and the average stable rate
-   * @return The total supply
-   * @return The average rate
-   */
-  function getTotalSupplyAndAvgRate() external view returns (uint256, uint256);
-
-  /**
-   * @notice Returns the principal debt balance of the user
-   * @return The debt balance of the user since the last burn/mint action
-   */
-  function principalBalanceOf(address user) external view returns (uint256);
-
-  /**
-   * @notice Returns the address of the underlying asset of this stableDebtToken (E.g. WETH for stableDebtWETH)
-   * @return The address of the underlying asset
-   */
-  function UNDERLYING_ASSET_ADDRESS() external view returns (address);
-}
diff --git a/src/core/contracts/mocks/tokens/MockDebtTokens.sol b/src/core/contracts/mocks/tokens/MockDebtTokens.sol
deleted file mode 100644
index 8c186b82..00000000
--- a/src/core/contracts/mocks/tokens/MockDebtTokens.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
-
-import {VariableDebtTokenInstance} from '../../../instances/VariableDebtTokenInstance.sol';
-import {StableDebtTokenInstance} from '../../../instances/StableDebtTokenInstance.sol';
-import {IPool} from '../../interfaces/IPool.sol';
-
-contract MockVariableDebtToken is VariableDebtTokenInstance {
-  constructor(IPool pool) VariableDebtTokenInstance(pool) {}
-
-  function getRevision() internal pure override returns (uint256) {
-    return 0x2;
-  }
-}
-
-contract MockStableDebtToken is StableDebtTokenInstance {
-  constructor(IPool pool) StableDebtTokenInstance(pool) {}
-
-  function getRevision() internal pure override returns (uint256) {
-    return 0x2;
-  }
-}
diff --git a/src/core/contracts/mocks/upgradeability/MockStableDebtToken.sol b/src/core/contracts/mocks/upgradeability/MockStableDebtToken.sol
deleted file mode 100644
index ea9d5cca..00000000
--- a/src/core/contracts/mocks/upgradeability/MockStableDebtToken.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
-
-import {StableDebtTokenInstance} from '../../../instances/StableDebtTokenInstance.sol';
-import {IPool} from '../../interfaces/IPool.sol';
-
-contract MockStableDebtToken is StableDebtTokenInstance {
-  constructor(IPool pool) StableDebtTokenInstance(pool) {}
-
-  function getRevision() internal pure override returns (uint256) {
-    return 0x2;
-  }
-}
diff --git a/src/core/contracts/protocol/libraries/helpers/Helpers.sol b/src/core/contracts/protocol/libraries/helpers/Helpers.sol
deleted file mode 100644
index 4daf97c5..00000000
--- a/src/core/contracts/protocol/libraries/helpers/Helpers.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import {IERC20} from '../../../dependencies/openzeppelin/contracts/IERC20.sol';
-import {DataTypes} from '../types/DataTypes.sol';
-
-/**
- * @title Helpers library
- * @author Aave
- */
-library Helpers {
-  /**
-   * @notice Fetches the user current stable and variable debt balances
-   * @param user The user address
-   * @param reserveCache The reserve cache data object
-   * @return The stable debt balance
-   * @return The variable debt balance
-   */
-  function getUserCurrentDebt(
-    address user,
-    DataTypes.ReserveCache memory reserveCache
-  ) internal view returns (uint256, uint256) {
-    return (
-      IERC20(reserveCache.stableDebtTokenAddress).balanceOf(user),
-      IERC20(reserveCache.variableDebtTokenAddress).balanceOf(user)
-    );
-  }
-}
diff --git a/src/core/contracts/protocol/tokenization/StableDebtToken.sol b/src/core/contracts/protocol/tokenization/StableDebtToken.sol
deleted file mode 100644
index e7c785e6..00000000
--- a/src/core/contracts/protocol/tokenization/StableDebtToken.sol
+++ /dev/null
@@ -1,141 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.10;
-
-import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
-import {VersionedInitializable} from '../libraries/aave-upgradeability/VersionedInitializable.sol';
-import {Errors} from '../libraries/helpers/Errors.sol';
-import {IAaveIncentivesController} from '../../interfaces/IAaveIncentivesController.sol';
-import {IInitializableDebtToken} from '../../interfaces/IInitializableDebtToken.sol';
-import {IStableDebtToken} from '../../interfaces/IStableDebtToken.sol';
-import {IPool} from '../../interfaces/IPool.sol';
-import {EIP712Base} from './base/EIP712Base.sol';
-import {DebtTokenBase} from './base/DebtTokenBase.sol';
-import {IncentivizedERC20} from './base/IncentivizedERC20.sol';
-
-/**
- * @title StableDebtToken
- * @author Aave
- * @notice Implements a stable debt token to track the borrowing positions of users
- * at stable rate mode
- * @dev Transfer and approve functionalities are disabled since its a non-transferable token
- */
-abstract contract StableDebtToken is DebtTokenBase, IncentivizedERC20, IStableDebtToken {
-  /**
-   * @dev Constructor.
-   * @param pool The address of the Pool contract
-   */
-  constructor(
-    IPool pool
-  ) DebtTokenBase() IncentivizedERC20(pool, 'STABLE_DEBT_TOKEN_IMPL', 'STABLE_DEBT_TOKEN_IMPL', 0) {
-    // Intentionally left blank
-  }
-
-  /// @inheritdoc IInitializableDebtToken
-  function initialize(
-    IPool initializingPool,
-    address underlyingAsset,
-    IAaveIncentivesController incentivesController,
-    uint8 debtTokenDecimals,
-    string memory debtTokenName,
-    string memory debtTokenSymbol,
-    bytes calldata params
-  ) external virtual;
-
-  /// @inheritdoc IStableDebtToken
-  function getAverageStableRate() external pure virtual override returns (uint256) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function getUserLastUpdated(address) external pure virtual override returns (uint40) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function getUserStableRate(address) external pure virtual override returns (uint256) {
-    return 0;
-  }
-
-  /// @inheritdoc IERC20
-  function balanceOf(address) public pure virtual override returns (uint256) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function mint(
-    address,
-    address,
-    uint256,
-    uint256
-  ) external virtual override onlyPool returns (bool, uint256, uint256) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function burn(address, uint256) external virtual override onlyPool returns (uint256, uint256) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function getSupplyData() external pure override returns (uint256, uint256, uint256, uint40) {
-    return (0, 0, 0, 0);
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function getTotalSupplyAndAvgRate() external pure override returns (uint256, uint256) {
-    return (0, 0);
-  }
-
-  /// @inheritdoc IERC20
-  function totalSupply() public pure virtual override returns (uint256) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function getTotalSupplyLastUpdated() external pure override returns (uint40) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function principalBalanceOf(address) external pure virtual override returns (uint256) {
-    return 0;
-  }
-
-  /// @inheritdoc IStableDebtToken
-  function UNDERLYING_ASSET_ADDRESS() external view override returns (address) {
-    return _underlyingAsset;
-  }
-
-  /// @inheritdoc EIP712Base
-  function _EIP712BaseId() internal view override returns (string memory) {
-    return name();
-  }
-
-  /**
-   * @dev Being non transferrable, the debt token does not implement any of the
-   * standard ERC20 functions for transfer and allowance.
-   */
-  function transfer(address, uint256) external virtual override returns (bool) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  function allowance(address, address) external view virtual override returns (uint256) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  function approve(address, uint256) external virtual override returns (bool) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  function transferFrom(address, address, uint256) external virtual override returns (bool) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  function increaseAllowance(address, uint256) external virtual override returns (bool) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-
-  function decreaseAllowance(address, uint256) external virtual override returns (bool) {
-    revert(Errors.OPERATION_NOT_SUPPORTED);
-  }
-}
diff --git a/src/core/instances/StableDebtTokenInstance.sol b/src/core/instances/StableDebtTokenInstance.sol
deleted file mode 100644
index 00f91a58..00000000
--- a/src/core/instances/StableDebtTokenInstance.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import {StableDebtToken, IPool, IInitializableDebtToken, VersionedInitializable, IAaveIncentivesController, Errors} from '../contracts/protocol/tokenization/StableDebtToken.sol';
-
-contract StableDebtTokenInstance is StableDebtToken {
-  uint256 public constant DEBT_TOKEN_REVISION = 1;
-
-  constructor(IPool pool) StableDebtToken(pool) {}
-
-  /// @inheritdoc VersionedInitializable
-  function getRevision() internal pure virtual override returns (uint256) {
-    return DEBT_TOKEN_REVISION;
-  }
-
-  /// @inheritdoc IInitializableDebtToken
-  function initialize(
-    IPool initializingPool,
-    address underlyingAsset,
-    IAaveIncentivesController incentivesController,
-    uint8 debtTokenDecimals,
-    string memory debtTokenName,
-    string memory debtTokenSymbol,
-    bytes calldata params
-  ) external override initializer {
-    require(initializingPool == POOL, Errors.POOL_ADDRESSES_DO_NOT_MATCH);
-    _setName(debtTokenName);
-    _setSymbol(debtTokenSymbol);
-    _setDecimals(debtTokenDecimals);
-
-    _underlyingAsset = underlyingAsset;
-    _incentivesController = incentivesController;
-
-    _domainSeparator = _calculateDomainSeparator();
-
-    emit Initialized(
-      underlyingAsset,
-      address(POOL),
-      address(incentivesController),
-      debtTokenDecimals,
-      debtTokenName,
-      debtTokenSymbol,
-      params
-    );
-  }
-}
diff --git a/src/deployments/contracts/procedures/AaveV3DefaultRateStrategyProcedure.sol b/src/deployments/contracts/procedures/AaveV3DefaultRateStrategyProcedure.sol
index db3e2bc8..d26419e7 100644
--- a/src/deployments/contracts/procedures/AaveV3DefaultRateStrategyProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3DefaultRateStrategyProcedure.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
-import {DefaultReserveInterestRateStrategyV2} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
+import {DefaultReserveInterestRateStrategyV2} from '../../../contracts/misc/DefaultReserveInterestRateStrategyV2.sol';
 
 contract AaveV3DefaultRateStrategyProcedure {
   function _deployDefaultRateStrategyV2(address poolAddressesProvider) internal returns (address) {
diff --git a/src/deployments/contracts/procedures/AaveV3GettersProcedureOne.sol b/src/deployments/contracts/procedures/AaveV3GettersProcedureOne.sol
index ffa52d4d..8aa66732 100644
--- a/src/deployments/contracts/procedures/AaveV3GettersProcedureOne.sol
+++ b/src/deployments/contracts/procedures/AaveV3GettersProcedureOne.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {WalletBalanceProvider} from 'aave-v3-periphery/contracts/misc/WalletBalanceProvider.sol';
-import {UiPoolDataProviderV3} from 'aave-v3-periphery/contracts/misc/UiPoolDataProviderV3.sol';
-import {UiIncentiveDataProviderV3} from 'aave-v3-periphery/contracts/misc/UiIncentiveDataProviderV3.sol';
-import {IEACAggregatorProxy} from 'aave-v3-periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol';
-import {AaveProtocolDataProvider} from 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {WalletBalanceProvider} from '../../../contracts/helpers/WalletBalanceProvider.sol';
+import {UiPoolDataProviderV3} from '../../../contracts/helpers/UiPoolDataProviderV3.sol';
+import {UiIncentiveDataProviderV3} from '../../../contracts/helpers/UiIncentiveDataProviderV3.sol';
+import {IEACAggregatorProxy} from '../../../contracts/helpers/interfaces/IEACAggregatorProxy.sol';
+import {AaveProtocolDataProvider} from '../../../contracts/helpers/AaveProtocolDataProvider.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
 
 contract AaveV3GettersProcedureOne {
   struct GettersReportBatchOne {
diff --git a/src/deployments/contracts/procedures/AaveV3GettersProcedureTwo.sol b/src/deployments/contracts/procedures/AaveV3GettersProcedureTwo.sol
index eaaddb17..947cc7a9 100644
--- a/src/deployments/contracts/procedures/AaveV3GettersProcedureTwo.sol
+++ b/src/deployments/contracts/procedures/AaveV3GettersProcedureTwo.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {WrappedTokenGatewayV3} from 'aave-v3-periphery/contracts/misc/WrappedTokenGatewayV3.sol';
-import {L2Encoder} from 'aave-v3-core/contracts/misc/L2Encoder.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
+import {WrappedTokenGatewayV3} from '../../../contracts/helpers/WrappedTokenGatewayV3.sol';
+import {L2Encoder} from '../../../contracts/helpers/L2Encoder.sol';
 
 contract AaveV3GettersProcedureTwo {
   struct GettersReportBatchTwo {
diff --git a/src/deployments/contracts/procedures/AaveV3HelpersProcedureOne.sol b/src/deployments/contracts/procedures/AaveV3HelpersProcedureOne.sol
index d261158f..b31a323e 100644
--- a/src/deployments/contracts/procedures/AaveV3HelpersProcedureOne.sol
+++ b/src/deployments/contracts/procedures/AaveV3HelpersProcedureOne.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import {Create2Utils} from '../utilities/Create2Utils.sol';
 import {ConfigEngineReport} from '../../interfaces/IMarketReportTypes.sol';
-import {AaveV3ConfigEngine, IAaveV3ConfigEngine, CapsEngine, BorrowEngine, CollateralEngine, RateEngine, PriceFeedEngine, EModeEngine, ListingEngine} from 'aave-v3-periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IPoolConfigurator} from 'aave-v3-core/contracts/interfaces/IPoolConfigurator.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
+import {AaveV3ConfigEngine, IAaveV3ConfigEngine, CapsEngine, BorrowEngine, CollateralEngine, RateEngine, PriceFeedEngine, EModeEngine, ListingEngine} from '../../../contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
+import {IPoolConfigurator} from '../../../contracts/interfaces/IPoolConfigurator.sol';
+import {IAaveOracle} from '../../../contracts/interfaces/IAaveOracle.sol';
 
 contract AaveV3HelpersProcedureOne {
   function _deployConfigEngine(
@@ -17,8 +17,7 @@ contract AaveV3HelpersProcedureOne {
     address rewardsController,
     address collector,
     address aTokenImpl,
-    address vTokenImpl,
-    address sTokenImpl
+    address vTokenImpl
   ) internal returns (ConfigEngineReport memory configEngineReport) {
     IAaveV3ConfigEngine.EngineLibraries memory engineLibraries = IAaveV3ConfigEngine
       .EngineLibraries({
@@ -50,7 +49,7 @@ contract AaveV3HelpersProcedureOne {
     configEngineReport.capsEngine = engineLibraries.capsEngine;
 
     configEngineReport.configEngine = address(
-      new AaveV3ConfigEngine(aTokenImpl, vTokenImpl, sTokenImpl, engineConstants, engineLibraries)
+      new AaveV3ConfigEngine(aTokenImpl, vTokenImpl, engineConstants, engineLibraries)
     );
     return configEngineReport;
   }
diff --git a/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol b/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol
index 742bc971..26c79db1 100644
--- a/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol
+++ b/src/deployments/contracts/procedures/AaveV3HelpersProcedureTwo.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.0;
 import '../../interfaces/IMarketReportTypes.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
-import {StataTokenV2} from 'aave-v3-periphery/contracts/static-a-token/StataTokenV2.sol';
-import {StataTokenFactory} from 'aave-v3-periphery/contracts/static-a-token/StataTokenFactory.sol';
+import {StataTokenV2} from '../../../contracts/extensions/static-a-token/StataTokenV2.sol';
+import {StataTokenFactory} from '../../../contracts/extensions/static-a-token/StataTokenFactory.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 
 contract AaveV3HelpersProcedureTwo is IErrors {
diff --git a/src/deployments/contracts/procedures/AaveV3IncentiveProcedure.sol b/src/deployments/contracts/procedures/AaveV3IncentiveProcedure.sol
index 1801a748..b940f795 100644
--- a/src/deployments/contracts/procedures/AaveV3IncentiveProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3IncentiveProcedure.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {EmissionManager} from 'aave-v3-periphery/contracts/rewards/EmissionManager.sol';
-import {RewardsController} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
+import {EmissionManager} from '../../../contracts/rewards/EmissionManager.sol';
+import {RewardsController} from '../../../contracts/rewards/RewardsController.sol';
 
 contract AaveV3IncentiveProcedure {
   function _deployIncentives(address tempOwner) internal returns (address, address) {
diff --git a/src/deployments/contracts/procedures/AaveV3L2PoolProcedure.sol b/src/deployments/contracts/procedures/AaveV3L2PoolProcedure.sol
index 20c7965d..f6fcba67 100644
--- a/src/deployments/contracts/procedures/AaveV3L2PoolProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3L2PoolProcedure.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {L2PoolInstance} from 'aave-v3-core/instances/L2PoolInstance.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {L2PoolInstance} from '../../../contracts/instances/L2PoolInstance.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
 import {AaveV3PoolConfigProcedure} from './AaveV3PoolConfigProcedure.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 import '../../interfaces/IMarketReportTypes.sol';
 
diff --git a/src/deployments/contracts/procedures/AaveV3MiscProcedure.sol b/src/deployments/contracts/procedures/AaveV3MiscProcedure.sol
index 516ed9d9..bd6bac8b 100644
--- a/src/deployments/contracts/procedures/AaveV3MiscProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3MiscProcedure.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
-import {PriceOracleSentinel, ISequencerOracle} from 'aave-v3-core/contracts/protocol/configuration/PriceOracleSentinel.sol';
-import {DefaultReserveInterestRateStrategyV2} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
+import {PriceOracleSentinel, ISequencerOracle} from '../../../contracts/misc/PriceOracleSentinel.sol';
+import {DefaultReserveInterestRateStrategyV2} from '../../../contracts/misc/DefaultReserveInterestRateStrategyV2.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 
 contract AaveV3MiscProcedure is IErrors {
diff --git a/src/deployments/contracts/procedures/AaveV3OracleProcedure.sol b/src/deployments/contracts/procedures/AaveV3OracleProcedure.sol
index 7acc6c91..77e97a40 100644
--- a/src/deployments/contracts/procedures/AaveV3OracleProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3OracleProcedure.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
-import {AaveOracle} from 'aave-v3-core/contracts/misc/AaveOracle.sol';
+import {AaveOracle} from '../../../contracts/misc/AaveOracle.sol';
 
 contract AaveV3OracleProcedure {
   function _deployAaveOracle(
diff --git a/src/deployments/contracts/procedures/AaveV3ParaswapProcedure.sol b/src/deployments/contracts/procedures/AaveV3ParaswapProcedure.sol
index 8e6e8b17..b89457b6 100644
--- a/src/deployments/contracts/procedures/AaveV3ParaswapProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3ParaswapProcedure.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {ParaSwapLiquiditySwapAdapter, IParaSwapAugustusRegistry} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol';
-import {ParaSwapRepayAdapter} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol';
-import {ParaSwapWithdrawSwapAdapter} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol';
-import {AaveParaSwapFeeClaimer} from 'aave-v3-periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol';
-import {IFeeClaimer} from 'aave-v3-periphery/contracts/adapters/paraswap/interfaces/IFeeClaimer.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {ParaSwapLiquiditySwapAdapter, IParaSwapAugustusRegistry} from '../../../contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol';
+import {ParaSwapRepayAdapter} from '../../../contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol';
+import {ParaSwapWithdrawSwapAdapter} from '../../../contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol';
+import {AaveParaSwapFeeClaimer} from '../../../contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol';
+import {IFeeClaimer} from '../../../contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
 
 contract AaveV3ParaswapProcedure {
   struct ParaswapAdapters {
diff --git a/src/deployments/contracts/procedures/AaveV3PoolConfigProcedure.sol b/src/deployments/contracts/procedures/AaveV3PoolConfigProcedure.sol
index fb968ec7..6f508ab8 100644
--- a/src/deployments/contracts/procedures/AaveV3PoolConfigProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3PoolConfigProcedure.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {PoolConfiguratorInstance} from 'aave-v3-core/instances/PoolConfiguratorInstance.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {AaveOracle} from 'aave-v3-core/contracts/misc/AaveOracle.sol';
+import {PoolConfiguratorInstance} from '../../../contracts/instances/PoolConfiguratorInstance.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
+import {AaveOracle} from '../../../contracts/misc/AaveOracle.sol';
 
 contract AaveV3PoolConfigProcedure {
   function _deployPoolConfigurator(address poolAddressesProvider) internal returns (address) {
diff --git a/src/deployments/contracts/procedures/AaveV3PoolProcedure.sol b/src/deployments/contracts/procedures/AaveV3PoolProcedure.sol
index 0bf84a5d..cc3cc694 100644
--- a/src/deployments/contracts/procedures/AaveV3PoolProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3PoolProcedure.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {PoolInstance} from 'aave-v3-core/instances/PoolInstance.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
+import {PoolInstance} from '../../../contracts/instances/PoolInstance.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
 import {AaveV3PoolConfigProcedure} from './AaveV3PoolConfigProcedure.sol';
 import {IErrors} from '../../interfaces/IErrors.sol';
 import '../../interfaces/IMarketReportTypes.sol';
diff --git a/src/deployments/contracts/procedures/AaveV3SetupProcedure.sol b/src/deployments/contracts/procedures/AaveV3SetupProcedure.sol
index 9852ea88..31d17b7e 100644
--- a/src/deployments/contracts/procedures/AaveV3SetupProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3SetupProcedure.sol
@@ -3,13 +3,13 @@ pragma solidity ^0.8.0;
 
 import '../../interfaces/IMarketReportTypes.sol';
 import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {IPoolConfigurator} from 'aave-v3-core/contracts/interfaces/IPoolConfigurator.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {PoolAddressesProvider} from 'aave-v3-core/contracts/protocol/configuration/PoolAddressesProvider.sol';
-import {PoolAddressesProviderRegistry} from 'aave-v3-core/contracts/protocol/configuration/PoolAddressesProviderRegistry.sol';
-import {IEmissionManager} from 'aave-v3-periphery/contracts/rewards/interfaces/IEmissionManager.sol';
-import {IRewardsController} from 'aave-v3-periphery/contracts/rewards/interfaces/IRewardsController.sol';
+import {ACLManager} from '../../../contracts/protocol/configuration/ACLManager.sol';
+import {IPoolConfigurator} from '../../../contracts/interfaces/IPoolConfigurator.sol';
+import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
+import {PoolAddressesProvider} from '../../../contracts/protocol/configuration/PoolAddressesProvider.sol';
+import {PoolAddressesProviderRegistry} from '../../../contracts/protocol/configuration/PoolAddressesProviderRegistry.sol';
+import {IEmissionManager} from '../../../contracts/rewards/interfaces/IEmissionManager.sol';
+import {IRewardsController} from '../../../contracts/rewards/interfaces/IRewardsController.sol';
 
 contract AaveV3SetupProcedure {
   struct AddressProviderInput {
diff --git a/src/deployments/contracts/procedures/AaveV3TokensProcedure.sol b/src/deployments/contracts/procedures/AaveV3TokensProcedure.sol
index 51668cf8..bb9cee8f 100644
--- a/src/deployments/contracts/procedures/AaveV3TokensProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3TokensProcedure.sol
@@ -1,17 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {ATokenInstance} from 'aave-v3-core/instances/ATokenInstance.sol';
-import {VariableDebtTokenInstance} from 'aave-v3-core/instances/VariableDebtTokenInstance.sol';
-import {StableDebtTokenInstance} from 'aave-v3-core/instances/StableDebtTokenInstance.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IAaveIncentivesController} from 'aave-v3-core/contracts/interfaces/IAaveIncentivesController.sol';
+import {ATokenInstance} from '../../../contracts/instances/ATokenInstance.sol';
+import {VariableDebtTokenInstance} from '../../../contracts/instances/VariableDebtTokenInstance.sol';
+import {IPool} from '../../../contracts/interfaces/IPool.sol';
+import {IAaveIncentivesController} from '../../../contracts/interfaces/IAaveIncentivesController.sol';
 
 contract AaveV3TokensProcedure {
   struct TokensReport {
     address aToken;
     address variableDebtToken;
-    address stableDebtToken;
   }
 
   function _deployAaveV3TokensImplementations(
@@ -22,7 +20,6 @@ contract AaveV3TokensProcedure {
 
     ATokenInstance aToken = new ATokenInstance(IPool(poolProxy));
     VariableDebtTokenInstance variableDebtToken = new VariableDebtTokenInstance(IPool(poolProxy));
-    StableDebtTokenInstance stableDebtToken = new StableDebtTokenInstance(IPool(poolProxy));
 
     aToken.initialize(
       IPool(poolProxy), // pool proxy
@@ -45,19 +42,8 @@ contract AaveV3TokensProcedure {
       empty // params
     );
 
-    stableDebtToken.initialize(
-      IPool(poolProxy), // initializingPool
-      address(0), // underlyingAsset
-      IAaveIncentivesController(address(0)), // incentivesController
-      0, // debtTokenDecimals
-      'STABLE_DEBT_TOKEN_IMPL', // debtTokenName
-      'STABLE_DEBT_TOKEN_IMPL', // debtTokenSymbol
-      empty // params
-    );
-
     tokensReport.aToken = address(aToken);
     tokensReport.variableDebtToken = address(variableDebtToken);
-    tokensReport.stableDebtToken = address(stableDebtToken);
 
     return tokensReport;
   }
diff --git a/src/deployments/contracts/procedures/AaveV3TreasuryProcedure.sol b/src/deployments/contracts/procedures/AaveV3TreasuryProcedure.sol
index b6610345..f904f559 100644
--- a/src/deployments/contracts/procedures/AaveV3TreasuryProcedure.sol
+++ b/src/deployments/contracts/procedures/AaveV3TreasuryProcedure.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
 import {TransparentUpgradeableProxy} from 'solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
 import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
-import {Collector} from '../../../periphery/contracts/treasury/Collector.sol';
+import {Collector} from '../../../contracts/treasury/Collector.sol';
 import '../../interfaces/IMarketReportTypes.sol';
 
 contract AaveV3TreasuryProcedure {
diff --git a/src/deployments/contracts/utilities/MarketReportUtils.sol b/src/deployments/contracts/utilities/MarketReportUtils.sol
index 341a64c2..24edd37f 100644
--- a/src/deployments/contracts/utilities/MarketReportUtils.sol
+++ b/src/deployments/contracts/utilities/MarketReportUtils.sol
@@ -40,7 +40,6 @@ library MarketReportUtils {
         l2Encoder: L2Encoder(report.l2Encoder),
         aToken: IAToken(report.aToken),
         variableDebtToken: IVariableDebtToken(report.variableDebtToken),
-        stableDebtToken: IStableDebtToken(report.stableDebtToken),
         emissionManager: IEmissionManager(report.emissionManager),
         rewardsControllerImplementation: IRewardsController(report.rewardsControllerImplementation),
         rewardsControllerProxy: IRewardsController(report.rewardsControllerProxy)
diff --git a/src/deployments/contracts/utilities/MetadataReporter.sol b/src/deployments/contracts/utilities/MetadataReporter.sol
index 59b5141c..60459a88 100644
--- a/src/deployments/contracts/utilities/MetadataReporter.sol
+++ b/src/deployments/contracts/utilities/MetadataReporter.sol
@@ -47,7 +47,6 @@ contract MetadataReporter is IMetadataReporter {
     vm.serializeAddress(jsonReport, 'l2Encoder', report.l2Encoder);
     vm.serializeAddress(jsonReport, 'aToken', report.aToken);
     vm.serializeAddress(jsonReport, 'variableDebtToken', report.variableDebtToken);
-    vm.serializeAddress(jsonReport, 'stableDebtToken', report.stableDebtToken);
     vm.serializeAddress(jsonReport, 'emissionManager', report.emissionManager);
     vm.serializeAddress(
       jsonReport,
@@ -88,6 +87,7 @@ contract MetadataReporter is IMetadataReporter {
       report.staticATokenImplementation
     );
     vm.serializeAddress(jsonReport, 'transparentProxyFactory', report.transparentProxyFactory);
+
     string memory output = vm.serializeAddress(
       jsonReport,
       'paraSwapRepayAdapter',
diff --git a/src/deployments/interfaces/IMarketReportTypes.sol b/src/deployments/interfaces/IMarketReportTypes.sol
index 52f5e72c..3c861a6c 100644
--- a/src/deployments/interfaces/IMarketReportTypes.sol
+++ b/src/deployments/interfaces/IMarketReportTypes.sol
@@ -1,27 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
-import 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import 'aave-v3-core/contracts/interfaces/IPoolAddressesProviderRegistry.sol';
-import 'aave-v3-core/contracts/interfaces/IPool.sol';
-import 'aave-v3-core/contracts/interfaces/IPoolConfigurator.sol';
-import 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import 'aave-v3-core/contracts/interfaces/IStableDebtToken.sol';
-import 'aave-v3-core/contracts/interfaces/IACLManager.sol';
-import 'aave-v3-core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
-import 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
-import 'aave-v3-periphery/contracts/misc/UiPoolDataProviderV3.sol';
-import 'aave-v3-periphery/contracts/misc/UiIncentiveDataProviderV3.sol';
-import 'aave-v3-periphery/contracts/rewards/interfaces/IEmissionManager.sol';
-import 'aave-v3-periphery/contracts/rewards/interfaces/IRewardsController.sol';
-import 'aave-v3-periphery/contracts/misc/WalletBalanceProvider.sol';
-import 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol';
-import 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol';
-import 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol';
-import 'aave-v3-periphery/contracts/misc/interfaces/IWrappedTokenGatewayV3.sol';
-import 'aave-v3-core/contracts/misc/L2Encoder.sol';
-import {ICollector} from 'aave-v3-periphery/contracts/treasury/ICollector.sol';
+
+import '../../contracts/interfaces/IPoolAddressesProvider.sol';
+import '../../contracts/interfaces/IPoolAddressesProviderRegistry.sol';
+import '../../contracts/interfaces/IPool.sol';
+import '../../contracts/interfaces/IPoolConfigurator.sol';
+import '../../contracts/interfaces/IAaveOracle.sol';
+import '../../contracts/interfaces/IAToken.sol';
+import '../../contracts/interfaces/IVariableDebtToken.sol';
+import '../../contracts/interfaces/IACLManager.sol';
+import '../../contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
+import '../../contracts/helpers/AaveProtocolDataProvider.sol';
+import '../../contracts/helpers/UiPoolDataProviderV3.sol';
+import '../../contracts/helpers/UiIncentiveDataProviderV3.sol';
+import '../../contracts/rewards/interfaces/IEmissionManager.sol';
+import '../../contracts/rewards/interfaces/IRewardsController.sol';
+import '../../contracts/helpers/WalletBalanceProvider.sol';
+import '../../contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol';
+import '../../contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol';
+import '../../contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol';
+import '../../contracts/helpers/interfaces/IWrappedTokenGatewayV3.sol';
+import '../../contracts/helpers/L2Encoder.sol';
+import {ICollector} from '../../contracts/treasury/ICollector.sol';
 import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
 
 struct ContractsReport {
@@ -48,7 +48,6 @@ struct ContractsReport {
   L2Encoder l2Encoder;
   IAToken aToken;
   IVariableDebtToken variableDebtToken;
-  IStableDebtToken stableDebtToken;
   IEmissionManager emissionManager;
   IRewardsController rewardsControllerImplementation;
   IRewardsController rewardsControllerProxy;
@@ -80,7 +79,6 @@ struct MarketReport {
   address l2Encoder;
   address aToken;
   address variableDebtToken;
-  address stableDebtToken;
   address emissionManager;
   address rewardsControllerImplementation;
   address rewardsControllerProxy;
diff --git a/src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol b/src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol
index 02a0100f..11a2b4f6 100644
--- a/src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol
+++ b/src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol
@@ -183,8 +183,7 @@ library AaveV3BatchOrchestration {
       setupReport.rewardsControllerProxy,
       treasury,
       tokensReport.aToken,
-      tokensReport.variableDebtToken,
-      tokensReport.stableDebtToken
+      tokensReport.variableDebtToken
     );
 
     return helpersBatchOne.getConfigEngineReport();
@@ -325,7 +324,6 @@ library AaveV3BatchOrchestration {
     report.aclManager = setupReport.aclManager;
     report.aToken = tokensReport.aToken;
     report.variableDebtToken = tokensReport.variableDebtToken;
-    report.stableDebtToken = tokensReport.stableDebtToken;
     report.priceOracleSentinel = miscReport.priceOracleSentinel;
     report.defaultInterestRateStrategy = miscReport.defaultInterestRateStrategy;
     report.configEngine = configEngineReport.configEngine;
diff --git a/src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol b/src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol
index f841b657..421308a4 100644
--- a/src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol
+++ b/src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol
@@ -15,8 +15,7 @@ contract AaveV3HelpersBatchOne is AaveV3HelpersProcedureOne {
     address rewardsController,
     address collector,
     address aTokenImpl,
-    address vTokenImpl,
-    address sTokenImpl
+    address vTokenImpl
   ) {
     _report = _deployConfigEngine(
       poolProxy,
@@ -26,8 +25,7 @@ contract AaveV3HelpersBatchOne is AaveV3HelpersProcedureOne {
       rewardsController,
       collector,
       aTokenImpl,
-      vTokenImpl,
-      sTokenImpl
+      vTokenImpl
     );
   }
 
diff --git a/src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol b/src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol
index 1f3639ea..bf02940b 100644
--- a/src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol
+++ b/src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol
@@ -7,9 +7,9 @@ import {AaveV3IncentiveProcedure} from '../../../contracts/procedures/AaveV3Ince
 import {AaveV3DefaultRateStrategyProcedure} from '../../../contracts/procedures/AaveV3DefaultRateStrategyProcedure.sol';
 import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
 import '../../../interfaces/IMarketReportTypes.sol';
-import {IRewardsController} from '../../../../periphery/contracts/rewards/interfaces/IRewardsController.sol';
+import {IRewardsController} from '../../../../contracts/rewards/interfaces/IRewardsController.sol';
 import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
-import {RevenueSplitter} from '../../../../periphery/contracts/treasury/RevenueSplitter.sol';
+import {RevenueSplitter} from '../../../../contracts/treasury/RevenueSplitter.sol';
 
 contract AaveV3PeripheryBatch is
   AaveV3TreasuryProcedure,
diff --git a/src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol b/src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol
index 07b08b1d..abed9a61 100644
--- a/src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol
+++ b/src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {Ownable} from '../../../../contracts/dependencies/openzeppelin/contracts/Ownable.sol';
 import {AaveV3SetupProcedure} from '../../../contracts/procedures/AaveV3SetupProcedure.sol';
 import '../../../contracts/MarketReportStorage.sol';
 
diff --git a/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch1.sol b/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch1.sol
index 1eb97e86..5c292cee 100644
--- a/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch1.sol
+++ b/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch1.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import '../../contracts/LibraryReportStorage.sol';
 import {Create2Utils} from '../../contracts/utilities/Create2Utils.sol';
-import {BorrowLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol';
-import {BridgeLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/BridgeLogic.sol';
-import {ConfiguratorLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/ConfiguratorLogic.sol';
-import {EModeLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/EModeLogic.sol';
+import {BorrowLogic} from '../../../contracts/protocol/libraries/logic/BorrowLogic.sol';
+import {BridgeLogic} from '../../../contracts/protocol/libraries/logic/BridgeLogic.sol';
+import {ConfiguratorLogic} from '../../../contracts/protocol/libraries/logic/ConfiguratorLogic.sol';
+import {EModeLogic} from '../../../contracts/protocol/libraries/logic/EModeLogic.sol';
 
 contract AaveV3LibrariesBatch1 is LibraryReportStorage {
   constructor() {
diff --git a/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch2.sol b/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch2.sol
index ac1b3ce6..d65db0ac 100644
--- a/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch2.sol
+++ b/src/deployments/projects/aave-v3-libraries/AaveV3LibrariesBatch2.sol
@@ -4,10 +4,10 @@ pragma solidity ^0.8.0;
 import '../../contracts/LibraryReportStorage.sol';
 import {Create2Utils} from '../../contracts/utilities/Create2Utils.sol';
 
-import {FlashLoanLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/FlashLoanLogic.sol';
-import {LiquidationLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/LiquidationLogic.sol';
-import {PoolLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/PoolLogic.sol';
-import {SupplyLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/SupplyLogic.sol';
+import {FlashLoanLogic} from '../../../contracts/protocol/libraries/logic/FlashLoanLogic.sol';
+import {LiquidationLogic} from '../../../contracts/protocol/libraries/logic/LiquidationLogic.sol';
+import {PoolLogic} from '../../../contracts/protocol/libraries/logic/PoolLogic.sol';
+import {SupplyLogic} from '../../../contracts/protocol/libraries/logic/SupplyLogic.sol';
 
 contract AaveV3LibrariesBatch2 is LibraryReportStorage {
   constructor() {
diff --git a/src/periphery/contracts/libraries/DataTypesHelper.sol b/src/periphery/contracts/libraries/DataTypesHelper.sol
deleted file mode 100644
index 492678a5..00000000
--- a/src/periphery/contracts/libraries/DataTypesHelper.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
-
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-
-/**
- * @title DataTypesHelper
- * @author Aave
- * @dev Helper library to track user current debt balance, used by WrappedTokenGatewayV3
- */
-library DataTypesHelper {
-  /**
-   * @notice Fetches the user current stable and variable debt balances
-   * @param user The user address
-   * @param reserve The reserve data object
-   * @return The stable debt balance
-   * @return The variable debt balance
-   **/
-  function getUserCurrentDebt(
-    address user,
-    DataTypes.ReserveDataLegacy memory reserve
-  ) internal view returns (uint256, uint256) {
-    return (
-      IERC20(reserve.stableDebtTokenAddress).balanceOf(user),
-      IERC20(reserve.variableDebtTokenAddress).balanceOf(user)
-    );
-  }
-}
diff --git a/src/periphery/contracts/misc/interfaces/IWETH.sol b/src/periphery/contracts/misc/interfaces/IWETH.sol
deleted file mode 100644
index a46ede7f..00000000
--- a/src/periphery/contracts/misc/interfaces/IWETH.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
-
-interface IWETH {
-  function deposit() external payable;
-
-  function withdraw(uint256) external;
-
-  function approve(address guy, uint256 wad) external returns (bool);
-
-  function transferFrom(address src, address dst, uint256 wad) external returns (bool);
-}
diff --git a/tests/core/PoolConfigurator.eMode.sol b/tests/core/PoolConfigurator.eMode.sol
deleted file mode 100644
index 6f19d5c0..00000000
--- a/tests/core/PoolConfigurator.eMode.sol
+++ /dev/null
@@ -1,362 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {ReserveConfiguration, DataTypes} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-
-contract PoolConfiguratorEModeConfigTests is TestnetProcedures {
-  using PercentageMath for uint256;
-  using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
-
-  event EModeCategoryAdded(
-    uint8 indexed categoryId,
-    uint256 ltv,
-    uint256 liquidationThreshold,
-    uint256 liquidationBonus,
-    address oracle,
-    string label
-  );
-
-  event EModeAssetCategoryChanged(address indexed asset, uint8 oldCategoryId, uint8 newCategoryId);
-
-  function setUp() public {
-    initTestEnvironment();
-  }
-
-  function test_configureEmodeCategory() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit EModeCategoryAdded(ct.id, ct.ltv, ct.lt, ct.lb, ct.oracle, ct.label);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-
-    DataTypes.EModeCategory memory emodeConfig = contracts.poolProxy.getEModeCategoryData(ct.id);
-    assertEq(emodeConfig.ltv, ct.ltv);
-    assertEq(emodeConfig.liquidationThreshold, ct.lt);
-    assertEq(emodeConfig.liquidationBonus, ct.lb);
-    assertEq(emodeConfig.priceSource, ct.oracle);
-    assertEq(emodeConfig.label, ct.label);
-  }
-
-  function test_reverts_configureEmodeCategory_bad_ltv() public {
-    DataTypes.ReserveConfigurationMap memory currentConfig = contracts.poolProxy.getConfiguration(
-      tokenList.wbtc
-    );
-
-    EModeCategoryInput memory ct = _genCategoryOne();
-
-    vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      uint16(currentConfig.getLtv() - 1),
-      uint16(currentConfig.getLiquidationThreshold() + 1),
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    vm.stopPrank();
-  }
-
-  function test_reverts_configureEmodeCategory_bad_lq() public {
-    DataTypes.ReserveConfigurationMap memory currentConfig = contracts.poolProxy.getConfiguration(
-      tokenList.wbtc
-    );
-
-    EModeCategoryInput memory ct = _genCategoryOne();
-
-    vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      uint16(currentConfig.getLtv() + 1),
-      uint16(currentConfig.getLiquidationThreshold() - 1),
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    vm.stopPrank();
-  }
-
-  function test_updateEModeCategory() public {
-    EModeCategoryInput memory ogCategory = _genCategoryOne();
-    EModeCategoryInput memory updatedCategory = EModeCategoryInput(
-      ogCategory.id,
-      90_00,
-      92_00,
-      101_00,
-      makeAddr('EMODE_ORACLE'),
-      'GROUP_B'
-    );
-
-    test_configureEmodeCategory();
-
-    vm.prank(poolAdmin);
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit EModeCategoryAdded(
-      ogCategory.id,
-      updatedCategory.ltv,
-      updatedCategory.lt,
-      updatedCategory.lb,
-      updatedCategory.oracle,
-      updatedCategory.label
-    );
-
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ogCategory.id,
-      updatedCategory.ltv,
-      updatedCategory.lt,
-      updatedCategory.lb,
-      updatedCategory.oracle,
-      updatedCategory.label
-    );
-
-    DataTypes.EModeCategory memory emodeConfig = contracts.poolProxy.getEModeCategoryData(
-      ogCategory.id
-    );
-    assertEq(emodeConfig.ltv, updatedCategory.ltv);
-    assertEq(emodeConfig.liquidationThreshold, updatedCategory.lt);
-    assertEq(emodeConfig.liquidationBonus, updatedCategory.lb);
-    assertEq(emodeConfig.priceSource, updatedCategory.oracle);
-    assertEq(emodeConfig.label, updatedCategory.label);
-  }
-
-  function test_reverts_setEmodeCategory_zero_ltv() public {
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 0, 80_00, 105_00, address(0), 'LABEL');
-  }
-
-  function test_reverts_setEmodeCategory_zero_liqThreshold() public {
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 0, 105_00, address(0), 'LABEL');
-  }
-
-  function test_reverts_setEmodeCategory_ltv_gt_liqThreshold() public {
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 79_00, 105_00, address(0), 'LABEL');
-  }
-
-  function test_reverts_setEmodeCategory_lb_lte_percentageFactor() public {
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 81_00, 100_00, address(0), 'LABEL');
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 81_00, 99_00, address(0), 'LABEL');
-  }
-
-  function test_reverts_setEmodeCategory_liquidation_threshold_doesnt_match_bonus() public {
-    uint16 liquidationThreshold = 98_00;
-    uint16 liquidationBonus = 120_00;
-    uint256 isBonusNotCovered = uint256(liquidationThreshold).percentMul(liquidationBonus);
-    assertGt(
-      isBonusNotCovered,
-      PercentageMath.PERCENTAGE_FACTOR,
-      'Input should be gt than percentage factor to revert at "threshold * bonus is required to be less than PERCENTAGE_FACTOR"'
-    );
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      1,
-      90_00,
-      liquidationThreshold,
-      liquidationBonus,
-      address(0),
-      'LABEL'
-    );
-  }
-
-  function test_reverts_configureEmodeCategory_input_ltv_lt_reserve_emode_ltv() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-    vm.startPrank(poolAdmin);
-
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct.id);
-
-    (, uint256 ltv, , , , , , , , ) = contracts.protocolDataProvider.getReserveConfigurationData(
-      tokenList.usdx
-    );
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      uint16(ltv) - 1,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    vm.stopPrank();
-  }
-
-  function test_reverts_configureEmodeCategory_input_ltv_lt_reserve_emode_pendingLtv() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-    vm.startPrank(poolAdmin);
-
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct.id);
-
-    (, uint256 ltv, , , , , , , , ) = contracts.protocolDataProvider.getReserveConfigurationData(
-      tokenList.usdx
-    );
-
-    // freeze asset
-    contracts.poolConfiguratorProxy.setReserveFreeze(tokenList.usdx, true);
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      uint16(ltv) - 1,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    vm.stopPrank();
-  }
-
-  function test_reverts_configureEmodeCategory_input_lt_lt_reserve_emode_lt() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-    vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct.id);
-
-    (, , uint256 lt, , , , , , , ) = contracts.protocolDataProvider.getReserveConfigurationData(
-      tokenList.usdx
-    );
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      uint16(lt) - 1,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    vm.stopPrank();
-  }
-
-  function test_setAssetEModeCategory() public {
-    EModeCategoryInput memory input = _genCategoryOne();
-    test_configureEmodeCategory();
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit EModeAssetCategoryChanged(tokenList.usdx, 0, input.id);
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, input.id);
-  }
-
-  function test_updateAssetEModeCategory() public {
-    EModeCategoryInput memory prevCt = _genCategoryOne();
-    EModeCategoryInput memory ct = _genCategoryTwo();
-    test_setAssetEModeCategory();
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit EModeAssetCategoryChanged(tokenList.usdx, prevCt.id, ct.id);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct.id);
-  }
-
-  function test_removeEModeCategoryFromAsset() public {
-    EModeCategoryInput memory prevCt = _genCategoryOne();
-    test_setAssetEModeCategory();
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit EModeAssetCategoryChanged(tokenList.usdx, prevCt.id, 0);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, 0);
-  }
-
-  function test_reverts_setAssetEModeCategory_invalid() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      50_00,
-      51_00,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-
-    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_ASSIGNMENT));
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct.id);
-  }
-}
diff --git a/tests/core/PoolConfigurator.initReserves.t.sol b/tests/core/PoolConfigurator.initReserves.t.sol
deleted file mode 100644
index d59ce527..00000000
--- a/tests/core/PoolConfigurator.initReserves.t.sol
+++ /dev/null
@@ -1,306 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {AToken} from 'aave-v3-core/contracts/protocol/tokenization/AToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {ConfiguratorInputTypes} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {IDefaultInterestRateStrategyV2} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
-import {TestnetProcedures, TestVars, TestReserveConfig} from '../utils/TestnetProcedures.sol';
-
-contract PoolConfiguratorInitReservesTest is TestnetProcedures {
-  event ReserveInitialized(
-    address indexed asset,
-    address indexed aToken,
-    address stableDebtToken,
-    address variableDebtToken,
-    address interestRateStrategyAddress
-  );
-
-  function setUp() public {
-    initTestEnvironment();
-  }
-
-  function test_initReserves_singleAsset(bool isVirtualAccActive) public {
-    TestnetERC20 newToken = new TestnetERC20('Misc Token', 'MISC', 18, poolAdmin);
-
-    TestVars memory t;
-    t.aTokenName = 'Misc AToken';
-    t.aTokenSymbol = 'aMISC';
-    t.variableDebtName = 'Variable Debt Misc';
-    t.variableDebtSymbol = 'varDebtMISC';
-    t.stableDebtName = 'Stable Debt Misc';
-    t.stableDebtSymbol = 'stableDebtMISC';
-    t.rateStrategy = report.defaultInterestRateStrategy;
-    t.interestRateData = abi.encode(
-      IDefaultInterestRateStrategyV2.InterestRateData({
-        optimalUsageRatio: 80_00,
-        baseVariableBorrowRate: 1_00,
-        variableRateSlope1: 4_00,
-        variableRateSlope2: 60_00
-      })
-    );
-    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
-
-    ConfiguratorInputTypes.InitReserveInput[]
-      memory input = new ConfiguratorInputTypes.InitReserveInput[](1);
-
-    input[0] = ConfiguratorInputTypes.InitReserveInput(
-      report.aToken,
-      report.stableDebtToken,
-      report.variableDebtToken,
-      isVirtualAccActive,
-      t.rateStrategy,
-      address(newToken),
-      report.treasury,
-      report.rewardsControllerProxy,
-      t.aTokenName,
-      t.aTokenSymbol,
-      t.variableDebtName,
-      t.variableDebtSymbol,
-      t.stableDebtName,
-      t.stableDebtSymbol,
-      t.emptyParams,
-      t.interestRateData
-    );
-    vm.expectEmit(true, false, false, false, address(contracts.poolConfiguratorProxy));
-    emit ReserveInitialized(
-      input[0].underlyingAsset,
-      address(0),
-      address(0),
-      address(0),
-      input[0].interestRateStrategyAddress
-    );
-
-    // Perform action
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    // Perform assertions
-    {
-      (address aTokenProxy, address stableDebtProxy, address variableDebtProxy) = contracts
-        .protocolDataProvider
-        .getReserveTokensAddresses(address(newToken));
-
-      assertEq(AToken(aTokenProxy).name(), t.aTokenName);
-      assertEq(AToken(aTokenProxy).symbol(), t.aTokenSymbol);
-      assertEq(AToken(aTokenProxy).decimals(), newToken.decimals());
-      assertEq(AToken(aTokenProxy).RESERVE_TREASURY_ADDRESS(), report.treasury);
-      assertEq(AToken(aTokenProxy).UNDERLYING_ASSET_ADDRESS(), address(newToken));
-      assertEq(
-        address(AToken(aTokenProxy).getIncentivesController()),
-        report.rewardsControllerProxy
-      );
-
-      assertEq(AToken(stableDebtProxy).name(), t.stableDebtName);
-      assertEq(AToken(stableDebtProxy).symbol(), t.stableDebtSymbol);
-      assertEq(AToken(stableDebtProxy).decimals(), newToken.decimals());
-      assertEq(AToken(stableDebtProxy).UNDERLYING_ASSET_ADDRESS(), address(newToken));
-      assertEq(
-        address(AToken(stableDebtProxy).getIncentivesController()),
-        report.rewardsControllerProxy
-      );
-
-      assertEq(AToken(variableDebtProxy).name(), t.variableDebtName);
-      assertEq(AToken(variableDebtProxy).symbol(), t.variableDebtSymbol);
-      assertEq(AToken(variableDebtProxy).decimals(), newToken.decimals());
-      assertEq(AToken(variableDebtProxy).UNDERLYING_ASSET_ADDRESS(), address(newToken));
-      assertEq(
-        address(AToken(variableDebtProxy).getIncentivesController()),
-        report.rewardsControllerProxy
-      );
-    }
-    // Perform default asset checks
-    TestReserveConfig memory c = _getReserveConfig(address(newToken), report.protocolDataProvider);
-
-    assertEq(c.isActive, true);
-    assertEq(c.isFrozen, false);
-    assertEq(c.isPaused, false);
-    assertEq(c.decimals, newToken.decimals());
-
-    assertEq(c.ltv, 0);
-    assertEq(c.liquidationThreshold, 0);
-    assertEq(c.liquidationBonus, 0);
-    assertEq(c.reserveFactor, 0);
-    assertEq(c.usageAsCollateralEnabled, false);
-    assertEq(c.borrowingEnabled, false);
-    assertEq(c.stableBorrowRateEnabled, false);
-    assertEq(c.isVirtualAccActive, isVirtualAccActive);
-
-    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets + 1);
-  }
-
-  function test_initReserves_multipleAssets() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      4,
-      report,
-      poolAdmin
-    );
-    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
-
-    for (uint256 y; y < input.length; ++y) {
-      vm.expectEmit(true, false, false, false, address(contracts.poolConfiguratorProxy));
-      emit ReserveInitialized(
-        input[y].underlyingAsset,
-        address(0),
-        address(0),
-        address(0),
-        input[y].interestRateStrategyAddress
-      );
-    }
-
-    // Perform action
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    // Perform assertions
-    for (uint256 y; y < input.length; ++y) {
-      ConfiguratorInputTypes.InitReserveInput memory reserveInput = input[y];
-
-      {
-        (address aTokenProxy, address stableDebtProxy, address variableDebtProxy) = contracts
-          .protocolDataProvider
-          .getReserveTokensAddresses(reserveInput.underlyingAsset);
-
-        assertEq(AToken(aTokenProxy).name(), reserveInput.aTokenName);
-        assertEq(AToken(aTokenProxy).symbol(), reserveInput.aTokenSymbol);
-        assertEq(
-          AToken(aTokenProxy).decimals(),
-          TestnetERC20(reserveInput.underlyingAsset).decimals()
-        );
-        assertEq(AToken(aTokenProxy).RESERVE_TREASURY_ADDRESS(), reserveInput.treasury);
-        assertEq(AToken(aTokenProxy).UNDERLYING_ASSET_ADDRESS(), reserveInput.underlyingAsset);
-        assertEq(
-          address(AToken(aTokenProxy).getIncentivesController()),
-          reserveInput.incentivesController
-        );
-
-        assertEq(AToken(stableDebtProxy).name(), reserveInput.stableDebtTokenName);
-        assertEq(AToken(stableDebtProxy).symbol(), reserveInput.stableDebtTokenSymbol);
-        assertEq(
-          AToken(stableDebtProxy).decimals(),
-          TestnetERC20(reserveInput.underlyingAsset).decimals()
-        );
-        assertEq(AToken(stableDebtProxy).UNDERLYING_ASSET_ADDRESS(), reserveInput.underlyingAsset);
-        assertEq(
-          address(AToken(stableDebtProxy).getIncentivesController()),
-          reserveInput.incentivesController
-        );
-
-        assertEq(AToken(variableDebtProxy).name(), reserveInput.variableDebtTokenName);
-        assertEq(AToken(variableDebtProxy).symbol(), reserveInput.variableDebtTokenSymbol);
-        assertEq(
-          AToken(variableDebtProxy).decimals(),
-          TestnetERC20(reserveInput.underlyingAsset).decimals()
-        );
-        assertEq(
-          AToken(variableDebtProxy).UNDERLYING_ASSET_ADDRESS(),
-          reserveInput.underlyingAsset
-        );
-        assertEq(
-          address(AToken(variableDebtProxy).getIncentivesController()),
-          reserveInput.incentivesController
-        );
-      }
-      // Perform default asset checks
-      TestReserveConfig memory c = _getReserveConfig(
-        reserveInput.underlyingAsset,
-        report.protocolDataProvider
-      );
-
-      assertEq(c.isActive, true);
-      assertEq(c.isFrozen, false);
-      assertEq(c.isPaused, false);
-      assertEq(c.decimals, TestnetERC20(reserveInput.underlyingAsset).decimals());
-
-      assertEq(c.ltv, 0);
-      assertEq(c.liquidationThreshold, 0);
-      assertEq(c.liquidationBonus, 0);
-      assertEq(c.reserveFactor, 0);
-      assertEq(c.usageAsCollateralEnabled, false);
-      assertEq(c.borrowingEnabled, false);
-      assertEq(c.stableBorrowRateEnabled, false);
-    }
-    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets + input.length);
-  }
-
-  function test_initReserves_zeroAssets() public {
-    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
-
-    ConfiguratorInputTypes.InitReserveInput[] memory input;
-
-    // Perform action, does not revert but does nothing due empty array, no-op
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets);
-  }
-
-  function test_reverts_initReserves_maxAssets() public {
-    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
-    uint256 maxListings = contracts.poolProxy.MAX_NUMBER_RESERVES() - previousListedAssets + 1;
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      maxListings,
-      report,
-      poolAdmin
-    );
-
-    vm.expectRevert(bytes(Errors.NO_MORE_RESERVES_ALLOWED));
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets);
-  }
-
-  function test_initReserves_notEnoughDecimal(uint8 decimals) public {
-    vm.assume(decimals < 6);
-    TestnetERC20 newToken = new TestnetERC20('Misc Token', 'MISC', decimals, poolAdmin);
-
-    TestVars memory t;
-    t.aTokenName = 'Misc AToken';
-    t.aTokenSymbol = 'aMISC';
-    t.variableDebtName = 'Variable Debt Misc';
-    t.variableDebtSymbol = 'varDebtMISC';
-    t.stableDebtName = 'Stable Debt Misc';
-    t.stableDebtSymbol = 'stableDebtMISC';
-    t.rateStrategy = report.defaultInterestRateStrategy;
-    t.interestRateData = abi.encode(
-      IDefaultInterestRateStrategyV2.InterestRateData({
-        optimalUsageRatio: 80_00,
-        baseVariableBorrowRate: 1_00,
-        variableRateSlope1: 4_00,
-        variableRateSlope2: 60_00
-      })
-    );
-
-    ConfiguratorInputTypes.InitReserveInput[]
-      memory input = new ConfiguratorInputTypes.InitReserveInput[](1);
-
-    input[0] = ConfiguratorInputTypes.InitReserveInput(
-      report.aToken,
-      report.stableDebtToken,
-      report.variableDebtToken,
-      true,
-      t.rateStrategy,
-      address(newToken),
-      report.treasury,
-      report.rewardsControllerProxy,
-      t.aTokenName,
-      t.aTokenSymbol,
-      t.variableDebtName,
-      t.variableDebtSymbol,
-      t.stableDebtName,
-      t.stableDebtSymbol,
-      t.emptyParams,
-      t.interestRateData
-    );
-
-    vm.expectRevert(bytes(Errors.INVALID_DECIMALS));
-
-    // Perform action
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-  }
-}
diff --git a/tests/core/RateStrategy.t.sol b/tests/core/RateStrategy.t.sol
deleted file mode 100644
index dd7cf3a8..00000000
--- a/tests/core/RateStrategy.t.sol
+++ /dev/null
@@ -1,1225 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {DefaultReserveInterestRateStrategyV2, IDefaultInterestRateStrategyV2, PercentageMath, IPoolAddressesProvider} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-
-contract RateStrategyTests is TestnetProcedures {
-  using WadRayMath for uint256;
-  using PercentageMath for uint256;
-
-  struct Params {
-    uint256 currentLiquidityRate;
-    uint256 currentStableBorrowRate;
-    uint256 currentVariableBorrowRate;
-  }
-
-  uint256 public reserveFactor;
-  address public aToken;
-  DefaultReserveInterestRateStrategyV2 public rateStrategy;
-  Params public params;
-  uint256 public borrowUsageRatio;
-
-  event RateDataUpdate(
-    address indexed reserve,
-    uint256 optimalUsageRatio,
-    uint256 baseVariableBorrowRate,
-    uint256 variableRateSlope1,
-    uint256 variableRateSlope2
-  );
-
-  // sets limits for the fuzzing parameters and sets them on the interest rate strategy
-  modifier setRateParams(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    address token
-  ) {
-    _setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      token
-    );
-    _;
-  }
-
-  function _setRateParams(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    address token
-  ) internal {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 < variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) <=
-        rateStrategy.MAX_BORROW_RATE()
-    );
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-    rateStrategy.setInterestRateParams(token, abi.encode(rateData));
-  }
-
-  function setUp() public {
-    initTestEnvironment();
-
-    (aToken, , ) = contracts.protocolDataProvider.getReserveTokensAddresses(tokenList.usdx);
-    rateStrategy = new DefaultReserveInterestRateStrategyV2(report.poolAddressesProvider);
-    (, , , , reserveFactor, , , , , ) = contracts.protocolDataProvider.getReserveConfigurationData(
-      tokenList.usdx
-    );
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  //                                      INITIALIZATION TESTS
-  //----------------------------------------------------------------------------------------------------
-  function test_initialization() public view {
-    assertEq(rateStrategy.MAX_OPTIMAL_POINT(), 99_00);
-    assertEq(rateStrategy.MIN_OPTIMAL_POINT(), 1_00);
-    assertEq(rateStrategy.MAX_BORROW_RATE(), 1000_00);
-    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), address(report.poolAddressesProvider));
-  }
-
-  function test_new_DefaultReserveInterestRateStrategy_wrong_provider() public {
-    vm.expectRevert(bytes(Errors.INVALID_ADDRESSES_PROVIDER));
-    rateStrategy = new DefaultReserveInterestRateStrategyV2(address(0));
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  //                                         Test Getters
-  //----------------------------------------------------------------------------------------------------
-  function test_getInterestRateDataRay(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    IDefaultInterestRateStrategyV2.InterestRateDataRay memory rateData = rateStrategy
-      .getInterestRateData(tokenList.usdx);
-    assertEq(uint256(optimalUsageRatio) * 1e23, rateData.optimalUsageRatio);
-    assertEq(uint256(baseVariableBorrowRate) * 1e23, rateData.baseVariableBorrowRate);
-    assertEq(uint256(variableRateSlope1) * 1e23, rateData.variableRateSlope1);
-    assertEq(uint256(variableRateSlope2) * 1e23, rateData.variableRateSlope2);
-  }
-
-  function test_getInterestRateDataBps(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = rateStrategy
-      .getInterestRateDataBps(tokenList.usdx);
-    assertEq(optimalUsageRatio, rateData.optimalUsageRatio);
-    assertEq(baseVariableBorrowRate, rateData.baseVariableBorrowRate);
-    assertEq(variableRateSlope1, rateData.variableRateSlope1);
-    assertEq(variableRateSlope2, rateData.variableRateSlope2);
-  }
-
-  function test_getMaxVariableBorrowRate(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    uint256 maxVariableBorrowRate = rateStrategy.getMaxVariableBorrowRate(tokenList.usdx);
-    assertEq(
-      uint256(baseVariableBorrowRate + variableRateSlope1 + variableRateSlope2) * 1e23,
-      maxVariableBorrowRate
-    );
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  //                         Test Set interest Rate params Using FUZZING
-  //----------------------------------------------------------------------------------------------------
-  function test_new_SetReserveInterestRateParams_override_method_when_not_configurator(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) <=
-        rateStrategy.MAX_BORROW_RATE()
-    );
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
-    rateStrategy.setInterestRateParams(tokenList.usdx, rateData);
-  }
-
-  function test_new_SetReserveInterestRateParams_when_not_configurator(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) <=
-        rateStrategy.MAX_BORROW_RATE()
-    );
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  function test_new_SetReserveInterestRateParams_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) <=
-        rateStrategy.MAX_BORROW_RATE()
-    );
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-    vm.expectEmit(true, false, false, true);
-    emit RateDataUpdate(
-      tokenList.usdx,
-      uint256(rateData.optimalUsageRatio),
-      uint256(rateData.baseVariableBorrowRate),
-      uint256(rateData.variableRateSlope1),
-      uint256(rateData.variableRateSlope2)
-    );
-    rateStrategy.setInterestRateParams(tokenList.usdx, rateData);
-
-    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
-    assertEq(
-      rateStrategy.getOptimalUsageRatio(tokenList.usdx),
-      uint256(rateData.optimalUsageRatio) * 1e23
-    );
-    assertEq(
-      rateStrategy.getVariableRateSlope1(tokenList.usdx),
-      uint256(rateData.variableRateSlope1) * 1e23
-    );
-    assertEq(
-      rateStrategy.getVariableRateSlope2(tokenList.usdx),
-      uint256(rateData.variableRateSlope2) * 1e23
-    );
-    assertEq(
-      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
-      uint256(rateData.baseVariableBorrowRate) * 1e23
-    );
-    assertEq(
-      rateStrategy.getMaxVariableBorrowRate(tokenList.usdx),
-      uint256(
-        rateData.baseVariableBorrowRate + rateData.variableRateSlope1 + rateData.variableRateSlope2
-      ) * 1e23
-    );
-  }
-
-  function test_new_SetReserveInterestRateParams(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) <=
-        rateStrategy.MAX_BORROW_RATE()
-    );
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-    vm.expectEmit(true, false, false, true);
-    emit RateDataUpdate(
-      tokenList.usdx,
-      uint256(rateData.optimalUsageRatio),
-      uint256(rateData.baseVariableBorrowRate),
-      uint256(rateData.variableRateSlope1),
-      uint256(rateData.variableRateSlope2)
-    );
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-
-    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
-    assertEq(
-      rateStrategy.getOptimalUsageRatio(tokenList.usdx),
-      uint256(rateData.optimalUsageRatio) * 1e23
-    );
-    assertEq(
-      rateStrategy.getVariableRateSlope1(tokenList.usdx),
-      uint256(rateData.variableRateSlope1) * 1e23
-    );
-    assertEq(
-      rateStrategy.getVariableRateSlope2(tokenList.usdx),
-      uint256(rateData.variableRateSlope2) * 1e23
-    );
-    assertEq(
-      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
-      uint256(rateData.baseVariableBorrowRate) * 1e23
-    );
-    assertEq(
-      rateStrategy.getMaxVariableBorrowRate(tokenList.usdx),
-      uint256(
-        rateData.baseVariableBorrowRate + rateData.variableRateSlope1 + rateData.variableRateSlope2
-      ) * 1e23
-    );
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_reserve_0(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
-    rateStrategy.setInterestRateParams(address(0), abi.encode(rateData));
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_reserve_0_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
-    rateStrategy.setInterestRateParams(address(0), rateData);
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_gt_max_op(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(optimalUsageRatio > rateStrategy.MAX_OPTIMAL_POINT());
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_gt_max_op_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(optimalUsageRatio > rateStrategy.MAX_OPTIMAL_POINT());
-
-    //<<<<<<< HEAD
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-    //=======
-    //    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-    //      unbacked: 0,
-    //      liquidityAdded: 0,
-    //      liquidityTaken: 0,
-    //      totalStableDebt: 0,
-    //      totalVariableDebt: 0,
-    //      averageStableBorrowRate: 0,
-    //      reserveFactor: reserveFactor,
-    //      reserve: tokenList.usdx,
-    //      usingVirtualBalance: true,
-    //      virtualUnderlyingBalance: 0
-    //    });
-    //>>>>>>> 44cf8077687ba552e6cbcbba7c7cdbbb4c68e34f
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
-    rateStrategy.setInterestRateParams(tokenList.usdx, rateData);
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_lt_min_op(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(optimalUsageRatio < rateStrategy.MIN_OPTIMAL_POINT());
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_lt_min_op_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(optimalUsageRatio < rateStrategy.MIN_OPTIMAL_POINT());
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
-    rateStrategy.setInterestRateParams(tokenList.usdx, rateData);
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_gt_maxRate(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) >
-        rateStrategy.MAX_BORROW_RATE()
-    );
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_MAX_RATE));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_gt_maxRate_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 <= variableRateSlope2);
-    vm.assume(
-      uint256(baseVariableBorrowRate) + uint256(variableRateSlope1) + uint256(variableRateSlope2) >
-        rateStrategy.MAX_BORROW_RATE()
-    );
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.INVALID_MAX_RATE));
-    rateStrategy.setInterestRateParams(tokenList.usdx, rateData);
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_slope1_gt_slope2(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 > variableRateSlope2);
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  function test_reverts_SetReserveInterestRateParams_when_slope1_gt_slope2_override_method(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  ) public {
-    vm.assume(
-      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
-        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
-    );
-
-    vm.assume(variableRateSlope1 > variableRateSlope2);
-
-    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
-      .InterestRateData({
-        optimalUsageRatio: optimalUsageRatio,
-        baseVariableBorrowRate: baseVariableBorrowRate,
-        variableRateSlope1: variableRateSlope1,
-        variableRateSlope2: variableRateSlope2
-      });
-
-    vm.prank(report.poolConfiguratorProxy);
-
-    vm.expectRevert(bytes(Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1));
-    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  //                         Test Calculate Rates with specific conditions
-  //----------------------------------------------------------------------------------------------------
-  function test_calculate_rates_80_percent_usage()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 800000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 200000000000000000
-    });
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx);
-
-    assertEq(
-      params.currentLiquidityRate,
-      expectedVariableRate.percentMul(8000).percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-    assertEq(params.currentStableBorrowRate, 0);
-    assertEq(params.currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  function test_calculate_rates_100_percent_usage()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 1000000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 0
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope2(tokenList.usdx);
-
-    assertEq(
-      currentLiquidityRate,
-      expectedVariableRate.percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  function test_calculate_rates_100_percent_usage_50_percent_stable_debt_50_percent_variable_debt_10_percent_avg_stable_rate()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 400000000000000000,
-      totalVariableDebt: 400000000000000000,
-      averageStableBorrowRate: 100000000000000000000000000,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 0
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope2(tokenList.usdx);
-
-    uint256 expectedLiquidityRate = ((currentVariableBorrowRate + 1e26) / 2).percentMul(
-      100_00 - input.reserveFactor
-    );
-
-    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable  rate');
-    assertEq(currentStableBorrowRate, 0);
-
-    assertEq(currentLiquidityRate, expectedLiquidityRate, 'Invalid liquidity rate');
-  }
-
-  function test_calculate_rates_80_percent_usage_and_50_percent_supply_usage_due_minted_tokens()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 600000000000000000,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 800000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 200000000000000000
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx);
-
-    assertEq(
-      currentLiquidityRate,
-      expectedVariableRate.percentMul(5000).percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  function test_calculate_rates_80_percent_usage_and_80_bps_supply_usage_due_minted_tokens()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 800000000000000000 * 124 - 200000000000000000,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 800000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 200000000000000000
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx);
-
-    assertEq(
-      currentLiquidityRate,
-      expectedVariableRate.percentMul(80).percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  function test_calculate_rates_80_bps_usage()
-    public
-    setRateParams(uint16(80_00), uint32(1_00), uint32(4_00), uint32(60_00), tokenList.usdx)
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 80000000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 9920000000000000000000
-    });
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 usageRatio = _bpsToRay(80);
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
-        usageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
-      );
-    assertEq(
-      currentLiquidityRate,
-      expectedVariableRate.percentMul(80).percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  function test_fuzz_calculate_rates_80_percent_usage_added_and_virtual_equal(
-    uint256 virtualBalanceAmount
-  ) public view {
-    vm.assume(virtualBalanceAmount <= 200000000000000000);
-    uint256 liquidityAddedAmount = 200000000000000000 - virtualBalanceAmount;
-
-    // First, calculate using only virtual balance
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      reserve: tokenList.usdx,
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 800000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 200000000000000000
-    });
-
-    (
-      uint256 currentLiquidityRateOne,
-      uint256 currentStableBorrowRateOne,
-      uint256 currentVariableBorrowRateOne
-    ) = rateStrategy.calculateInterestRates(input);
-
-    // Second, calculate using the fuzzed values, totaling the same utilization
-    input = DataTypes.CalculateInterestRatesParams({
-      reserve: tokenList.usdx,
-      unbacked: 0,
-      liquidityAdded: liquidityAddedAmount,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 800000000000000000,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-
-    (
-      uint256 currentLiquidityRateTwo,
-      uint256 currentStableBorrowRateTwo,
-      uint256 currentVariableBorrowRateTwo
-    ) = rateStrategy.calculateInterestRates(input);
-
-    assertEq(currentLiquidityRateOne, currentLiquidityRateTwo, 'Invalid liquidity rate');
-
-    assertEq(currentStableBorrowRateOne, currentStableBorrowRateTwo, 'Invalid stable rate');
-
-    assertEq(currentVariableBorrowRateOne, currentVariableBorrowRateTwo, 'Invalid variable rate');
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx);
-
-    assertEq(
-      currentLiquidityRateTwo,
-      expectedVariableRate.percentMul(8000).percentMul(100_00 - input.reserveFactor),
-      'Invalid liquidity rate'
-    );
-
-    assertEq(currentVariableBorrowRateTwo, expectedVariableRate, 'Invalid variable rate');
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  //                         Test Calculate Rates with FUZZING
-  //----------------------------------------------------------------------------------------------------
-  function test_calculate_rates_empty_reserve(
-    uint16 optimalUsageRatio,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 0,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 0
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    assertEq(currentLiquidityRate, 0);
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, rateStrategy.getBaseVariableBorrowRate(tokenList.usdx));
-  }
-
-  function test_calculate_rates_when_not_using_virtual_valance(
-    uint16 optimalUsageRatio,
-    uint256 availableLiquidity,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    uint256 virtualBalanceAmount
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: availableLiquidity,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 0,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: false,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
-    assertEq(params.currentStableBorrowRate, 0);
-    assertEq(
-      params.currentVariableBorrowRate,
-      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
-      'Invalid variable rate'
-    );
-  }
-
-  function test_calculate_rates_when_total_debt_0(
-    uint16 optimalUsageRatio,
-    uint256 availableLiquidity,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    uint256 virtualBalanceAmount
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: availableLiquidity,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 0,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
-    assertEq(params.currentStableBorrowRate, 0);
-    assertEq(
-      params.currentVariableBorrowRate,
-      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
-      'Invalid variable rate'
-    );
-  }
-
-  function test_calculate_rates_below_op_usage(
-    uint16 optimalUsageRatio,
-    uint256 totalDebt,
-    uint256 availableLiquidity,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    uint256 virtualBalanceAmount
-  ) public {
-    _setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    );
-    vm.assume(totalDebt > 0);
-    vm.assume(totalDebt < availableLiquidity && availableLiquidity < 1e28);
-    vm.assume(virtualBalanceAmount < 1e28);
-    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity + virtualBalanceAmount;
-    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
-    vm.assume(borrowUsageRatio < (uint256(optimalUsageRatio) * 1e23));
-
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: availableLiquidity,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: totalDebt,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
-        borrowUsageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
-      );
-
-    assertApproxEqAbs(
-      params.currentVariableBorrowRate,
-      expectedVariableRate,
-      100,
-      'Invalid variable rate'
-    );
-    assertEq(params.currentStableBorrowRate, 0);
-
-    assertApproxEqAbs(
-      params.currentLiquidityRate,
-      (
-        input.totalVariableDebt.wadToRay().rayMul(expectedVariableRate).rayDiv(
-          input.totalVariableDebt.wadToRay()
-        )
-      ).rayMul(input.totalVariableDebt.rayDiv(availableLiquidityPlusDebt)).percentMul(
-          100_00 - input.reserveFactor
-        ),
-      100,
-      'Invalid liquidity rate'
-    );
-  }
-
-  function test_calculate_rates_below_op_usage_when_no_debt(
-    uint16 optimalUsageRatio,
-    uint256 availableLiquidity,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    uint256 virtualBalanceAmount
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    uint256 totalDebt = 0;
-    vm.assume(totalDebt < availableLiquidity && availableLiquidity < 1e28);
-    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity;
-    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
-    vm.assume(borrowUsageRatio < (uint256(optimalUsageRatio) * 1e23));
-
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: availableLiquidity,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: totalDebt,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
-        borrowUsageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
-      );
-
-    assertApproxEqAbs(
-      params.currentVariableBorrowRate,
-      expectedVariableRate,
-      100,
-      'Invalid variable rate'
-    );
-    assertEq(params.currentStableBorrowRate, 0);
-
-    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
-  }
-
-  function test_calculate_rates_above_op_usage(
-    uint16 optimalUsageRatio,
-    uint256 totalDebt,
-    uint256 availableLiquidity,
-    uint32 baseVariableBorrowRate,
-    uint32 variableRateSlope1,
-    uint32 variableRateSlope2,
-    uint256 virtualBalanceAmount
-  )
-    public
-    setRateParams(
-      optimalUsageRatio,
-      baseVariableBorrowRate,
-      variableRateSlope1,
-      variableRateSlope2,
-      tokenList.usdx
-    )
-  {
-    availableLiquidity = bound(availableLiquidity, 1, 1e28);
-    totalDebt = bound(totalDebt, 1, availableLiquidity);
-    vm.assume(virtualBalanceAmount < 1e28);
-    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity + virtualBalanceAmount;
-
-    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
-    vm.assume(borrowUsageRatio > (uint256(optimalUsageRatio) * 1e23));
-
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: availableLiquidity,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: totalDebt,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: virtualBalanceAmount
-    });
-
-    (
-      params.currentLiquidityRate,
-      params.currentStableBorrowRate,
-      params.currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    uint256 excessBorrowUsageRatio = (borrowUsageRatio -
-      rateStrategy.getOptimalUsageRatio(tokenList.usdx)).rayDiv(
-        WadRayMath.RAY - rateStrategy.getOptimalUsageRatio(tokenList.usdx)
-      );
-
-    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope1(tokenList.usdx) +
-      rateStrategy.getVariableRateSlope2(tokenList.usdx).rayMul(excessBorrowUsageRatio);
-
-    assertEq(params.currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
-
-    assertEq(params.currentStableBorrowRate, 0);
-    assertEq(
-      params.currentLiquidityRate,
-      (
-        input.totalVariableDebt.wadToRay().rayMul(expectedVariableRate).rayDiv(
-          input.totalVariableDebt.wadToRay()
-        )
-      ).rayMul(input.totalVariableDebt.rayDiv(availableLiquidityPlusDebt)).percentMul(
-          100_00 - input.reserveFactor
-        ),
-      'Invalid liquidity rate'
-    );
-  }
-}
diff --git a/tests/core/RatesOverflow.t.sol b/tests/core/RatesOverflow.t.sol
deleted file mode 100644
index bb99d58f..00000000
--- a/tests/core/RatesOverflow.t.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {MockReserveInterestRateStrategy} from 'aave-v3-core/contracts/mocks/tests/MockReserveInterestRateStrategy.sol';
-import {IPoolConfigurator} from 'aave-v3-core/contracts/interfaces/IPoolConfigurator.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-
-// @dev Ignored from coverage report, due Foundry Coverage can not detect functions if they return 0.
-contract RatesOverflowCheckTests is TestnetProcedures {
-  MockReserveInterestRateStrategy internal mockRateStrategy;
-
-  function setUp() public {
-    initTestEnvironment();
-
-    mockRateStrategy = new MockReserveInterestRateStrategy(report.poolAddressesProvider);
-
-    vm.prank(carol);
-    contracts.poolProxy.supply(tokenList.usdx, 100_000e6, carol, 0);
-
-    vm.startPrank(poolAdmin);
-    IPoolConfigurator(report.poolConfiguratorProxy).setReserveInterestRateStrategyAddress(
-      tokenList.usdx,
-      address(mockRateStrategy),
-      _getDefaultInterestRatesStrategyData()
-    );
-
-    IPoolConfigurator(report.poolConfiguratorProxy).setReserveStableRateBorrowing(
-      tokenList.usdx,
-      true
-    );
-    vm.stopPrank();
-  }
-
-  function test_overflow_liquidity_rates() public {
-    mockRateStrategy.setLiquidityRate(UINT256_MAX);
-
-    vm.expectRevert(bytes("SafeCast: value doesn't fit in 128 bits"));
-    vm.prank(alice);
-    contracts.poolProxy.supply(tokenList.usdx, 1000e6, alice, 0);
-  }
-
-  function test_overflow_variable_rates() public {
-    vm.prank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 1e8, alice, 0);
-
-    mockRateStrategy.setVariableBorrowRate(UINT256_MAX);
-
-    vm.expectRevert(bytes("SafeCast: value doesn't fit in 128 bits"));
-
-    vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.usdx, 10e6, 2, 0, alice);
-  }
-}
diff --git a/tests/core/StableDebtToken.t.sol b/tests/core/StableDebtToken.t.sol
deleted file mode 100644
index 2394d4b6..00000000
--- a/tests/core/StableDebtToken.t.sol
+++ /dev/null
@@ -1,419 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {StableDebtTokenHarness as StableDebtTokenInstance} from '../harness/StableDebtToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {IAaveIncentivesController} from 'aave-v3-core/contracts/interfaces/IAaveIncentivesController.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {PoolConfigurator, ConfiguratorInputTypes, IPool} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-
-contract StableDebtTokenEventsTests is TestnetProcedures {
-  StableDebtTokenInstance public stableDebtToken;
-
-  event Initialized(
-    address indexed underlyingAsset,
-    address indexed pool,
-    address incentivesController,
-    uint8 debtTokenDecimals,
-    string debtTokenName,
-    string debtTokenSymbol,
-    bytes params
-  );
-
-  event BorrowAllowanceDelegated(
-    address indexed fromUser,
-    address indexed toUser,
-    address indexed asset,
-    uint256 amount
-  );
-
-  function setUp() public {
-    initTestEnvironment();
-
-    (, address stableDebtUsdx, ) = contracts.protocolDataProvider.getReserveTokensAddresses(
-      tokenList.usdx
-    );
-
-    stableDebtToken = StableDebtTokenInstance(stableDebtUsdx);
-
-    vm.prank(bob);
-    contracts.poolProxy.supply(tokenList.usdx, 10000e6, bob, 0);
-    vm.prank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 100e8, alice, 0);
-    vm.prank(bob);
-    contracts.poolProxy.supply(tokenList.wbtc, 100e8, alice, 0);
-    // Allow USDX for stable borrow
-    vm.prank(poolAdmin);
-    PoolConfigurator(report.poolConfiguratorProxy).setReserveStableRateBorrowing(
-      tokenList.usdx,
-      true
-    );
-  }
-
-  function test_new_StableDebtToken_implementation() public returns (StableDebtTokenInstance) {
-    StableDebtTokenInstance stDebtToken = new StableDebtTokenInstance(IPool(report.poolProxy));
-
-    assertEq(stDebtToken.name(), 'STABLE_DEBT_TOKEN_IMPL');
-    assertEq(stDebtToken.symbol(), 'STABLE_DEBT_TOKEN_IMPL');
-    assertEq(stDebtToken.decimals(), 0);
-    assertEq(address(stDebtToken.POOL()), address(report.poolProxy));
-    assertEq(address(stDebtToken.getIncentivesController()), address(0));
-    assertEq(stDebtToken.UNDERLYING_ASSET_ADDRESS(), address(0));
-    assertEq(stDebtToken.DEBT_TOKEN_REVISION(), 0x1);
-    assertEq(stDebtToken.getAverageStableRate(), 0);
-
-    return stDebtToken;
-  }
-
-  function test_reverts_initialize_twice() public {
-    StableDebtTokenInstance staDebtToken = test_initialize_StableDebtToken();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
-
-    uint8 decimals = TestnetERC20(listing.underlyingAsset).decimals();
-
-    vm.expectRevert(bytes('Contract instance has already been initialized'));
-
-    staDebtToken.initialize(
-      IPool(report.poolProxy),
-      listing.underlyingAsset,
-      IAaveIncentivesController(listing.incentivesController),
-      decimals,
-      listing.stableDebtTokenSymbol,
-      listing.stableDebtTokenSymbol,
-      listing.params
-    );
-  }
-
-  function test_initialize_StableDebtToken() public returns (StableDebtTokenInstance) {
-    StableDebtTokenInstance stDebtToken = test_new_StableDebtToken_implementation();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
-
-    vm.expectEmit(address(stDebtToken));
-    emit Initialized(
-      listing.underlyingAsset,
-      report.poolProxy,
-      report.rewardsControllerProxy,
-      TestnetERC20(listing.underlyingAsset).decimals(),
-      listing.stableDebtTokenName,
-      listing.stableDebtTokenSymbol,
-      listing.params
-    );
-
-    stDebtToken.initialize(
-      IPool(report.poolProxy),
-      listing.underlyingAsset,
-      IAaveIncentivesController(listing.incentivesController),
-      TestnetERC20(listing.underlyingAsset).decimals(),
-      listing.stableDebtTokenName,
-      listing.stableDebtTokenSymbol,
-      listing.params
-    );
-
-    assertEq(stDebtToken.name(), listing.stableDebtTokenName);
-    assertEq(stDebtToken.symbol(), listing.stableDebtTokenSymbol);
-    assertEq(stDebtToken.decimals(), TestnetERC20(listing.underlyingAsset).decimals());
-    assertEq(address(stDebtToken.POOL()), address(report.poolProxy));
-    assertEq(address(stDebtToken.getIncentivesController()), listing.incentivesController);
-    assertEq(stDebtToken.UNDERLYING_ASSET_ADDRESS(), listing.underlyingAsset);
-    assertEq(stDebtToken.DEBT_TOKEN_REVISION(), 0x1);
-
-    return stDebtToken;
-  }
-
-  function test_reverts_initialize_pool_do_not_match() public {
-    StableDebtTokenInstance stDebtToken = test_new_StableDebtToken_implementation();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
-
-    uint8 decimals = TestnetERC20(listing.underlyingAsset).decimals();
-
-    vm.expectRevert(bytes(Errors.POOL_ADDRESSES_DO_NOT_MATCH));
-
-    stDebtToken.initialize(
-      IPool(makeAddr('ANY_OTHER_POOL')),
-      listing.underlyingAsset,
-      IAaveIncentivesController(listing.incentivesController),
-      decimals,
-      listing.stableDebtTokenName,
-      listing.stableDebtTokenSymbol,
-      listing.params
-    );
-  }
-
-  function test_mint_stableDebt_caller_alice() public {
-    StableDebtTokenInstance debtToken = test_initialize_StableDebtToken();
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-
-    vm.prank(report.poolProxy);
-    debtToken.mint(alice, alice, 0, 0);
-  }
-
-  function test_mint_stableDebt_caller_bob_onBehalf_alice() public {
-    StableDebtTokenInstance debtToken = test_initialize_StableDebtToken();
-    TestnetERC20 asset = TestnetERC20(debtToken.UNDERLYING_ASSET_ADDRESS());
-    uint8 decimals = asset.decimals();
-    uint256 amount = 1200 * 10 ** decimals;
-
-    vm.expectEmit(address(debtToken));
-    emit BorrowAllowanceDelegated(alice, bob, address(asset), amount);
-
-    vm.prank(alice);
-    debtToken.approveDelegation(bob, amount);
-
-    vm.prank(report.poolProxy);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    debtToken.mint(bob, alice, amount, 1e27);
-  }
-
-  function test_reverts_operation_not_supported() public {
-    StableDebtTokenInstance stDebtToken = test_new_StableDebtToken_implementation();
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.transfer(address(0), 0);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.allowance(address(0), address(0));
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.approve(address(0), 0);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.transferFrom(address(0), address(0), 0);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.increaseAllowance(address(0), 0);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.decreaseAllowance(address(0), 0);
-
-    vm.prank(report.poolProxy);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.mint(address(0), address(0), 0, 0);
-
-    vm.prank(report.poolProxy);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    stDebtToken.burn(address(0), 0);
-  }
-
-  function test_default_revision() public {
-    StableDebtTokenInstance stDebtToken = new StableDebtTokenInstance(IPool(report.poolProxy));
-    assertEq(stDebtToken._getRevision(), stDebtToken.DEBT_TOKEN_REVISION());
-  }
-
-  function test_getAverageStableRate() public view {
-    uint256 avgStableRate = stableDebtToken.getAverageStableRate();
-    assertEq(avgStableRate, 0);
-  }
-
-  function test_getUserLastUpdated() public view {
-    uint256 lastUpdated = stableDebtToken.getUserLastUpdated(alice);
-    assertEq(lastUpdated, 0);
-  }
-
-  function test_getUserStableRate() public view {
-    uint256 userStableRate = stableDebtToken.getUserStableRate(alice);
-    assertEq(userStableRate, 0);
-  }
-
-  function test_balanceOf() public view {
-    uint256 balance = stableDebtToken.balanceOf(alice);
-    assertEq(balance, 0);
-  }
-
-  function test_totalSupply() public view {
-    uint256 scaledTotalSupply = stableDebtToken.totalSupply();
-    assertEq(scaledTotalSupply, 0);
-  }
-
-  function test_getTotalSupplyLastUpdated() public view {
-    uint256 totalSupplyLastUpdated = stableDebtToken.getTotalSupplyLastUpdated();
-    assertEq(totalSupplyLastUpdated, 0);
-  }
-
-  function test_principalBalanceOf() public view {
-    uint256 principalBalanceOf = stableDebtToken.principalBalanceOf(alice);
-    assertEq(principalBalanceOf, 0);
-  }
-
-  function test_getTotalSupplyAndAvgRate() public view {
-    (uint256 totalSupply, uint256 avgRate) = stableDebtToken.getTotalSupplyAndAvgRate();
-    assertEq(totalSupply, 0);
-    assertEq(avgRate, 0);
-  }
-
-  function test_getSupplyData() public view {
-    (
-      uint256 principal,
-      uint256 totalSupply,
-      uint256 avgStableRate,
-      uint40 lastUpdatedTimestamp
-    ) = stableDebtToken.getSupplyData();
-
-    assertEq(principal, 0);
-    assertEq(totalSupply, 0);
-    assertEq(avgStableRate, 0);
-    assertEq(lastUpdatedTimestamp, 0);
-  }
-
-  function test_delegationWithSig() public {
-    uint256 amount = 120e6;
-    uint256 deadline = block.timestamp + 30 days;
-
-    EIP712SigUtils.CreditDelegation memory delegation = EIP712SigUtils.CreditDelegation({
-      delegatee: bob,
-      value: amount,
-      nonce: 0,
-      deadline: deadline
-    });
-
-    bytes32 digest = EIP712SigUtils.getCreditDelegationTypedDataHash(
-      delegation,
-      bytes(stableDebtToken.name()),
-      bytes('1'),
-      address(stableDebtToken)
-    );
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(alicePrivateKey, digest);
-
-    vm.expectEmit(address(stableDebtToken));
-    emit BorrowAllowanceDelegated(alice, bob, address(tokenList.usdx), amount);
-
-    vm.prank(alice);
-    stableDebtToken.delegationWithSig(alice, bob, amount, deadline, v, r, s);
-
-    assertEq(stableDebtToken.borrowAllowance(alice, bob), amount);
-  }
-
-  function test_cancel_delegationWithSig() public {
-    // Submit permit by Alice to Bob
-    test_delegationWithSig();
-
-    uint256 deadline = block.timestamp + 30 days;
-
-    EIP712SigUtils.CreditDelegation memory delegation = EIP712SigUtils.CreditDelegation({
-      delegatee: bob,
-      value: 0,
-      nonce: 1,
-      deadline: deadline
-    });
-
-    bytes32 digest = EIP712SigUtils.getCreditDelegationTypedDataHash(
-      delegation,
-      bytes(stableDebtToken.name()),
-      bytes('1'),
-      address(stableDebtToken)
-    );
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(alicePrivateKey, digest);
-
-    assertGt(
-      stableDebtToken.borrowAllowance(alice, bob),
-      0,
-      'Alice borrow allowance to bob should be > 0 before cancelling the credit delegation'
-    );
-
-    vm.prank(alice);
-    stableDebtToken.delegationWithSig(alice, bob, delegation.value, deadline, v, r, s);
-
-    assertEq(
-      stableDebtToken.borrowAllowance(alice, bob),
-      0,
-      'Alice allowance to bob should be zero'
-    );
-    assertEq(stableDebtToken.nonces(alice), 2, 'Alice nonce does not match expected nonce');
-  }
-
-  function test_reverts_bad_nonce_delegationWithSig() public {
-    // Submit permit by Alice to Bob
-    test_delegationWithSig();
-
-    uint256 deadline = block.timestamp + 30 days;
-
-    EIP712SigUtils.CreditDelegation memory delegation = EIP712SigUtils.CreditDelegation({
-      delegatee: bob,
-      value: 0,
-      nonce: 0, // Wrong nonce, should be 1
-      deadline: deadline
-    });
-
-    bytes32 digest = EIP712SigUtils.getCreditDelegationTypedDataHash(
-      delegation,
-      bytes(stableDebtToken.name()),
-      bytes('1'),
-      address(stableDebtToken)
-    );
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(alicePrivateKey, digest);
-
-    vm.expectRevert(bytes(Errors.INVALID_SIGNATURE));
-
-    vm.prank(alice);
-    stableDebtToken.delegationWithSig(alice, bob, delegation.value, deadline, v, r, s);
-  }
-
-  function test_reverts_bad_expiration_delegationWithSig() public {
-    uint256 amount = 120e6;
-    uint256 deadline = block.timestamp + 30 days;
-
-    EIP712SigUtils.CreditDelegation memory delegation = EIP712SigUtils.CreditDelegation({
-      delegatee: bob,
-      value: amount,
-      nonce: 0,
-      deadline: deadline
-    });
-
-    bytes32 digest = EIP712SigUtils.getCreditDelegationTypedDataHash(
-      delegation,
-      bytes(stableDebtToken.name()),
-      bytes('1'),
-      address(stableDebtToken)
-    );
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(alicePrivateKey, digest);
-
-    vm.warp(delegation.deadline + 1);
-    vm.expectRevert(bytes(Errors.INVALID_EXPIRATION));
-
-    vm.prank(alice);
-    stableDebtToken.delegationWithSig(alice, bob, amount, deadline, v, r, s);
-  }
-
-  function test_reverts_zero_address_delegationWithSig() public {
-    uint256 amount = 120e6;
-    uint256 deadline = block.timestamp + 30 days;
-
-    EIP712SigUtils.CreditDelegation memory delegation = EIP712SigUtils.CreditDelegation({
-      delegatee: bob,
-      value: amount,
-      nonce: 0,
-      deadline: deadline
-    });
-
-    bytes32 digest = EIP712SigUtils.getCreditDelegationTypedDataHash(
-      delegation,
-      bytes(stableDebtToken.name()),
-      bytes('1'),
-      address(stableDebtToken)
-    );
-
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(alicePrivateKey, digest);
-
-    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
-
-    vm.prank(alice);
-    stableDebtToken.delegationWithSig(address(0), bob, amount, deadline, v, r, s);
-  }
-}
diff --git a/tests/core/ZeroInteresRateStrategy.t.sol b/tests/core/ZeroInteresRateStrategy.t.sol
deleted file mode 100644
index 0ce57a59..00000000
--- a/tests/core/ZeroInteresRateStrategy.t.sol
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import 'forge-std/Test.sol';
-
-import {IAToken} from 'aave-v3-core/contracts/protocol/tokenization/AToken.sol';
-import {DefaultReserveInterestRateStrategyV2, DataTypes, IPoolAddressesProvider} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
-import {IDefaultInterestRateStrategyV2} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-
-// @dev Ignored from coverage report, due Foundry Coverage can not detect functions if they return 0.
-contract ZeroReserveInterestRateStrategyTests is TestnetProcedures {
-  IAToken public aToken;
-
-  function setUp() public {
-    initTestEnvironment();
-
-    (address aUSDX, , ) = contracts.protocolDataProvider.getReserveTokensAddresses(tokenList.usdx);
-    aToken = IAToken(aUSDX);
-  }
-
-  function test_new_ZeroReserveInterestRateStrategy()
-    public
-    returns (IDefaultInterestRateStrategyV2)
-  {
-    IDefaultInterestRateStrategyV2 rateStrategy = new DefaultReserveInterestRateStrategyV2(
-      report.poolAddressesProvider
-    );
-
-    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
-    assertEq(rateStrategy.getOptimalUsageRatio(tokenList.usdx), 0);
-    assertEq(rateStrategy.getVariableRateSlope1(tokenList.usdx), 0);
-    assertEq(rateStrategy.getVariableRateSlope2(tokenList.usdx), 0);
-    assertEq(rateStrategy.getBaseVariableBorrowRate(tokenList.usdx), 0);
-    assertEq(rateStrategy.getMaxVariableBorrowRate(tokenList.usdx), 0);
-    return rateStrategy;
-  }
-
-  function test_calculate_rates() public {
-    (, , , , uint256 reserveFactor, , , , , ) = contracts
-      .protocolDataProvider
-      .getReserveConfigurationData(tokenList.usdx);
-    IDefaultInterestRateStrategyV2 rateStrategy = test_new_ZeroReserveInterestRateStrategy();
-
-    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
-      unbacked: 0,
-      liquidityAdded: 0,
-      liquidityTaken: 0,
-      totalStableDebt: 0,
-      totalVariableDebt: 0,
-      averageStableBorrowRate: 0,
-      reserveFactor: reserveFactor,
-      reserve: tokenList.usdx,
-      usingVirtualBalance: true,
-      virtualUnderlyingBalance: 0
-    });
-
-    (
-      uint256 currentLiquidityRate,
-      uint256 currentStableBorrowRate,
-      uint256 currentVariableBorrowRate
-    ) = rateStrategy.calculateInterestRates(input);
-
-    assertEq(currentLiquidityRate, 0);
-    assertEq(currentStableBorrowRate, 0);
-    assertEq(currentVariableBorrowRate, 0);
-  }
-}
diff --git a/tests/AaveV3BatchDeployment.t.sol b/tests/deployments/AaveV3BatchDeployment.t.sol
similarity index 73%
rename from tests/AaveV3BatchDeployment.t.sol
rename to tests/deployments/AaveV3BatchDeployment.t.sol
index 67f1c849..cd78c6f4 100644
--- a/tests/AaveV3BatchDeployment.t.sol
+++ b/tests/deployments/AaveV3BatchDeployment.t.sol
@@ -2,25 +2,24 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import '../src/deployments/interfaces/IMarketReportTypes.sol';
-
-import {AugustusRegistryMock} from './mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
-import {BatchTestProcedures} from './utils/BatchTestProcedures.sol';
-import {AaveV3TestListing} from './mocks/AaveV3TestListing.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IAaveV3ConfigEngine} from 'aave-v3-periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {AaveV3ConfigEngine} from 'aave-v3-periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol';
-import {SequencerOracle} from 'aave-v3-core/contracts/mocks/oracle/SequencerOracle.sol';
-import {IPoolDataProvider} from 'aave-v3-core/contracts/interfaces/IPoolDataProvider.sol';
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {IncentivizedERC20} from 'aave-v3-core/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
-import {RewardsController} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
-import {RewardsController} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
-import {EmissionManager} from 'aave-v3-periphery/contracts/rewards/EmissionManager.sol';
+import '../../src/deployments/interfaces/IMarketReportTypes.sol';
+
+import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
+import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
+import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
+import {AaveV3TestListing} from '../mocks/AaveV3TestListing.sol';
+import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IAaveV3ConfigEngine} from '../../src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
+import {IPool} from '../../src/contracts/interfaces/IPool.sol';
+import {AaveV3ConfigEngine} from '../../src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol';
+import {SequencerOracle} from '../../src/contracts/mocks/oracle/SequencerOracle.sol';
+import {IPoolDataProvider} from '../../src/contracts/interfaces/IPoolDataProvider.sol';
+import {IAToken} from '../../src/contracts/interfaces/IAToken.sol';
+import {IncentivizedERC20} from '../../src/contracts/protocol/tokenization/base/IncentivizedERC20.sol';
+import {RewardsController} from '../../src/contracts/rewards/RewardsController.sol';
+import {EmissionManager} from '../../src/contracts/rewards/EmissionManager.sol';
 
 contract AaveV3BatchDeployment is BatchTestProcedures {
   address public marketOwner;
diff --git a/tests/AaveV3BatchTests.t.sol b/tests/deployments/AaveV3BatchTests.t.sol
similarity index 73%
rename from tests/AaveV3BatchTests.t.sol
rename to tests/deployments/AaveV3BatchTests.t.sol
index 2597a38f..e34ce6b2 100644
--- a/tests/AaveV3BatchTests.t.sol
+++ b/tests/deployments/AaveV3BatchTests.t.sol
@@ -2,23 +2,23 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import '../src/deployments/interfaces/IMarketReportTypes.sol';
-import {AaveV3TokensBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3TokensBatch.sol';
-import {AaveV3PoolBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3PoolBatch.sol';
-import {AaveV3L2PoolBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3L2PoolBatch.sol';
-import {AaveV3GettersBatchOne} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchOne.sol';
-import {AaveV3GettersBatchTwo} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchTwo.sol';
-import {AaveV3PeripheryBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol';
-import {AaveV3ParaswapBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3ParaswapBatch.sol';
-import {AaveV3SetupBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol';
-import {AaveV3MiscBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3MiscBatch.sol';
-import {AaveV3HelpersBatchOne} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
-import {AaveV3HelpersBatchTwo} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchTwo.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {AugustusRegistryMock} from './mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
-import {BatchTestProcedures} from './utils/BatchTestProcedures.sol';
-import {AaveV3BatchOrchestration} from '../src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol';
+import '../../src/deployments/interfaces/IMarketReportTypes.sol';
+import {AaveV3TokensBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3TokensBatch.sol';
+import {AaveV3PoolBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3PoolBatch.sol';
+import {AaveV3L2PoolBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3L2PoolBatch.sol';
+import {AaveV3GettersBatchOne} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchOne.sol';
+import {AaveV3GettersBatchTwo} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchTwo.sol';
+import {AaveV3PeripheryBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol';
+import {AaveV3ParaswapBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3ParaswapBatch.sol';
+import {AaveV3SetupBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol';
+import {AaveV3MiscBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3MiscBatch.sol';
+import {AaveV3HelpersBatchOne} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
+import {AaveV3HelpersBatchTwo} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchTwo.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
+import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
+import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
+import {AaveV3BatchOrchestration} from '../../src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol';
 
 contract AaveV3BatchTests is BatchTestProcedures {
   address deployer;
@@ -199,8 +199,7 @@ contract AaveV3BatchTests is BatchTestProcedures {
       setupReportTwo.rewardsControllerProxy,
       peripheryReportOne.treasury,
       tokensReport.aToken,
-      tokensReport.variableDebtToken,
-      tokensReport.stableDebtToken
+      tokensReport.variableDebtToken
     );
   }
 
diff --git a/tests/AaveV3PermissionsTest.t.sol b/tests/deployments/AaveV3PermissionsTest.t.sol
similarity index 92%
rename from tests/AaveV3PermissionsTest.t.sol
rename to tests/deployments/AaveV3PermissionsTest.t.sol
index d5408b68..4c0c92bb 100644
--- a/tests/AaveV3PermissionsTest.t.sol
+++ b/tests/deployments/AaveV3PermissionsTest.t.sol
@@ -2,17 +2,17 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import {Ownable} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import '../src/deployments/interfaces/IMarketReportTypes.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {RewardsController} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
-import {EmissionManager} from 'aave-v3-periphery/contracts/rewards/EmissionManager.sol';
-import {AugustusRegistryMock} from './mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from '../src/periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {BatchTestProcedures} from './utils/BatchTestProcedures.sol';
-import {IRevenueSplitter} from 'aave-v3-periphery/contracts/treasury/IRevenueSplitter.sol';
+import {Ownable} from '../../src/contracts/dependencies/openzeppelin/contracts/Ownable.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import '../../src/deployments/interfaces/IMarketReportTypes.sol';
+import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
+import {RewardsController} from '../../src/contracts/rewards/RewardsController.sol';
+import {EmissionManager} from '../../src/contracts/rewards/EmissionManager.sol';
+import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
+import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
+import {IRevenueSplitter} from '../../src/contracts/treasury/IRevenueSplitter.sol';
 
 contract AaveV3PermissionsTest is BatchTestProcedures {
   /**
diff --git a/tests/DeploymentsGasLimits.t.sol b/tests/deployments/DeploymentsGasLimits.t.sol
similarity index 81%
rename from tests/DeploymentsGasLimits.t.sol
rename to tests/deployments/DeploymentsGasLimits.t.sol
index 54d32c73..bbcc6ed8 100644
--- a/tests/DeploymentsGasLimits.t.sol
+++ b/tests/deployments/DeploymentsGasLimits.t.sol
@@ -2,23 +2,23 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import '../src/deployments/interfaces/IMarketReportTypes.sol';
-import {AaveV3TokensBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3TokensBatch.sol';
-import {AaveV3PoolBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3PoolBatch.sol';
-import {AaveV3L2PoolBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3L2PoolBatch.sol';
-import {AaveV3GettersBatchOne} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchOne.sol';
-import {AaveV3GettersBatchTwo} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchTwo.sol';
-import {AaveV3PeripheryBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol';
-import {AaveV3ParaswapBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3ParaswapBatch.sol';
-import {AaveV3SetupBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol';
-import {AaveV3MiscBatch} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3MiscBatch.sol';
-import {AaveV3HelpersBatchOne} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
-import {AaveV3HelpersBatchTwo} from '../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchTwo.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {AugustusRegistryMock} from './mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
-import {SequencerOracle} from '../src/core/contracts/mocks/oracle/SequencerOracle.sol';
-import {BatchTestProcedures} from './utils/BatchTestProcedures.sol';
+import '../../src/deployments/interfaces/IMarketReportTypes.sol';
+import {AaveV3TokensBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3TokensBatch.sol';
+import {AaveV3PoolBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3PoolBatch.sol';
+import {AaveV3L2PoolBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3L2PoolBatch.sol';
+import {AaveV3GettersBatchOne} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchOne.sol';
+import {AaveV3GettersBatchTwo} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3GettersBatchTwo.sol';
+import {AaveV3PeripheryBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3PeripheryBatch.sol';
+import {AaveV3ParaswapBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3ParaswapBatch.sol';
+import {AaveV3SetupBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3SetupBatch.sol';
+import {AaveV3MiscBatch} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3MiscBatch.sol';
+import {AaveV3HelpersBatchOne} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
+import {AaveV3HelpersBatchTwo} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchTwo.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
+import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
+import {SequencerOracle} from '../../src/contracts/mocks/oracle/SequencerOracle.sol';
+import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
 
 contract DeploymentsGasLimits is BatchTestProcedures {
   Roles roles;
@@ -184,8 +184,7 @@ contract DeploymentsGasLimits is BatchTestProcedures {
       setupReportTwo.rewardsControllerProxy,
       peripheryReportOne.treasury,
       tokensReport.aToken,
-      tokensReport.variableDebtToken,
-      tokensReport.stableDebtToken
+      tokensReport.variableDebtToken
     );
   }
 
diff --git a/tests/periphery/RevenueSplitter.t.sol b/tests/extensions/RevenueSplitter.t.sol
similarity index 96%
rename from tests/periphery/RevenueSplitter.t.sol
rename to tests/extensions/RevenueSplitter.t.sol
index dee06a36..20e9f560 100644
--- a/tests/periphery/RevenueSplitter.t.sol
+++ b/tests/extensions/RevenueSplitter.t.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.19;
 
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {RevenueSplitter} from 'aave-v3-periphery/contracts/treasury/RevenueSplitter.sol';
-import {IRevenueSplitterErrors} from 'aave-v3-periphery/contracts/treasury/IRevenueSplitter.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {PercentageMath} from '../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {RevenueSplitter} from '../../src/contracts/treasury/RevenueSplitter.sol';
+import {IRevenueSplitterErrors} from '../../src/contracts/treasury/IRevenueSplitter.sol';
+import {IERC20} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 import 'forge-std/Test.sol';
 import 'forge-std/console2.sol';
 import 'forge-std/StdUtils.sol';
diff --git a/tests/periphery/ParaswapAdapters.t.sol b/tests/extensions/paraswap-adapters/ParaswapAdapters.t.sol
similarity index 95%
rename from tests/periphery/ParaswapAdapters.t.sol
rename to tests/extensions/paraswap-adapters/ParaswapAdapters.t.sol
index 56017b0e..42674e83 100644
--- a/tests/periphery/ParaswapAdapters.t.sol
+++ b/tests/extensions/paraswap-adapters/ParaswapAdapters.t.sol
@@ -1,22 +1,20 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import 'forge-std/Test.sol';
-
-import {ParaSwapLiquiditySwapAdapter, IParaSwapAugustus} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapLiquiditySwapAdapter.sol';
-import {ParaSwapRepayAdapter, IParaSwapAugustusRegistry} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapRepayAdapter.sol';
-import {ParaSwapWithdrawSwapAdapter} from 'aave-v3-periphery/contracts/adapters/paraswap/ParaSwapWithdrawSwapAdapter.sol';
-import {AaveParaSwapFeeClaimer, IERC20} from 'aave-v3-periphery/contracts/adapters/paraswap/AaveParaSwapFeeClaimer.sol';
-import {BaseParaSwapAdapter} from 'aave-v3-periphery/contracts/adapters/paraswap/BaseParaSwapAdapter.sol';
-import {IPool, DataTypes} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {MockParaSwapAugustus} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapAugustus.sol';
-import {MockParaSwapFeeClaimer} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
-import {MockParaSwapAugustusRegistry} from 'aave-v3-periphery/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {ParaSwapLiquiditySwapAdapter, IParaSwapAugustus} from '../../../src/contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol';
+import {ParaSwapRepayAdapter, IParaSwapAugustusRegistry} from '../../../src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol';
+import {ParaSwapWithdrawSwapAdapter} from '../../../src/contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol';
+import {AaveParaSwapFeeClaimer, IERC20} from '../../../src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol';
+import {BaseParaSwapAdapter} from '../../../src/contracts/extensions/paraswap-adapters/BaseParaSwapAdapter.sol';
+import {IPool, DataTypes} from '../../../src/contracts/interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {MockParaSwapAugustus} from '../../../src/contracts/mocks/swap/MockParaSwapAugustus.sol';
+import {MockParaSwapFeeClaimer} from '../../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
+import {MockParaSwapAugustusRegistry} from '../../../src/contracts/mocks/swap/MockParaSwapAugustusRegistry.sol';
+import {IERC20Detailed} from '../../../src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract ParaswapAdaptersTest is TestnetProcedures {
   MockParaSwapAugustus internal mockParaSwapAugustus;
diff --git a/tests/periphery/static-a-token/ERC20AaveLMUpgradable.t.sol b/tests/extensions/static-a-token/ERC20AaveLMUpgradable.t.sol
similarity index 95%
rename from tests/periphery/static-a-token/ERC20AaveLMUpgradable.t.sol
rename to tests/extensions/static-a-token/ERC20AaveLMUpgradable.t.sol
index f831be23..bcc552f8 100644
--- a/tests/periphery/static-a-token/ERC20AaveLMUpgradable.t.sol
+++ b/tests/extensions/static-a-token/ERC20AaveLMUpgradable.t.sol
@@ -4,12 +4,12 @@ pragma solidity ^0.8.10;
 import {IERC20Errors} from 'openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol';
 import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {TestnetProcedures, TestnetERC20} from '../../utils/TestnetProcedures.sol';
-import {ERC20AaveLMUpgradeable, IERC20AaveLM} from '../../../src/periphery/contracts/static-a-token/ERC20AaveLMUpgradeable.sol';
-import {IRewardsController} from '../../../src/periphery/contracts/rewards/interfaces/IRewardsController.sol';
-import {PullRewardsTransferStrategy, ITransferStrategyBase} from '../../../src/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
-import {RewardsDataTypes} from '../../../src/periphery/contracts/rewards/libraries/RewardsDataTypes.sol';
-import {IEACAggregatorProxy} from '../../../src/periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol';
-import {DataTypes} from '../../../src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {ERC20AaveLMUpgradeable, IERC20AaveLM} from '../../../src/contracts/extensions/static-a-token/ERC20AaveLMUpgradeable.sol';
+import {IRewardsController} from '../../../src/contracts/rewards/interfaces/IRewardsController.sol';
+import {PullRewardsTransferStrategy, ITransferStrategyBase} from '../../../src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
+import {RewardsDataTypes} from '../../../src/contracts/rewards/libraries/RewardsDataTypes.sol';
+import {IEACAggregatorProxy} from '../../../src/contracts/helpers/interfaces/IEACAggregatorProxy.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
 
 // Minimal mock as contract is abstract
 contract MockERC20AaveLMUpgradeable is ERC20AaveLMUpgradeable {
diff --git a/tests/periphery/static-a-token/ERC4626StataTokenUpgradeable.t.sol b/tests/extensions/static-a-token/ERC4626StataTokenUpgradeable.t.sol
similarity index 98%
rename from tests/periphery/static-a-token/ERC4626StataTokenUpgradeable.t.sol
rename to tests/extensions/static-a-token/ERC4626StataTokenUpgradeable.t.sol
index 47461697..fb0d0b3a 100644
--- a/tests/periphery/static-a-token/ERC4626StataTokenUpgradeable.t.sol
+++ b/tests/extensions/static-a-token/ERC4626StataTokenUpgradeable.t.sol
@@ -4,10 +4,10 @@ pragma solidity ^0.8.10;
 import {IERC20Errors} from 'openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol';
 import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {IERC20Permit} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol';
-import {IPool} from '../../../src/core/contracts/interfaces/IPool.sol';
+import {IPool} from '../../../src/contracts/interfaces/IPool.sol';
 import {TestnetProcedures, TestnetERC20} from '../../utils/TestnetProcedures.sol';
-import {ERC4626Upgradeable, ERC4626StataTokenUpgradeable, IERC4626StataToken} from '../../../src/periphery/contracts/static-a-token/ERC4626StataTokenUpgradeable.sol';
-import {DataTypes} from '../../../src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {ERC4626Upgradeable, ERC4626StataTokenUpgradeable, IERC4626StataToken} from '../../../src/contracts/extensions/static-a-token/ERC4626StataTokenUpgradeable.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
 import {SigUtils} from '../../utils/SigUtils.sol';
 
 // Minimal mock as contract is abstract
diff --git a/tests/periphery/static-a-token/StataTokenV2Getters.sol b/tests/extensions/static-a-token/StataTokenV2Getters.sol
similarity index 84%
rename from tests/periphery/static-a-token/StataTokenV2Getters.sol
rename to tests/extensions/static-a-token/StataTokenV2Getters.sol
index c9a8aa1c..17d71dbf 100644
--- a/tests/periphery/static-a-token/StataTokenV2Getters.sol
+++ b/tests/extensions/static-a-token/StataTokenV2Getters.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.10;
 
 import {Initializable} from 'openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol';
 import {IERC20Metadata, IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
-import {AToken} from '../../../src/core/contracts/protocol/tokenization/AToken.sol';
-import {StataTokenV2} from '../../../src/periphery/contracts/static-a-token/StataTokenV2.sol'; // TODO: change import to isolate to 4626
+import {AToken} from '../../../src/contracts/protocol/tokenization/AToken.sol';
+import {StataTokenV2} from '../../../src/contracts/extensions/static-a-token/StataTokenV2.sol'; // TODO: change import to isolate to 4626
 import {BaseTest} from './TestBase.sol';
 
 contract StataTokenV2GettersTest is BaseTest {
diff --git a/tests/periphery/static-a-token/StataTokenV2Pausable.t.sol b/tests/extensions/static-a-token/StataTokenV2Pausable.t.sol
similarity index 96%
rename from tests/periphery/static-a-token/StataTokenV2Pausable.t.sol
rename to tests/extensions/static-a-token/StataTokenV2Pausable.t.sol
index 1eccc9df..894c1eff 100644
--- a/tests/periphery/static-a-token/StataTokenV2Pausable.t.sol
+++ b/tests/extensions/static-a-token/StataTokenV2Pausable.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import {PausableUpgradeable} from 'openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol';
 import {IERC20Metadata, IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
-import {IERC4626StataToken} from '../../../src/periphery/contracts/static-a-token/interfaces/IERC4626StataToken.sol';
+import {IERC4626StataToken} from '../../../src/contracts/extensions/static-a-token/interfaces/IERC4626StataToken.sol';
 import {BaseTest} from './TestBase.sol';
 
 contract StataTokenV2PausableTest is BaseTest {
diff --git a/tests/periphery/static-a-token/StataTokenV2Permit.sol b/tests/extensions/static-a-token/StataTokenV2Permit.sol
similarity index 100%
rename from tests/periphery/static-a-token/StataTokenV2Permit.sol
rename to tests/extensions/static-a-token/StataTokenV2Permit.sol
diff --git a/tests/periphery/static-a-token/StataTokenV2Rescuable.sol b/tests/extensions/static-a-token/StataTokenV2Rescuable.sol
similarity index 95%
rename from tests/periphery/static-a-token/StataTokenV2Rescuable.sol
rename to tests/extensions/static-a-token/StataTokenV2Rescuable.sol
index c1c89f0d..8034fd52 100644
--- a/tests/periphery/static-a-token/StataTokenV2Rescuable.sol
+++ b/tests/extensions/static-a-token/StataTokenV2Rescuable.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.10;
 
 import {IRescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
-import {IAToken} from '../../../src/periphery/contracts/static-a-token/StataTokenV2.sol';
+import {IAToken} from '../../../src/contracts/extensions/static-a-token/StataTokenV2.sol';
 import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {BaseTest} from './TestBase.sol';
 
diff --git a/tests/periphery/static-a-token/TestBase.sol b/tests/extensions/static-a-token/TestBase.sol
similarity index 88%
rename from tests/periphery/static-a-token/TestBase.sol
rename to tests/extensions/static-a-token/TestBase.sol
index 55deaa3d..652073f7 100644
--- a/tests/periphery/static-a-token/TestBase.sol
+++ b/tests/extensions/static-a-token/TestBase.sol
@@ -4,11 +4,11 @@ pragma solidity ^0.8.10;
 import {IERC20Metadata, IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {TransparentUpgradeableProxy} from 'solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
-import {StataTokenFactory} from '../../../src/periphery/contracts/static-a-token/StataTokenFactory.sol';
-import {StataTokenV2} from '../../../src/periphery/contracts/static-a-token/StataTokenV2.sol';
-import {IERC20AaveLM} from '../../../src/periphery/contracts/static-a-token/interfaces/IERC20AaveLM.sol';
+import {StataTokenFactory} from '../../../src/contracts/extensions/static-a-token/StataTokenFactory.sol';
+import {StataTokenV2} from '../../../src/contracts/extensions/static-a-token/StataTokenV2.sol';
+import {IERC20AaveLM} from '../../../src/contracts/extensions/static-a-token/interfaces/IERC20AaveLM.sol';
 import {TestnetProcedures, TestnetERC20} from '../../utils/TestnetProcedures.sol';
-import {DataTypes} from '../../../src/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
 
 abstract contract BaseTest is TestnetProcedures {
   address constant OWNER = address(1234);
diff --git a/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol b/tests/extensions/v3-config-engine/AaveV3ConfigEngineTest.t.sol
similarity index 91%
rename from tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol
rename to tests/extensions/v3-config-engine/AaveV3ConfigEngineTest.t.sol
index e73843f7..196122fb 100644
--- a/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol
+++ b/tests/extensions/v3-config-engine/AaveV3ConfigEngineTest.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import {IAaveV3ConfigEngine} from '../../../src/periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol';
+import {IAaveV3ConfigEngine} from '../../../src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {AaveV3MockListing} from './mocks/AaveV3MockListing.sol';
 import {AaveV3MockListingCustom} from './mocks/AaveV3MockListingCustom.sol';
 import {AaveV3MockCapUpdate} from './mocks/AaveV3MockCapUpdate.sol';
@@ -17,15 +17,15 @@ import {AaveV3MockEModeCategoryUpdate, AaveV3MockEModeCategoryUpdateEdgeBonus} f
 import {AaveV3MockEModeCategoryUpdateNoChange} from './mocks/AaveV3MockEModeCategoryUpdateNoChange.sol';
 import {AaveV3MockAssetEModeUpdate} from './mocks/AaveV3MockAssetEModeUpdate.sol';
 
-import {ATokenInstance} from '../../../src/core/instances/ATokenInstance.sol';
-import {StableDebtTokenInstance} from '../../../src/core/instances/StableDebtTokenInstance.sol';
-import {VariableDebtTokenInstance} from '../../../src/core/instances/VariableDebtTokenInstance.sol';
+import {ATokenInstance} from '../../../src/contracts/instances/ATokenInstance.sol';
+import {EModeConfiguration} from '../../../src/contracts/protocol/libraries/configuration/EModeConfiguration.sol';
+import {VariableDebtTokenInstance} from '../../../src/contracts/instances/VariableDebtTokenInstance.sol';
 import {TestnetProcedures, AaveV3ConfigEngine} from '../../utils/TestnetProcedures.sol';
-import {TestnetERC20} from '../../../src/periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {MockAggregator} from '../../../src/core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {MockAggregator} from '../../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
 import {IPool, IPoolAddressesProvider} from '../../utils/ProtocolV3TestBase.sol';
-import {DataTypes} from '../../../src/core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ProtocolV3TestBase, IDefaultInterestRateStrategyV2, ReserveConfig, ReserveTokens, DataTypes as DataTypeOld} from '../../utils/ProtocolV3TestBase.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {ProtocolV3TestBase, IDefaultInterestRateStrategyV2, ReserveConfig, ReserveTokens} from '../../utils/ProtocolV3TestBase.sol';
 
 contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
   using stdStorage for StdStorage;
@@ -80,7 +80,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       underlying: asset,
       aToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
       variableDebtToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
-      stableDebtToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
       decimals: 18,
       ltv: 82_50,
       liquidationThreshold: 86_00,
@@ -90,7 +89,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       usageAsCollateralEnabled: true,
       borrowingEnabled: true,
       interestRateStrategy: AaveV3ConfigEngine(configEngine).DEFAULT_INTEREST_RATE_STRATEGY(),
-      stableBorrowRateEnabled: false,
       isPaused: false,
       isActive: true,
       isFrozen: false,
@@ -100,7 +98,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       supplyCap: 85_000,
       borrowCap: 60_000,
       debtCeiling: 0,
-      eModeCategory: 0,
       virtualAccActive: true,
       virtualBalance: 0,
       aTokenUnderlyingBalance: 0
@@ -114,7 +111,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       _findReserveConfigBySymbol(allConfigsAfter, '1INCH'),
       ReserveTokens({
         aToken: address(contracts.aToken),
-        stableDebtToken: address(contracts.stableDebtToken),
         variableDebtToken: address(contracts.variableDebtToken)
       })
     );
@@ -150,15 +146,13 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
     address feed = address(new MockAggregator(int256(15e8)));
     address aTokenImpl = address(new ATokenInstance(contracts.poolProxy));
     address vTokenImpl = address(new VariableDebtTokenInstance(contracts.poolProxy));
-    address sTokenImpl = address(new StableDebtTokenInstance(contracts.poolProxy));
 
     AaveV3MockListingCustom payload = new AaveV3MockListingCustom(
       asset,
       feed,
       configEngine,
       aTokenImpl,
-      vTokenImpl,
-      sTokenImpl
+      vTokenImpl
     );
 
     vm.prank(roleList.marketOwner);
@@ -183,7 +177,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       underlying: asset,
       aToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
       variableDebtToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
-      stableDebtToken: address(0), // Mock, as they don't get validated, because of the "dynamic" deployment on proposal execution
       decimals: 18,
       ltv: 82_50,
       liquidationThreshold: 86_00,
@@ -193,7 +186,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       usageAsCollateralEnabled: true,
       borrowingEnabled: true,
       interestRateStrategy: AaveV3ConfigEngine(configEngine).DEFAULT_INTEREST_RATE_STRATEGY(),
-      stableBorrowRateEnabled: false,
       isPaused: false,
       isActive: true,
       isFrozen: false,
@@ -203,7 +195,6 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       supplyCap: 85_000,
       borrowCap: 60_000,
       debtCeiling: 0,
-      eModeCategory: 0,
       virtualAccActive: true,
       virtualBalance: 0,
       aTokenUnderlyingBalance: 0
@@ -215,11 +206,7 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
 
     _validateReserveTokensImpls(
       _findReserveConfigBySymbol(allConfigsAfter, 'PSP'),
-      ReserveTokens({
-        aToken: aTokenImpl,
-        stableDebtToken: sTokenImpl,
-        variableDebtToken: vTokenImpl
-      })
+      ReserveTokens({aToken: aTokenImpl, variableDebtToken: vTokenImpl})
     );
 
     _validateAssetSourceOnOracle(
@@ -550,11 +537,10 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
 
     diffReports('preTestEngineEModeCategoryUpdate', 'postTestEngineEModeCategoryUpdate');
 
-    DataTypeOld.EModeCategory memory prevEmodeCategoryData;
+    DataTypes.EModeCategory memory prevEmodeCategoryData;
     prevEmodeCategoryData.ltv = 97_40;
     prevEmodeCategoryData.liquidationThreshold = 97_60;
     prevEmodeCategoryData.liquidationBonus = 101_50; // 100_00 + 1_50
-    prevEmodeCategoryData.priceSource = address(0);
     prevEmodeCategoryData.label = 'ETH Correlated';
 
     _validateEmodeCategory(
@@ -582,7 +568,7 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       configEngine
     );
 
-    DataTypes.EModeCategory memory eModeCategoryDataBefore = contracts
+    DataTypes.EModeCategoryLegacy memory eModeCategoryDataBefore = contracts
       .poolProxy
       .getEModeCategoryData(1);
 
@@ -595,7 +581,7 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       eModeCategoryDataBefore.ltv,
       eModeCategoryDataBefore.liquidationThreshold,
       eModeCategoryDataBefore.liquidationBonus,
-      eModeCategoryDataBefore.priceSource,
+      address(0),
       eModeCategoryDataBefore.label
     );
     payload.execute();
@@ -607,7 +593,7 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       configEngine
     );
 
-    DataTypes.EModeCategory memory eModeCategoryDataBefore = contracts
+    DataTypes.EModeCategoryLegacy memory eModeCategoryDataBefore = contracts
       .poolProxy
       .getEModeCategoryData(1);
 
@@ -628,11 +614,10 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
 
     diffReports('preTestEngineEModeCategoryNoChange', 'postTestEngineEModeCategoryNoChange');
 
-    DataTypeOld.EModeCategory memory prevEmodeCategoryData;
+    DataTypes.EModeCategory memory prevEmodeCategoryData;
     prevEmodeCategoryData.ltv = eModeCategoryDataBefore.ltv;
     prevEmodeCategoryData.liquidationThreshold = eModeCategoryDataBefore.liquidationThreshold;
     prevEmodeCategoryData.liquidationBonus = eModeCategoryDataBefore.liquidationBonus;
-    prevEmodeCategoryData.priceSource = eModeCategoryDataBefore.priceSource;
     prevEmodeCategoryData.label = eModeCategoryDataBefore.label;
 
     _validateEmodeCategory(
@@ -644,11 +629,16 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
 
   function testAssetEModeUpdates() public {
     address asset = tokenList.usdx;
+    address asset2 = tokenList.wbtc;
 
     AaveV3MockEModeCategoryUpdate payloadToAddEMode = new AaveV3MockEModeCategoryUpdate(
       configEngine
     );
-    AaveV3MockAssetEModeUpdate payload = new AaveV3MockAssetEModeUpdate(asset, configEngine);
+    AaveV3MockAssetEModeUpdate payload = new AaveV3MockAssetEModeUpdate(
+      asset,
+      asset2,
+      configEngine
+    );
 
     vm.startPrank(roleList.marketOwner);
     contracts.aclManager.addPoolAdmin(address(payload));
@@ -671,6 +661,22 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
 
     diffReports('preTestEngineAssetEModeUpdate', 'postTestEngineAssetEModeUpdate');
 
-    assertEq(contracts.protocolDataProvider.getReserveEModeCategory(asset), 1);
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(asset);
+    uint128 collateralBitmap = contracts.poolProxy.getEModeCategoryCollateralBitmap(1);
+    uint128 borrowableBitmap = contracts.poolProxy.getEModeCategoryBorrowableBitmap(1);
+    assertEq(EModeConfiguration.isReserveEnabledOnBitmap(collateralBitmap, reserveData.id), false);
+    assertEq(EModeConfiguration.isReserveEnabledOnBitmap(borrowableBitmap, reserveData.id), true);
+
+    DataTypes.ReserveDataLegacy memory reserveDataAsset2 = contracts.poolProxy.getReserveData(
+      asset2
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(collateralBitmap, reserveDataAsset2.id),
+      true
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(borrowableBitmap, reserveDataAsset2.id),
+      false
+    );
   }
 }
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol
similarity index 51%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol
index c92bb35a..96220fc0 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockAssetEModeUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock asset e-mode update, for testing purposes
@@ -10,15 +10,32 @@ import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
  */
 contract AaveV3MockAssetEModeUpdate is AaveV3Payload {
   address public immutable ASSET_ADDRESS;
+  address public immutable ASSET_2_ADDRESS;
 
-  constructor(address assetAddress, address customEngine) AaveV3Payload(IEngine(customEngine)) {
+  constructor(
+    address assetAddress,
+    address asset2Address,
+    address customEngine
+  ) AaveV3Payload(IEngine(customEngine)) {
     ASSET_ADDRESS = assetAddress;
+    ASSET_2_ADDRESS = asset2Address;
   }
 
   function assetsEModeUpdates() public view override returns (IEngine.AssetEModeUpdate[] memory) {
-    IEngine.AssetEModeUpdate[] memory eModeUpdate = new IEngine.AssetEModeUpdate[](1);
+    IEngine.AssetEModeUpdate[] memory eModeUpdate = new IEngine.AssetEModeUpdate[](2);
 
-    eModeUpdate[0] = IEngine.AssetEModeUpdate({asset: ASSET_ADDRESS, eModeCategory: 1});
+    eModeUpdate[0] = IEngine.AssetEModeUpdate({
+      asset: ASSET_ADDRESS,
+      eModeCategory: 1,
+      collateral: EngineFlags.DISABLED,
+      borrowable: EngineFlags.ENABLED
+    });
+    eModeUpdate[1] = IEngine.AssetEModeUpdate({
+      asset: ASSET_2_ADDRESS,
+      eModeCategory: 1,
+      collateral: EngineFlags.ENABLED,
+      borrowable: EngineFlags.KEEP_CURRENT
+    });
 
     return eModeUpdate;
   }
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol
similarity index 90%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol
index 9ddd3883..95679686 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock borrow update, to be able to test
@@ -23,7 +23,6 @@ contract AaveV3MockBorrowUpdate is AaveV3Payload {
       asset: ASSET_ADDRESS,
       enabledToBorrow: EngineFlags.ENABLED,
       flashloanable: EngineFlags.DISABLED,
-      stableRateModeEnabled: EngineFlags.KEEP_CURRENT,
       borrowableInIsolation: EngineFlags.KEEP_CURRENT,
       withSiloedBorrowing: EngineFlags.KEEP_CURRENT,
       reserveFactor: 15_00
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol
similarity index 89%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol
index f2dc7c34..6121bea7 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockBorrowUpdateNoChange.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock borrow update with no change, to be able to test
@@ -21,7 +21,6 @@ contract AaveV3MockBorrowUpdateNoChange is AaveV3Payload {
       asset: ASSET_ADDRESS,
       enabledToBorrow: EngineFlags.KEEP_CURRENT,
       flashloanable: EngineFlags.KEEP_CURRENT,
-      stableRateModeEnabled: EngineFlags.KEEP_CURRENT,
       borrowableInIsolation: EngineFlags.KEEP_CURRENT,
       withSiloedBorrowing: EngineFlags.KEEP_CURRENT,
       reserveFactor: EngineFlags.KEEP_CURRENT
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockCapUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockCapUpdate.sol
similarity index 92%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockCapUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockCapUpdate.sol
index faa17850..7575fa20 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockCapUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockCapUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock caps update, for testing purposes
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol
similarity index 93%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol
index 0a409ace..70e38f1e 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock collateral update, for testing purposes
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol
similarity index 93%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol
index a70285f4..12c9221f 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateNoChange.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock collateral update with no changes, for testing purposes
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol
similarity index 96%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol
index 50727042..b41f26d5 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockCollateralUpdateWrongBonus.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contracts for a mock collateral update, with wrong LT/LB ratio
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol
similarity index 92%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol
index 63a540a3..19bf1ebb 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock emode category update, to be able to test
@@ -25,7 +25,6 @@ contract AaveV3MockEModeCategoryUpdate is AaveV3Payload {
       ltv: 97_40,
       liqThreshold: 97_60,
       liqBonus: 1_50,
-      priceSource: address(0),
       label: 'ETH Correlated'
     });
 
@@ -59,7 +58,6 @@ contract AaveV3MockEModeCategoryUpdateEdgeBonus is AaveV3Payload {
       ltv: 97_40,
       liqThreshold: 97_60,
       liqBonus: 2_50,
-      priceSource: EngineFlags.KEEP_CURRENT_ADDRESS,
       label: EngineFlags.KEEP_CURRENT_STRING
     });
 
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol
similarity index 89%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol
index a3bbc237..0aa0c983 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryUpdateNoChange.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock e-mode category update with no changes, for testing purposes
@@ -24,7 +24,6 @@ contract AaveV3MockEModeCategoryUpdateNoChange is AaveV3Payload {
       ltv: EngineFlags.KEEP_CURRENT,
       liqThreshold: EngineFlags.KEEP_CURRENT,
       liqBonus: EngineFlags.KEEP_CURRENT,
-      priceSource: EngineFlags.KEEP_CURRENT_ADDRESS,
       label: EngineFlags.KEEP_CURRENT_STRING
     });
 
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockListing.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockListing.sol
similarity index 90%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockListing.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockListing.sol
index 576e3248..9d28030a 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockListing.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockListing.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock listing, to be able to test without having a v3 instance on Local
@@ -36,7 +36,6 @@ contract AaveV3MockListing is AaveV3Payload {
         variableRateSlope2: 75_00
       }),
       enabledToBorrow: EngineFlags.ENABLED,
-      stableRateModeEnabled: EngineFlags.DISABLED,
       borrowableInIsolation: EngineFlags.DISABLED,
       withSiloedBorrowing: EngineFlags.DISABLED,
       flashloanable: EngineFlags.DISABLED,
@@ -47,8 +46,7 @@ contract AaveV3MockListing is AaveV3Payload {
       supplyCap: 85_000,
       borrowCap: 60_000,
       debtCeiling: 0,
-      liqProtocolFee: 10_00,
-      eModeCategory: 0
+      liqProtocolFee: 10_00
     });
 
     return listings;
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockListingCustom.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockListingCustom.sol
similarity index 81%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockListingCustom.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockListingCustom.sol
index 6eb3981f..4b7d6383 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockListingCustom.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockListingCustom.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock custom listing update, for testing purposes
@@ -14,21 +14,18 @@ contract AaveV3MockListingCustom is AaveV3Payload {
 
   address public immutable A_TOKEN_IMPL;
   address public immutable V_TOKEN_IMPL;
-  address public immutable S_TOKEN_IMPL;
 
   constructor(
     address assetAddress,
     address assetFeed,
     address customEngine,
     address aTokenImpl,
-    address vTokenImpl,
-    address sTokenImpl
+    address vTokenImpl
   ) AaveV3Payload(IEngine(customEngine)) {
     ASSET_ADDRESS = assetAddress;
     ASSET_FEED = assetFeed;
     A_TOKEN_IMPL = aTokenImpl;
     V_TOKEN_IMPL = vTokenImpl;
-    S_TOKEN_IMPL = sTokenImpl;
   }
 
   function newListingsCustom()
@@ -51,7 +48,6 @@ contract AaveV3MockListingCustom is AaveV3Payload {
           variableRateSlope2: 75_00
         }),
         enabledToBorrow: EngineFlags.ENABLED,
-        stableRateModeEnabled: EngineFlags.DISABLED,
         borrowableInIsolation: EngineFlags.DISABLED,
         withSiloedBorrowing: EngineFlags.DISABLED,
         flashloanable: EngineFlags.DISABLED,
@@ -62,14 +58,9 @@ contract AaveV3MockListingCustom is AaveV3Payload {
         supplyCap: 85_000,
         borrowCap: 60_000,
         debtCeiling: 0,
-        liqProtocolFee: 10_00,
-        eModeCategory: 0
+        liqProtocolFee: 10_00
       }),
-      IEngine.TokenImplementations({
-        aToken: A_TOKEN_IMPL,
-        vToken: V_TOKEN_IMPL,
-        sToken: S_TOKEN_IMPL
-      })
+      IEngine.TokenImplementations({aToken: A_TOKEN_IMPL, vToken: V_TOKEN_IMPL})
     );
 
     return listingsCustom;
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol
similarity index 93%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol
index 45997e59..0b5bd8b1 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockPriceFeedUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock price feed update, to be able to test
diff --git a/tests/periphery/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol b/tests/extensions/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol
similarity index 93%
rename from tests/periphery/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol
rename to tests/extensions/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol
index a4444058..42214ccc 100644
--- a/tests/periphery/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol
+++ b/tests/extensions/v3-config-engine/mocks/AaveV3MockRatesUpdate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import '../../../../src/periphery/contracts/v3-config-engine/AaveV3Payload.sol';
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
 /**
  * @dev Smart contract for a mock rate strategy params update, for testing purposes
diff --git a/tests/harness/StableDebtToken.sol b/tests/harness/StableDebtToken.sol
deleted file mode 100644
index c841b9ef..00000000
--- a/tests/harness/StableDebtToken.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.0;
-
-import {StableDebtTokenInstance, IPool} from 'aave-v3-core/instances/StableDebtTokenInstance.sol';
-
-contract StableDebtTokenHarness is StableDebtTokenInstance {
-  constructor(IPool pool) StableDebtTokenInstance(pool) {}
-
-  function _getRevision() public pure returns (uint256) {
-    return super.getRevision();
-  }
-}
diff --git a/tests/harness/VariableDebtToken.sol b/tests/harness/VariableDebtToken.sol
index 2ca73a61..73815d97 100644
--- a/tests/harness/VariableDebtToken.sol
+++ b/tests/harness/VariableDebtToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {VariableDebtTokenInstance, IPool} from 'aave-v3-core/instances/VariableDebtTokenInstance.sol';
+import {VariableDebtTokenInstance, IPool} from '../../src/contracts/instances/VariableDebtTokenInstance.sol';
 
 contract VariableDebtTokenHarness is VariableDebtTokenInstance {
   constructor(IPool pool) VariableDebtTokenInstance(pool) {}
diff --git a/tests/periphery/WrappedTokenGateway.t.sol b/tests/helpers/WrappedTokenGateway.t.sol
similarity index 90%
rename from tests/periphery/WrappedTokenGateway.t.sol
rename to tests/helpers/WrappedTokenGateway.t.sol
index 4b97b910..a311dd73 100644
--- a/tests/periphery/WrappedTokenGateway.t.sol
+++ b/tests/helpers/WrappedTokenGateway.t.sol
@@ -2,13 +2,12 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import {AaveOracle} from 'aave-v3-core/contracts/misc/AaveOracle.sol';
-import {WrappedTokenGatewayV3} from 'aave-v3-periphery/contracts/misc/WrappedTokenGatewayV3.sol';
-import {AaveProtocolDataProvider} from 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
-import {AToken} from 'aave-v3-core/contracts/protocol/tokenization/AToken.sol';
-import {StableDebtToken} from 'aave-v3-core/contracts/protocol/tokenization/StableDebtToken.sol';
-import {VariableDebtToken} from 'aave-v3-core/contracts/protocol/tokenization/VariableDebtToken.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {AaveOracle} from '../../src/contracts/misc/AaveOracle.sol';
+import {WrappedTokenGatewayV3} from '../../src/contracts/helpers/WrappedTokenGatewayV3.sol';
+import {AaveProtocolDataProvider} from '../../src/contracts/helpers/AaveProtocolDataProvider.sol';
+import {AToken} from '../../src/contracts/protocol/tokenization/AToken.sol';
+import {VariableDebtToken} from '../../src/contracts/protocol/tokenization/VariableDebtToken.sol';
+import {DataTypes} from '../../src/contracts/protocol/libraries/types/DataTypes.sol';
 import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
 
@@ -46,10 +45,8 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
   WrappedTokenGatewayV3 internal wrappedTokenGatewayV3;
 
   AToken internal aWEth;
-  StableDebtToken internal wEthStableDebtToken;
   VariableDebtToken internal wEthVariableDebtToken;
   AToken internal aUsdx;
-  StableDebtToken internal usdxStableDebtToken;
   VariableDebtToken internal usdxVariableDebtToken;
   uint256 internal depositSize = 5e18;
   uint256 internal usdxSize = 10000e18;
@@ -68,17 +65,15 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     );
     wrappedTokenGatewayV3 = WrappedTokenGatewayV3(payable(report.wrappedTokenGateway));
     contracts.protocolDataProvider = AaveProtocolDataProvider(report.protocolDataProvider);
-    (address aWEthAddr, address wEthStableDebt, address wEthVariableDebt) = contracts
+    (address aWEthAddr, , address wEthVariableDebt) = contracts
       .protocolDataProvider
       .getReserveTokensAddresses(tokenList.weth);
     aWEth = AToken(aWEthAddr);
-    wEthStableDebtToken = StableDebtToken(wEthStableDebt);
     wEthVariableDebtToken = VariableDebtToken(wEthVariableDebt);
-    (address aUsdxAddr, address usdxStableDebt, address usdxVariableDebt) = contracts
+    (address aUsdxAddr, , address usdxVariableDebt) = contracts
       .protocolDataProvider
       .getReserveTokensAddresses(tokenList.usdx);
     aUsdx = AToken(aUsdxAddr);
-    usdxStableDebtToken = StableDebtToken(usdxStableDebt);
     usdxVariableDebtToken = VariableDebtToken(usdxVariableDebt);
   }
 
@@ -305,7 +300,6 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     wrappedTokenGatewayV3.repayETH{value: partialRepayment}(
       report.poolProxy,
       partialRepayment,
-      2,
       bob
     );
 
@@ -318,12 +312,7 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     vm.expectEmit(address(contracts.poolProxy));
     emit Repay(tokenList.weth, bob, address(wrappedTokenGatewayV3), partialRepayment, false);
     // Full repayment
-    wrappedTokenGatewayV3.repayETH{value: partialRepayment}(
-      report.poolProxy,
-      type(uint).max,
-      2,
-      bob
-    );
+    wrappedTokenGatewayV3.repayETH{value: partialRepayment}(report.poolProxy, type(uint).max, bob);
 
     assertEq(wEthVariableDebtToken.balanceOf(bob), 0, 'The users debt should be 0');
 
@@ -380,7 +369,6 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     wrappedTokenGatewayV3.repayETH{value: partialRepayment + 1}(
       report.poolProxy,
       partialRepayment,
-      2,
       bob
     );
 
@@ -393,12 +381,7 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     vm.expectEmit(address(contracts.poolProxy));
     emit Repay(tokenList.weth, bob, address(wrappedTokenGatewayV3), partialRepayment, false);
     // Full repayment
-    wrappedTokenGatewayV3.repayETH{value: partialRepayment}(
-      report.poolProxy,
-      type(uint).max,
-      2,
-      bob
-    );
+    wrappedTokenGatewayV3.repayETH{value: partialRepayment}(report.poolProxy, type(uint).max, bob);
   }
 
   function test_borrowDelegateApprove_repay() public {
@@ -410,7 +393,7 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
 
     wEthVariableDebtToken.approveDelegation(address(wrappedTokenGatewayV3), borrowSize);
 
-    wrappedTokenGatewayV3.borrowETH(address(contracts.poolProxy), borrowSize, 2, 0);
+    wrappedTokenGatewayV3.borrowETH(address(contracts.poolProxy), borrowSize, 0);
 
     assertEq(
       wEthVariableDebtToken.balanceOf(alice),
@@ -419,7 +402,7 @@ contract WrappedTokenGatewayTests is TestnetProcedures {
     );
 
     // Full repayment
-    wrappedTokenGatewayV3.repayETH{value: borrowSize}(report.poolProxy, type(uint).max, 2, alice);
+    wrappedTokenGatewayV3.repayETH{value: borrowSize}(report.poolProxy, type(uint).max, alice);
     vm.stopPrank();
 
     assertEq(wEthVariableDebtToken.balanceOf(alice), 0, 'The users debt should be 0');
diff --git a/tests/core/AaveOracle.t.sol b/tests/misc/AaveOracle.t.sol
similarity index 95%
rename from tests/core/AaveOracle.t.sol
rename to tests/misc/AaveOracle.t.sol
index 2bbd361f..3ec7335a 100644
--- a/tests/core/AaveOracle.t.sol
+++ b/tests/misc/AaveOracle.t.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {MintableERC20} from 'aave-v3-core/contracts/mocks/tokens/MintableERC20.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {MintableERC20} from '../../src/contracts/mocks/tokens/MintableERC20.sol';
+import {MockAggregator} from '../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {PriceOracle} from 'aave-v3-core/contracts/mocks/oracle/PriceOracle.sol';
+import {Errors} from '../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {PriceOracle} from '../../src/contracts/mocks/oracle/PriceOracle.sol';
 
 contract AaveOracleTest is TestnetProcedures {
   function setUp() public {
diff --git a/tests/core/PriceOracleSentinel.t.sol b/tests/misc/PriceOracleSentinel.t.sol
similarity index 89%
rename from tests/core/PriceOracleSentinel.t.sol
rename to tests/misc/PriceOracleSentinel.t.sol
index ae4c0418..2ca5313b 100644
--- a/tests/core/PriceOracleSentinel.t.sol
+++ b/tests/misc/PriceOracleSentinel.t.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {PriceOracleSentinel} from 'aave-v3-core/contracts/protocol/configuration/PriceOracleSentinel.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {SequencerOracle, ISequencerOracle} from 'aave-v3-core/contracts/mocks/oracle/SequencerOracle.sol';
+import {Errors} from '../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {PriceOracleSentinel} from '../../src/contracts/misc/PriceOracleSentinel.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
+import {SequencerOracle, ISequencerOracle} from '../../src/contracts/mocks/oracle/SequencerOracle.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
 
 contract PriceOracleSentinelTest is TestnetProcedures {
diff --git a/tests/core/InitializableImmutableAdminUpgradeabilityProxy.t.sol b/tests/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.t.sol
similarity index 96%
rename from tests/core/InitializableImmutableAdminUpgradeabilityProxy.t.sol
rename to tests/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.t.sol
index 4740633c..e308ab05 100644
--- a/tests/core/InitializableImmutableAdminUpgradeabilityProxy.t.sol
+++ b/tests/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {SlotParser} from '../utils/SlotParser.sol';
-import {MockInitializableImple, MockInitializableImpleV2} from 'aave-v3-core/contracts/mocks/upgradeability/MockInitializableImplementation.sol';
-import 'aave-v3-core/contracts/protocol/libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
+import {SlotParser} from '../../utils/SlotParser.sol';
+import {MockInitializableImple, MockInitializableImpleV2} from '../../../src/contracts/mocks/upgradeability/MockInitializableImplementation.sol';
+import '../../../src/contracts/misc/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
 
 contract InitializableImmutableAdminUpgradeabilityProxyTests is Test {
   using stdStorage for StdStorage;
diff --git a/tests/misc/rates/RateStrategy.calculateRates.t.sol b/tests/misc/rates/RateStrategy.calculateRates.t.sol
new file mode 100644
index 00000000..75d0ff90
--- /dev/null
+++ b/tests/misc/rates/RateStrategy.calculateRates.t.sol
@@ -0,0 +1,484 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import './RateStrategy.template.sol';
+
+contract RateStrategyCalculateRatesTests is RateStrategyBase {
+  using WadRayMath for uint256;
+  using PercentageMath for uint256;
+
+  //----------------------------------------------------------------------------------------------------
+  //                         Test Calculate Rates with specific conditions
+  //----------------------------------------------------------------------------------------------------
+  function test_calculate_rates_80_percent_usage()
+    public
+    setRateParams(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: uint16(80_00),
+        baseVariableBorrowRate: uint32(1_00),
+        variableRateSlope1: uint32(4_00),
+        variableRateSlope2: uint32(60_00)
+      }),
+      tokenList.usdx
+    )
+  {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 800000000000000000,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 200000000000000000
+    });
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx);
+
+    assertEq(
+      params.currentLiquidityRate,
+      expectedVariableRate.percentMul(8000).percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+    assertEq(params.currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  function test_calculate_rates_100_percent_usage()
+    public
+    setRateParams(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: uint16(80_00),
+        baseVariableBorrowRate: uint32(1_00),
+        variableRateSlope1: uint32(4_00),
+        variableRateSlope2: uint32(60_00)
+      }),
+      tokenList.usdx
+    )
+  {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 1000000000000000000,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 0
+    });
+
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope2(tokenList.usdx);
+
+    assertEq(
+      currentLiquidityRate,
+      expectedVariableRate.percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  function test_calculate_rates_80_percent_usage_and_50_percent_supply_usage_due_minted_tokens()
+    public
+    setRateParams(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: uint16(80_00),
+        baseVariableBorrowRate: uint32(1_00),
+        variableRateSlope1: uint32(4_00),
+        variableRateSlope2: uint32(60_00)
+      }),
+      tokenList.usdx
+    )
+  {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 600000000000000000,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 800000000000000000,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 200000000000000000
+    });
+
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx);
+
+    assertEq(
+      currentLiquidityRate,
+      expectedVariableRate.percentMul(5000).percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+
+    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  function test_calculate_rates_80_percent_usage_and_80_bps_supply_usage_due_minted_tokens()
+    public
+    setRateParams(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: uint16(80_00),
+        baseVariableBorrowRate: uint32(1_00),
+        variableRateSlope1: uint32(4_00),
+        variableRateSlope2: uint32(60_00)
+      }),
+      tokenList.usdx
+    )
+  {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 800000000000000000 * 124 - 200000000000000000,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 800000000000000000,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 200000000000000000
+    });
+
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx);
+
+    assertEq(
+      currentLiquidityRate,
+      expectedVariableRate.percentMul(80).percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+
+    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  function test_calculate_rates_80_bps_usage()
+    public
+    setRateParams(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: uint16(80_00),
+        baseVariableBorrowRate: uint32(1_00),
+        variableRateSlope1: uint32(4_00),
+        variableRateSlope2: uint32(60_00)
+      }),
+      tokenList.usdx
+    )
+  {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 80000000000000000000,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 9920000000000000000000
+    });
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 usageRatio = _bpsToRay(80);
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
+        usageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
+      );
+    assertEq(
+      currentLiquidityRate,
+      expectedVariableRate.percentMul(80).percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+    assertEq(currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  function test_fuzz_calculate_rates_80_percent_usage_added_and_virtual_equal(
+    uint256 virtualBalanceAmount
+  ) public view {
+    vm.assume(virtualBalanceAmount <= 200000000000000000);
+    uint256 liquidityAddedAmount = 200000000000000000 - virtualBalanceAmount;
+
+    // First, calculate using only virtual balance
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      reserve: tokenList.usdx,
+      unbacked: 0,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 800000000000000000,
+      reserveFactor: reserveFactor,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 200000000000000000
+    });
+
+    (uint256 currentLiquidityRateOne, uint256 currentVariableBorrowRateOne) = rateStrategy
+      .calculateInterestRates(input);
+
+    // Second, calculate using the fuzzed values, totaling the same utilization
+    input = DataTypes.CalculateInterestRatesParams({
+      reserve: tokenList.usdx,
+      unbacked: 0,
+      liquidityAdded: liquidityAddedAmount,
+      liquidityTaken: 0,
+      totalDebt: 800000000000000000,
+      reserveFactor: reserveFactor,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+
+    (uint256 currentLiquidityRateTwo, uint256 currentVariableBorrowRateTwo) = rateStrategy
+      .calculateInterestRates(input);
+
+    assertEq(currentLiquidityRateOne, currentLiquidityRateTwo, 'Invalid liquidity rate');
+
+    assertEq(currentVariableBorrowRateOne, currentVariableBorrowRateTwo, 'Invalid variable rate');
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx);
+
+    assertEq(
+      currentLiquidityRateTwo,
+      expectedVariableRate.percentMul(8000).percentMul(100_00 - input.reserveFactor),
+      'Invalid liquidity rate'
+    );
+
+    assertEq(currentVariableBorrowRateTwo, expectedVariableRate, 'Invalid variable rate');
+  }
+
+  //----------------------------------------------------------------------------------------------------
+  //                         Test Calculate Rates with FUZZING
+  //----------------------------------------------------------------------------------------------------
+  function test_calculate_rates_empty_reserve(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public setRateParams(rateData, tokenList.usdx) {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: 0,
+      liquidityTaken: 0,
+      totalDebt: 0,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 0
+    });
+
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    assertEq(currentLiquidityRate, 0);
+    assertEq(currentVariableBorrowRate, rateStrategy.getBaseVariableBorrowRate(tokenList.usdx));
+  }
+
+  function test_calculate_rates_when_not_using_virtual_valance(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    uint256 availableLiquidity,
+    uint256 virtualBalanceAmount
+  ) public setRateParams(rateData, tokenList.usdx) {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: availableLiquidity,
+      liquidityTaken: 0,
+      totalDebt: 0,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: false,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
+    assertEq(
+      params.currentVariableBorrowRate,
+      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
+      'Invalid variable rate'
+    );
+  }
+
+  function test_calculate_rates_when_total_debt_0(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    uint256 availableLiquidity,
+    uint256 virtualBalanceAmount
+  ) public setRateParams(rateData, tokenList.usdx) {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: availableLiquidity,
+      liquidityTaken: 0,
+      totalDebt: 0,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
+    assertEq(
+      params.currentVariableBorrowRate,
+      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
+      'Invalid variable rate'
+    );
+  }
+
+  function test_calculate_rates_below_op_usage(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    uint256 totalDebt,
+    uint256 availableLiquidity,
+    uint256 virtualBalanceAmount
+  ) public setRateParams(rateData, tokenList.usdx) {
+    vm.assume(totalDebt > 0);
+    vm.assume(totalDebt < availableLiquidity && availableLiquidity < 1e28);
+    vm.assume(virtualBalanceAmount < 1e28);
+    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity + virtualBalanceAmount;
+    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
+    vm.assume(borrowUsageRatio < (uint256(rateData.optimalUsageRatio) * 1e23));
+
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: availableLiquidity,
+      liquidityTaken: 0,
+      totalDebt: totalDebt,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
+        borrowUsageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
+      );
+
+    assertApproxEqAbs(
+      params.currentVariableBorrowRate,
+      expectedVariableRate,
+      100,
+      'Invalid variable rate'
+    );
+
+    assertApproxEqAbs(
+      params.currentLiquidityRate,
+      expectedVariableRate.rayMul(input.totalDebt.rayDiv(availableLiquidityPlusDebt)).percentMul(
+        100_00 - input.reserveFactor
+      ),
+      100,
+      'Invalid liquidity rate'
+    );
+  }
+
+  function test_calculate_rates_below_op_usage_when_no_debt(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    uint256 availableLiquidity,
+    uint256 virtualBalanceAmount
+  ) public setRateParams(rateData, tokenList.usdx) {
+    uint256 totalDebt = 0;
+    vm.assume(totalDebt < availableLiquidity && availableLiquidity < 1e28);
+    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity;
+    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
+    vm.assume(borrowUsageRatio < (uint256(rateData.optimalUsageRatio) * 1e23));
+
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: availableLiquidity,
+      liquidityTaken: 0,
+      totalDebt: totalDebt,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx).rayMul(
+        borrowUsageRatio.rayDiv(rateStrategy.getOptimalUsageRatio(tokenList.usdx))
+      );
+
+    assertApproxEqAbs(
+      params.currentVariableBorrowRate,
+      expectedVariableRate,
+      100,
+      'Invalid variable rate'
+    );
+
+    assertEq(params.currentLiquidityRate, 0, 'Invalid liquidity rate');
+  }
+
+  function test_calculate_rates_above_op_usage(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    uint256 totalDebt,
+    uint256 availableLiquidity,
+    uint256 virtualBalanceAmount
+  ) public setRateParams(rateData, tokenList.usdx) {
+    availableLiquidity = bound(availableLiquidity, 1, 1e28);
+    totalDebt = bound(totalDebt, 1, availableLiquidity);
+    vm.assume(virtualBalanceAmount < 1e28);
+    uint256 availableLiquidityPlusDebt = totalDebt + availableLiquidity + virtualBalanceAmount;
+
+    borrowUsageRatio = totalDebt.rayDiv(availableLiquidityPlusDebt);
+    vm.assume(borrowUsageRatio > (uint256(rateData.optimalUsageRatio) * 1e23));
+
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 0,
+      liquidityAdded: availableLiquidity,
+      liquidityTaken: 0,
+      totalDebt: totalDebt,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.usdx,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: virtualBalanceAmount
+    });
+
+    (params.currentLiquidityRate, params.currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    uint256 excessBorrowUsageRatio = (borrowUsageRatio -
+      rateStrategy.getOptimalUsageRatio(tokenList.usdx)).rayDiv(
+        WadRayMath.RAY - rateStrategy.getOptimalUsageRatio(tokenList.usdx)
+      );
+
+    uint256 expectedVariableRate = rateStrategy.getBaseVariableBorrowRate(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope1(tokenList.usdx) +
+      rateStrategy.getVariableRateSlope2(tokenList.usdx).rayMul(excessBorrowUsageRatio);
+
+    assertEq(params.currentVariableBorrowRate, expectedVariableRate, 'Invalid variable rate');
+
+    assertEq(
+      params.currentLiquidityRate,
+      expectedVariableRate.rayMul(input.totalDebt.rayDiv(availableLiquidityPlusDebt)).percentMul(
+        100_00 - input.reserveFactor
+      ),
+      'Invalid liquidity rate'
+    );
+  }
+
+  function test_zero_rates_strategy_calculate_rates() public view {
+    DataTypes.CalculateInterestRatesParams memory input = DataTypes.CalculateInterestRatesParams({
+      unbacked: 10,
+      liquidityAdded: 1000,
+      liquidityTaken: 50,
+      totalDebt: 20,
+      reserveFactor: reserveFactor,
+      reserve: tokenList.wbtc,
+      usingVirtualBalance: true,
+      virtualUnderlyingBalance: 30000
+    });
+
+    (uint256 currentLiquidityRate, uint256 currentVariableBorrowRate) = rateStrategy
+      .calculateInterestRates(input);
+
+    assertEq(currentLiquidityRate, 0);
+    assertEq(currentVariableBorrowRate, 0);
+  }
+}
diff --git a/tests/misc/rates/RateStrategy.setters.t.sol b/tests/misc/rates/RateStrategy.setters.t.sol
new file mode 100644
index 00000000..ead7175e
--- /dev/null
+++ b/tests/misc/rates/RateStrategy.setters.t.sol
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import './RateStrategy.template.sol';
+
+contract RateStrategySettersTests is RateStrategyBase {
+  using WadRayMath for uint256;
+  using PercentageMath for uint256;
+
+  // @dev we override it to test second version of setInterestRateParams later
+  function _setInterestRateParams(
+    address token,
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) internal virtual {
+    rateStrategy.setInterestRateParams(token, abi.encode(rateData));
+  }
+
+  //----------------------------------------------------------------------------------------------------
+  //                         Test Set interest Rate params Using FUZZING
+  //----------------------------------------------------------------------------------------------------
+  function test_new_SetReserveInterestRateParams_when_not_configurator(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    _validateSetRateParams(rateData);
+
+    vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
+    _setInterestRateParams(tokenList.usdx, rateData);
+  }
+
+  function test_new_SetReserveInterestRateParams(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    _validateSetRateParams(rateData);
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectEmit(true, false, false, true);
+    emit RateDataUpdate(
+      tokenList.usdx,
+      rateData.optimalUsageRatio,
+      rateData.baseVariableBorrowRate,
+      rateData.variableRateSlope1,
+      rateData.variableRateSlope2
+    );
+    _setInterestRateParams(tokenList.usdx, rateData);
+
+    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
+    assertEq(
+      rateStrategy.getOptimalUsageRatio(tokenList.usdx),
+      uint256(rateData.optimalUsageRatio) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope1(tokenList.usdx),
+      uint256(rateData.variableRateSlope1) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope2(tokenList.usdx),
+      uint256(rateData.variableRateSlope2) * 1e23
+    );
+    assertEq(
+      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
+      uint256(rateData.baseVariableBorrowRate) * 1e23
+    );
+    assertEq(
+      rateStrategy.getMaxVariableBorrowRate(tokenList.usdx),
+      uint256(
+        rateData.baseVariableBorrowRate + rateData.variableRateSlope1 + rateData.variableRateSlope2
+      ) * 1e23
+    );
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_reserve_0(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    _validateSetRateParams(rateData);
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
+    _setInterestRateParams(address(0), rateData);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_gt_max_op(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    vm.assume(rateData.optimalUsageRatio > rateStrategy.MAX_OPTIMAL_POINT());
+
+    vm.prank(report.poolConfiguratorProxy);
+
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    _setInterestRateParams(tokenList.usdx, rateData);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_lt_min_op(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    vm.assume(rateData.optimalUsageRatio < rateStrategy.MIN_OPTIMAL_POINT());
+
+    vm.prank(report.poolConfiguratorProxy);
+
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    _setInterestRateParams(tokenList.usdx, rateData);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_gt_maxRate(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    vm.assume(
+      rateData.optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
+        rateData.optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
+    );
+
+    vm.assume(rateData.variableRateSlope1 <= rateData.variableRateSlope2);
+    vm.assume(
+      uint256(rateData.baseVariableBorrowRate) +
+        uint256(rateData.variableRateSlope1) +
+        uint256(rateData.variableRateSlope2) >
+        rateStrategy.MAX_BORROW_RATE()
+    );
+
+    vm.prank(report.poolConfiguratorProxy);
+
+    vm.expectRevert(bytes(Errors.INVALID_MAX_RATE));
+    _setInterestRateParams(tokenList.usdx, rateData);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_slope1_gt_slope2(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) public {
+    vm.assume(
+      rateData.optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
+        rateData.optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
+    );
+
+    vm.assume(rateData.variableRateSlope1 > rateData.variableRateSlope2);
+
+    vm.prank(report.poolConfiguratorProxy);
+
+    vm.expectRevert(bytes(Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1));
+    _setInterestRateParams(tokenList.usdx, rateData);
+  }
+}
+
+contract RateStrategySettersTestsOverride is RateStrategySettersTests {
+  function _setInterestRateParams(
+    address token,
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) internal override {
+    rateStrategy.setInterestRateParams(token, rateData);
+  }
+}
diff --git a/tests/misc/rates/RateStrategy.t.sol b/tests/misc/rates/RateStrategy.t.sol
new file mode 100644
index 00000000..1e08b19e
--- /dev/null
+++ b/tests/misc/rates/RateStrategy.t.sol
@@ -0,0 +1,278 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import './RateStrategy.template.sol';
+
+contract RateStrategyBaseTests is RateStrategyBase {
+  using WadRayMath for uint256;
+  using PercentageMath for uint256;
+
+  //----------------------------------------------------------------------------------------------------
+  //                                      INITIALIZATION TESTS
+  //----------------------------------------------------------------------------------------------------
+  function test_initialization() public view {
+    assertEq(rateStrategy.MAX_OPTIMAL_POINT(), 99_00);
+    assertEq(rateStrategy.MIN_OPTIMAL_POINT(), 1_00);
+    assertEq(rateStrategy.MAX_BORROW_RATE(), 1000_00);
+    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), address(report.poolAddressesProvider));
+
+    assertEq(rateStrategy.getOptimalUsageRatio(tokenList.wbtc), 0);
+    assertEq(rateStrategy.getVariableRateSlope1(tokenList.wbtc), 0);
+    assertEq(rateStrategy.getVariableRateSlope2(tokenList.wbtc), 0);
+    assertEq(rateStrategy.getBaseVariableBorrowRate(tokenList.wbtc), 0);
+    assertEq(rateStrategy.getMaxVariableBorrowRate(tokenList.wbtc), 0);
+  }
+
+  function test_new_DefaultReserveInterestRateStrategy_wrong_provider() public {
+    vm.expectRevert(bytes(Errors.INVALID_ADDRESSES_PROVIDER));
+    rateStrategy = new DefaultReserveInterestRateStrategyV2(address(0));
+  }
+
+  //----------------------------------------------------------------------------------------------------
+  //                                         Test Getters
+  //----------------------------------------------------------------------------------------------------
+  function test_getInterestRateDataRay(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public setRateParams(rateDataToSet, tokenList.usdx) {
+    IDefaultInterestRateStrategyV2.InterestRateDataRay memory rateData = rateStrategy
+      .getInterestRateData(tokenList.usdx);
+    assertEq(uint256(rateDataToSet.optimalUsageRatio) * 1e23, rateData.optimalUsageRatio);
+    assertEq(uint256(rateDataToSet.baseVariableBorrowRate) * 1e23, rateData.baseVariableBorrowRate);
+    assertEq(uint256(rateDataToSet.variableRateSlope1) * 1e23, rateData.variableRateSlope1);
+    assertEq(uint256(rateDataToSet.variableRateSlope2) * 1e23, rateData.variableRateSlope2);
+  }
+
+  function test_getInterestRateDataBps(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public setRateParams(rateDataToSet, tokenList.usdx) {
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = rateStrategy
+      .getInterestRateDataBps(tokenList.usdx);
+    assertEq(rateDataToSet.optimalUsageRatio, rateData.optimalUsageRatio);
+    assertEq(rateDataToSet.baseVariableBorrowRate, rateData.baseVariableBorrowRate);
+    assertEq(rateDataToSet.variableRateSlope1, rateData.variableRateSlope1);
+    assertEq(rateDataToSet.variableRateSlope2, rateData.variableRateSlope2);
+  }
+
+  function test_getMaxVariableBorrowRate(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public setRateParams(rateDataToSet, tokenList.usdx) {
+    uint256 maxVariableBorrowRate = rateStrategy.getMaxVariableBorrowRate(tokenList.usdx);
+    assertEq(
+      uint256(
+        rateDataToSet.baseVariableBorrowRate +
+          rateDataToSet.variableRateSlope1 +
+          rateDataToSet.variableRateSlope2
+      ) * 1e23,
+      maxVariableBorrowRate
+    );
+  }
+
+  function test_overflow_liquidity_rates() public {
+    vm.mockCall(
+      address(rateStrategy),
+      abi.encodeWithSelector(rateStrategy.calculateInterestRates.selector),
+      abi.encode(UINT256_MAX, 0)
+    );
+    vm.expectRevert(bytes("SafeCast: value doesn't fit in 128 bits"));
+    vm.prank(alice);
+    contracts.poolProxy.supply(tokenList.usdx, 1000e6, alice, 0);
+  }
+
+  function test_overflow_variable_rates() public {
+    vm.prank(carol);
+    contracts.poolProxy.supply(tokenList.usdx, 100_000e6, carol, 0);
+
+    vm.startPrank(alice);
+    contracts.poolProxy.supply(tokenList.wbtc, 1e8, alice, 0);
+
+    vm.mockCall(
+      address(rateStrategy),
+      abi.encodeWithSelector(rateStrategy.calculateInterestRates.selector),
+      abi.encode(0, UINT256_MAX)
+    );
+    vm.expectRevert(bytes("SafeCast: value doesn't fit in 128 bits"));
+    contracts.poolProxy.borrow(tokenList.usdx, 10e6, 2, 0, alice);
+    vm.stopPrank();
+  }
+
+  function test_new_SetReserveInterestRateParams_when_not_configurator(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    _validateSetRateParams(rateDataToSet);
+
+    vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateDataToSet));
+  }
+
+  function test_new_SetReserveInterestRateParams_override_method(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public setRateParams(rateDataToSet, tokenList.usdx) {
+    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
+    assertEq(
+      rateStrategy.getOptimalUsageRatio(tokenList.usdx),
+      uint256(rateDataToSet.optimalUsageRatio) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope1(tokenList.usdx),
+      uint256(rateDataToSet.variableRateSlope1) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope2(tokenList.usdx),
+      uint256(rateDataToSet.variableRateSlope2) * 1e23
+    );
+    assertEq(
+      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
+      uint256(rateDataToSet.baseVariableBorrowRate) * 1e23
+    );
+    assertEq(
+      rateStrategy.getMaxVariableBorrowRate(tokenList.usdx),
+      uint256(
+        rateDataToSet.baseVariableBorrowRate +
+          rateDataToSet.variableRateSlope1 +
+          rateDataToSet.variableRateSlope2
+      ) * 1e23
+    );
+  }
+
+  function test_new_SetReserveInterestRateParams(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    _validateSetRateParams(rateDataToSet);
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectEmit(true, false, false, true);
+    emit RateDataUpdate(
+      tokenList.usdx,
+      uint256(rateDataToSet.optimalUsageRatio),
+      uint256(rateDataToSet.baseVariableBorrowRate),
+      uint256(rateDataToSet.variableRateSlope1),
+      uint256(rateDataToSet.variableRateSlope2)
+    );
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateDataToSet));
+
+    assertEq(address(rateStrategy.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
+    assertEq(
+      rateStrategy.getOptimalUsageRatio(tokenList.usdx),
+      uint256(rateDataToSet.optimalUsageRatio) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope1(tokenList.usdx),
+      uint256(rateDataToSet.variableRateSlope1) * 1e23
+    );
+    assertEq(
+      rateStrategy.getVariableRateSlope2(tokenList.usdx),
+      uint256(rateDataToSet.variableRateSlope2) * 1e23
+    );
+    assertEq(
+      rateStrategy.getBaseVariableBorrowRate(tokenList.usdx),
+      uint256(rateDataToSet.baseVariableBorrowRate) * 1e23
+    );
+    assertEq(
+      rateStrategy.getMaxVariableBorrowRate(tokenList.usdx),
+      uint256(
+        rateDataToSet.baseVariableBorrowRate +
+          rateDataToSet.variableRateSlope1 +
+          rateDataToSet.variableRateSlope2
+      ) * 1e23
+    );
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_reserve_0(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
+    rateStrategy.setInterestRateParams(address(0), abi.encode(rateDataToSet));
+    // Override
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.ZERO_ADDRESS_NOT_VALID));
+    rateStrategy.setInterestRateParams(address(0), rateDataToSet);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_gt_max_op(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    vm.assume(rateDataToSet.optimalUsageRatio > rateStrategy.MAX_OPTIMAL_POINT());
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateDataToSet));
+
+    // Override
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    rateStrategy.setInterestRateParams(tokenList.usdx, rateDataToSet);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_lt_min_op(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    vm.assume(rateDataToSet.optimalUsageRatio < rateStrategy.MIN_OPTIMAL_POINT());
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateDataToSet));
+
+    // Override
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_OPTIMAL_USAGE_RATIO));
+    rateStrategy.setInterestRateParams(tokenList.usdx, rateDataToSet);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_gt_maxRate(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateDataToSet
+  ) public {
+    vm.assume(
+      rateDataToSet.optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
+        rateDataToSet.optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
+    );
+
+    vm.assume(rateDataToSet.variableRateSlope1 <= rateDataToSet.variableRateSlope2);
+    vm.assume(
+      uint256(rateDataToSet.baseVariableBorrowRate) +
+        uint256(rateDataToSet.variableRateSlope1) +
+        uint256(rateDataToSet.variableRateSlope2) >
+        rateStrategy.MAX_BORROW_RATE()
+    );
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_MAX_RATE));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateDataToSet));
+
+    // Override
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.INVALID_MAX_RATE));
+    rateStrategy.setInterestRateParams(tokenList.usdx, rateDataToSet);
+  }
+
+  function test_reverts_SetReserveInterestRateParams_when_slope1_gt_slope2(
+    uint16 optimalUsageRatio,
+    uint32 baseVariableBorrowRate,
+    uint32 variableRateSlope1,
+    uint32 variableRateSlope2
+  ) public {
+    vm.assume(
+      optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
+        optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
+    );
+
+    vm.assume(variableRateSlope1 > variableRateSlope2);
+
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData = IDefaultInterestRateStrategyV2
+      .InterestRateData({
+        optimalUsageRatio: optimalUsageRatio,
+        baseVariableBorrowRate: baseVariableBorrowRate,
+        variableRateSlope1: variableRateSlope1,
+        variableRateSlope2: variableRateSlope2
+      });
+
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
+
+    // Override
+    vm.prank(report.poolConfiguratorProxy);
+    vm.expectRevert(bytes(Errors.SLOPE_2_MUST_BE_GTE_SLOPE_1));
+    rateStrategy.setInterestRateParams(tokenList.usdx, abi.encode(rateData));
+  }
+}
diff --git a/tests/misc/rates/RateStrategy.template.sol b/tests/misc/rates/RateStrategy.template.sol
new file mode 100644
index 00000000..01e6dc9b
--- /dev/null
+++ b/tests/misc/rates/RateStrategy.template.sol
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import 'forge-std/Test.sol';
+
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {DefaultReserveInterestRateStrategyV2, IDefaultInterestRateStrategyV2, PercentageMath, IPoolAddressesProvider} from '../../../src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol';
+import {IPoolConfigurator} from '../../../src/contracts/interfaces/IPoolConfigurator.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+
+contract RateStrategyBase is TestnetProcedures {
+  using WadRayMath for uint256;
+  using PercentageMath for uint256;
+
+  struct Params {
+    uint256 currentLiquidityRate;
+    uint256 currentVariableBorrowRate;
+  }
+
+  uint256 public reserveFactor;
+  address public aToken;
+  DefaultReserveInterestRateStrategyV2 public rateStrategy;
+  Params public params;
+  uint256 public borrowUsageRatio;
+
+  event RateDataUpdate(
+    address indexed reserve,
+    uint256 optimalUsageRatio,
+    uint256 baseVariableBorrowRate,
+    uint256 variableRateSlope1,
+    uint256 variableRateSlope2
+  );
+
+  // sets limits for the fuzzing parameters and sets them on the interest rate strategy
+  modifier setRateParams(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    address token
+  ) {
+    _setRateParams(rateData, token);
+    _;
+  }
+
+  function _validateSetRateParams(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData
+  ) internal view {
+    vm.assume(
+      rateData.optimalUsageRatio >= rateStrategy.MIN_OPTIMAL_POINT() &&
+        rateData.optimalUsageRatio <= rateStrategy.MAX_OPTIMAL_POINT()
+    );
+
+    vm.assume(rateData.variableRateSlope1 < rateData.variableRateSlope2);
+    vm.assume(
+      uint256(rateData.baseVariableBorrowRate) +
+        uint256(rateData.variableRateSlope1) +
+        uint256(rateData.variableRateSlope2) <=
+        rateStrategy.MAX_BORROW_RATE()
+    );
+  }
+
+  function _setRateParams(
+    IDefaultInterestRateStrategyV2.InterestRateData memory rateData,
+    address token
+  ) internal {
+    _validateSetRateParams(rateData);
+
+    vm.prank(report.poolConfiguratorProxy);
+    rateStrategy.setInterestRateParams(token, abi.encode(rateData));
+  }
+
+  function setUp() public {
+    initTestEnvironment();
+
+    (aToken, , ) = contracts.protocolDataProvider.getReserveTokensAddresses(tokenList.usdx);
+    rateStrategy = new DefaultReserveInterestRateStrategyV2(report.poolAddressesProvider);
+    (, , , , reserveFactor, , , , , ) = contracts.protocolDataProvider.getReserveConfigurationData(
+      tokenList.usdx
+    );
+
+    vm.startPrank(poolAdmin);
+    IPoolConfigurator(report.poolConfiguratorProxy).setReserveInterestRateStrategyAddress(
+      tokenList.usdx,
+      address(rateStrategy),
+      _getDefaultInterestRatesStrategyData()
+    );
+    vm.stopPrank();
+  }
+}
diff --git a/tests/mocks/AaveV3TestListing.sol b/tests/mocks/AaveV3TestListing.sol
index 30751b34..65dc9ccb 100644
--- a/tests/mocks/AaveV3TestListing.sol
+++ b/tests/mocks/AaveV3TestListing.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import 'aave-v3-periphery/contracts/v3-config-engine/AaveV3Payload.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
+import '../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
+import {TestnetERC20} from '../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {MockAggregator} from '../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
 import {MarketReport} from '../../src/deployments/interfaces/IMarketReportTypes.sol';
 
 /**
@@ -27,7 +27,6 @@ contract AaveV3TestListing is AaveV3Payload {
 
   address immutable ATOKEN_IMPLEMENTATION;
   address immutable VARIABLE_DEBT_TOKEN_IMPLEMENTATION;
-  address immutable STABLE_DEBT_TOKEN_IMPLEMENTATION;
 
   ACLManager immutable ACL_MANAGER;
 
@@ -48,7 +47,6 @@ contract AaveV3TestListing is AaveV3Payload {
 
     ATOKEN_IMPLEMENTATION = report.aToken;
     VARIABLE_DEBT_TOKEN_IMPLEMENTATION = report.variableDebtToken;
-    STABLE_DEBT_TOKEN_IMPLEMENTATION = report.stableDebtToken;
 
     ACL_MANAGER = ACLManager(report.aclManager);
   }
@@ -75,7 +73,6 @@ contract AaveV3TestListing is AaveV3Payload {
         priceFeed: USDX_MOCK_PRICE_FEED,
         rateStrategyParams: rateParams,
         enabledToBorrow: EngineFlags.ENABLED,
-        stableRateModeEnabled: EngineFlags.DISABLED,
         borrowableInIsolation: EngineFlags.DISABLED,
         withSiloedBorrowing: EngineFlags.DISABLED,
         flashloanable: EngineFlags.ENABLED,
@@ -86,13 +83,11 @@ contract AaveV3TestListing is AaveV3Payload {
         supplyCap: 0,
         borrowCap: 0,
         debtCeiling: 0,
-        liqProtocolFee: 10_00,
-        eModeCategory: 0
+        liqProtocolFee: 10_00
       }),
       IEngine.TokenImplementations({
         aToken: ATOKEN_IMPLEMENTATION,
-        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION,
-        sToken: STABLE_DEBT_TOKEN_IMPLEMENTATION
+        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION
       })
     );
 
@@ -103,7 +98,6 @@ contract AaveV3TestListing is AaveV3Payload {
         priceFeed: WBTC_MOCK_PRICE_FEED,
         rateStrategyParams: rateParams,
         enabledToBorrow: EngineFlags.ENABLED,
-        stableRateModeEnabled: EngineFlags.DISABLED,
         borrowableInIsolation: EngineFlags.DISABLED,
         withSiloedBorrowing: EngineFlags.DISABLED,
         flashloanable: EngineFlags.ENABLED,
@@ -114,13 +108,11 @@ contract AaveV3TestListing is AaveV3Payload {
         supplyCap: 0,
         borrowCap: 0,
         debtCeiling: 0,
-        liqProtocolFee: 10_00,
-        eModeCategory: 0
+        liqProtocolFee: 10_00
       }),
       IEngine.TokenImplementations({
         aToken: ATOKEN_IMPLEMENTATION,
-        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION,
-        sToken: STABLE_DEBT_TOKEN_IMPLEMENTATION
+        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION
       })
     );
 
@@ -131,7 +123,6 @@ contract AaveV3TestListing is AaveV3Payload {
         priceFeed: WETH_MOCK_PRICE_FEED,
         rateStrategyParams: rateParams,
         enabledToBorrow: EngineFlags.ENABLED,
-        stableRateModeEnabled: EngineFlags.DISABLED,
         borrowableInIsolation: EngineFlags.DISABLED,
         withSiloedBorrowing: EngineFlags.DISABLED,
         flashloanable: EngineFlags.ENABLED,
@@ -142,13 +133,11 @@ contract AaveV3TestListing is AaveV3Payload {
         supplyCap: 0,
         borrowCap: 0,
         debtCeiling: 0,
-        liqProtocolFee: 10_00,
-        eModeCategory: 0
+        liqProtocolFee: 10_00
       }),
       IEngine.TokenImplementations({
         aToken: ATOKEN_IMPLEMENTATION,
-        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION,
-        sToken: STABLE_DEBT_TOKEN_IMPLEMENTATION
+        vToken: VARIABLE_DEBT_TOKEN_IMPLEMENTATION
       })
     );
 
diff --git a/tests/mocks/MockFlashLoanATokenReceiver.sol b/tests/mocks/MockFlashLoanATokenReceiver.sol
index e9711df5..ae8947ec 100644
--- a/tests/mocks/MockFlashLoanATokenReceiver.sol
+++ b/tests/mocks/MockFlashLoanATokenReceiver.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.10;
 
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {FlashLoanSimpleReceiverBase} from 'aave-v3-core/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol';
+import {IERC20} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPool} from '../../src/contracts/interfaces/IPool.sol';
+import {FlashLoanSimpleReceiverBase} from '../../src/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol';
 
 /// @dev Helper contract to test donation attacks not possible in the context of a flash loan
 contract MockFlashLoanATokenReceiver is FlashLoanSimpleReceiverBase {
diff --git a/tests/periphery/mocks/StakeMock.sol b/tests/mocks/StakeMock.sol
similarity index 100%
rename from tests/periphery/mocks/StakeMock.sol
rename to tests/mocks/StakeMock.sol
diff --git a/tests/core/ACLManager.t.sol b/tests/protocol/configuration/ACLManager.t.sol
similarity index 96%
rename from tests/core/ACLManager.t.sol
rename to tests/protocol/configuration/ACLManager.t.sol
index 373c4ee0..c06e0f7a 100644
--- a/tests/core/ACLManager.t.sol
+++ b/tests/protocol/configuration/ACLManager.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {PoolAddressesProvider} from 'aave-v3-core/contracts/protocol/configuration/PoolAddressesProvider.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ACLManager} from '../../../src/contracts/protocol/configuration/ACLManager.sol';
+import {PoolAddressesProvider} from '../../../src/contracts/protocol/configuration/PoolAddressesProvider.sol';
 
 contract ACLManagerTest is TestnetProcedures {
   address internal immutable deployer;
@@ -235,7 +235,7 @@ contract ACLManagerTest is TestnetProcedures {
    */
   function toAsciiString(address x) internal pure returns (string memory) {
     bytes memory s = new bytes(40);
-    for (uint i = 0; i < 20; i++) {
+    for (uint256 i = 0; i < 20; i++) {
       bytes1 b = bytes1(uint8(uint(uint160(x)) / (2 ** (8 * (19 - i)))));
       bytes1 hi = bytes1(uint8(b) / 16);
       bytes1 lo = bytes1(uint8(b) - 16 * uint8(hi));
diff --git a/tests/core/AddressesProviderRegistry.t.sol b/tests/protocol/configuration/AddressesProviderRegistry.t.sol
similarity index 97%
rename from tests/core/AddressesProviderRegistry.t.sol
rename to tests/protocol/configuration/AddressesProviderRegistry.t.sol
index d1e5bb35..d549d752 100644
--- a/tests/core/AddressesProviderRegistry.t.sol
+++ b/tests/protocol/configuration/AddressesProviderRegistry.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
 
 contract PoolAddressesProviderRegistryTest is TestnetProcedures {
   event AddressesProviderRegistered(address indexed addressesProvider, uint256 indexed id);
diff --git a/tests/core/PoolAddressesProvider.t.sol b/tests/protocol/configuration/PoolAddressesProvider.t.sol
similarity index 95%
rename from tests/core/PoolAddressesProvider.t.sol
rename to tests/protocol/configuration/PoolAddressesProvider.t.sol
index 115219b8..e4003f7c 100644
--- a/tests/core/PoolAddressesProvider.t.sol
+++ b/tests/protocol/configuration/PoolAddressesProvider.t.sol
@@ -3,14 +3,14 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {PoolAddressesProvider, IPoolAddressesProvider} from 'aave-v3-core/contracts/protocol/configuration/PoolAddressesProvider.sol';
-import {PoolInstance} from 'aave-v3-core/instances/PoolInstance.sol';
-import {MockInitializableV1, MockInitializableV2} from 'aave-v3-core/contracts/mocks/upgradeability/MockInitializableImplementation.sol';
-import {PoolConfiguratorInstance} from 'aave-v3-core/instances/PoolConfiguratorInstance.sol';
-import {MockPoolInherited} from 'aave-v3-core/contracts/mocks/helpers/MockPool.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {SlotParser} from '../utils/SlotParser.sol';
+import {PoolAddressesProvider, IPoolAddressesProvider} from '../../../src/contracts/protocol/configuration/PoolAddressesProvider.sol';
+import {PoolInstance} from '../../../src/contracts/instances/PoolInstance.sol';
+import {MockInitializableV1, MockInitializableV2} from '../../../src/contracts/mocks/upgradeability/MockInitializableImplementation.sol';
+import {PoolConfiguratorInstance} from '../../../src/contracts/instances/PoolConfiguratorInstance.sol';
+import {MockPoolInherited} from '../../../src/contracts/mocks/helpers/MockPool.sol';
+import {ACLManager} from '../../../src/contracts/protocol/configuration/ACLManager.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {SlotParser} from '../../utils/SlotParser.sol';
 
 contract PoolAddressesProviderTests is TestnetProcedures {
   using stdStorage for StdStorage;
diff --git a/tests/core/BridgeLogic.t.sol b/tests/protocol/libraries/logic/BridgeLogic.t.sol
similarity index 92%
rename from tests/core/BridgeLogic.t.sol
rename to tests/protocol/libraries/logic/BridgeLogic.t.sol
index db9ddbe5..18660436 100644
--- a/tests/core/BridgeLogic.t.sol
+++ b/tests/protocol/libraries/logic/BridgeLogic.t.sol
@@ -3,15 +3,15 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {MathUtils} from 'aave-v3-core/contracts/protocol/libraries/math/MathUtils.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ReserveLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {SafeCast} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {MathUtils} from '../../../../src/contracts/protocol/libraries/math/MathUtils.sol';
+import {WadRayMath} from '../../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ReserveLogic} from '../../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {PercentageMath} from '../../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {SafeCast} from '../../../../src/contracts/dependencies/openzeppelin/contracts/SafeCast.sol';
+import {IAToken} from '../../../../src/contracts/interfaces/IAToken.sol';
+import {DataTypes} from '../../../../src/contracts/protocol/libraries/types/DataTypes.sol';
 
 contract BridgeLogicTests is TestnetProcedures {
   using WadRayMath for uint256;
diff --git a/tests/core/PoolLogic.initReserves.edge.t.sol b/tests/protocol/libraries/logic/PoolLogic.initReserves.edge.t.sol
similarity index 89%
rename from tests/core/PoolLogic.initReserves.edge.t.sol
rename to tests/protocol/libraries/logic/PoolLogic.initReserves.edge.t.sol
index d7b6053c..8ba395c8 100644
--- a/tests/core/PoolLogic.initReserves.edge.t.sol
+++ b/tests/protocol/libraries/logic/PoolLogic.initReserves.edge.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {PoolLogic, ReserveLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/PoolLogic.sol';
-import '../utils/TestnetProcedures.sol';
+import {PoolLogic, ReserveLogic} from '../../../../src/contracts/protocol/libraries/logic/PoolLogic.sol';
+import '../../../utils/TestnetProcedures.sol';
 
 contract Mock {
   string public constant value = 'MOCK';
@@ -24,7 +24,6 @@ contract PoolLogicInitReservesTests is TestnetProcedures {
     DataTypes.InitReserveParams memory params = DataTypes.InitReserveParams(
       address(new Mock()),
       report.aToken,
-      report.stableDebtToken,
       report.variableDebtToken,
       address(2),
       0,
@@ -41,7 +40,6 @@ contract PoolLogicInitReservesTests is TestnetProcedures {
     DataTypes.InitReserveParams memory params1 = DataTypes.InitReserveParams(
       address(new Mock()),
       report.aToken,
-      report.stableDebtToken,
       report.variableDebtToken,
       address(2),
       0,
@@ -51,7 +49,6 @@ contract PoolLogicInitReservesTests is TestnetProcedures {
     DataTypes.InitReserveParams memory params2 = DataTypes.InitReserveParams(
       address(new Mock()),
       report.aToken,
-      report.stableDebtToken,
       report.variableDebtToken,
       address(2),
       1,
@@ -61,7 +58,6 @@ contract PoolLogicInitReservesTests is TestnetProcedures {
     DataTypes.InitReserveParams memory params3 = DataTypes.InitReserveParams(
       address(new Mock()),
       report.aToken,
-      report.stableDebtToken,
       report.variableDebtToken,
       address(2),
       2,
@@ -82,7 +78,6 @@ contract PoolLogicInitReservesTests is TestnetProcedures {
     DataTypes.InitReserveParams memory params1 = DataTypes.InitReserveParams(
       address(new Mock()),
       report.aToken,
-      report.stableDebtToken,
       report.variableDebtToken,
       address(2),
       0,
diff --git a/tests/core/MathUtils.t.sol b/tests/protocol/libraries/math/MathUtils.t.sol
similarity index 88%
rename from tests/core/MathUtils.t.sol
rename to tests/protocol/libraries/math/MathUtils.t.sol
index 8f532c8e..ce27b819 100644
--- a/tests/core/MathUtils.t.sol
+++ b/tests/protocol/libraries/math/MathUtils.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {MathUtils} from 'aave-v3-core/contracts/protocol/libraries/math/MathUtils.sol';
-import {MathUtilsWrapper} from 'aave-v3-core/contracts/mocks/tests/MathUtilsWrapper.sol';
+import {MathUtils} from '../../../../src/contracts/protocol/libraries/math/MathUtils.sol';
+import {MathUtilsWrapper} from '../../../../src/contracts/mocks/tests/MathUtilsWrapper.sol';
 
 contract MathUtilsTests is Test {
   MathUtilsWrapper internal w;
diff --git a/tests/core/PercentageMath.t.sol b/tests/protocol/libraries/math/PercentageMath.t.sol
similarity index 89%
rename from tests/core/PercentageMath.t.sol
rename to tests/protocol/libraries/math/PercentageMath.t.sol
index 1d6abb8c..47f949d2 100644
--- a/tests/core/PercentageMath.t.sol
+++ b/tests/protocol/libraries/math/PercentageMath.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {PercentageMathWrapper} from 'aave-v3-core/contracts/mocks/tests/PercentageMathWrapper.sol';
+import {PercentageMath} from '../../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {PercentageMathWrapper} from '../../../../src/contracts/mocks/tests/PercentageMathWrapper.sol';
 
 contract PercentageMathTests is Test {
   PercentageMathWrapper internal w;
diff --git a/tests/core/WadRayMath.t.sol b/tests/protocol/libraries/math/WadRayMath.t.sol
similarity index 97%
rename from tests/core/WadRayMath.t.sol
rename to tests/protocol/libraries/math/WadRayMath.t.sol
index 7a582e34..baefd867 100644
--- a/tests/core/WadRayMath.t.sol
+++ b/tests/protocol/libraries/math/WadRayMath.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
-import {WadRayMathWrapper} from 'aave-v3-core/contracts/mocks/tests/WadRayMathWrapper.sol';
+import {WadRayMathWrapper} from '../../../../src/contracts/mocks/tests/WadRayMathWrapper.sol';
 
 contract WadRayMathTests is Test {
   WadRayMathWrapper internal w;
diff --git a/tests/core/L2Pool.t.sol b/tests/protocol/pool/L2Pool.t.sol
similarity index 78%
rename from tests/core/L2Pool.t.sol
rename to tests/protocol/pool/L2Pool.t.sol
index 18f73fd3..f91495b4 100644
--- a/tests/core/L2Pool.t.sol
+++ b/tests/protocol/pool/L2Pool.t.sol
@@ -3,17 +3,17 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {L2Encoder} from 'aave-v3-core/contracts/misc/L2Encoder.sol';
-import {IL2Pool} from 'aave-v3-core/contracts/interfaces/IL2Pool.sol';
-import {IReserveInterestRateStrategy} from 'aave-v3-core/contracts/interfaces/IReserveInterestRateStrategy.sol';
-import {BorrowLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol';
-import {SupplyLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/SupplyLogic.sol';
-import {LiquidationLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/LiquidationLogic.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAaveOracle} from '../../../src/contracts/interfaces/IAaveOracle.sol';
+import {L2Encoder} from '../../../src/contracts/helpers/L2Encoder.sol';
+import {IL2Pool} from '../../../src/contracts/interfaces/IL2Pool.sol';
+import {IReserveInterestRateStrategy} from '../../../src/contracts/interfaces/IReserveInterestRateStrategy.sol';
+import {BorrowLogic} from '../../../src/contracts/protocol/libraries/logic/BorrowLogic.sol';
+import {SupplyLogic} from '../../../src/contracts/protocol/libraries/logic/SupplyLogic.sol';
+import {LiquidationLogic} from '../../../src/contracts/protocol/libraries/logic/LiquidationLogic.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 import {PoolTests, DataTypes, Errors, IERC20, IPool} from './Pool.t.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
 
 /// @dev All Pool.t.sol tests are run as L2Pool via inheriting PoolTests
 contract L2PoolTests is PoolTests {
@@ -28,9 +28,6 @@ contract L2PoolTests is PoolTests {
     pool = IPool(report.poolProxy);
     l2Pool = IL2Pool(report.poolProxy);
     l2Encoder = L2Encoder(report.l2Encoder);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.usdx, true);
   }
 
   function test_l2_supply() public {
@@ -111,7 +108,7 @@ contract L2PoolTests is PoolTests {
       alice,
       0.2e6,
       DataTypes.InterestRateMode(2),
-      _calculateInterestRates(0.2e6, 2, tokenList.usdx),
+      _calculateInterestRates(0.2e6, tokenList.usdx),
       0
     );
 
@@ -182,36 +179,6 @@ contract L2PoolTests is PoolTests {
     l2Pool.repayWithATokens(encodedInput);
   }
 
-  function test_l2_swap_borrow_rate() public {
-    _seedUsdxLiquidity();
-
-    vm.startPrank(alice);
-
-    pool.supply(tokenList.wbtc, 1e8, alice, 0);
-    pool.borrow(tokenList.usdx, 10e6, 2, 0, alice);
-
-    bytes32 encodedInput = l2Encoder.encodeSwapBorrowRateMode(tokenList.usdx, 2);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    l2Pool.swapBorrowRateMode(encodedInput);
-    vm.stopPrank();
-  }
-
-  function test_l2_rebalance_borrow() public {
-    DataTypes.ReserveDataLegacy memory usdxReserveData = pool.getReserveData(tokenList.usdx);
-
-    vm.mockCall(
-      address(usdxReserveData.interestRateStrategyAddress),
-      abi.encodeWithSelector(IReserveInterestRateStrategy.calculateInterestRates.selector),
-      abi.encode(0, 0, 0)
-    );
-
-    bytes32 encodedInput = l2Encoder.encodeRebalanceStableBorrowRate(tokenList.usdx, alice);
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-    l2Pool.rebalanceStableBorrowRate(encodedInput);
-    vm.clearMockedCalls();
-  }
-
   function test_l2_set_user_collateral() public {
     test_l2_supply();
 
diff --git a/tests/core/Pool.Borrow.t.sol b/tests/protocol/pool/Pool.Borrow.t.sol
similarity index 60%
rename from tests/core/Pool.Borrow.t.sol
rename to tests/protocol/pool/Pool.Borrow.t.sol
index c73a30e8..3245feab 100644
--- a/tests/core/Pool.Borrow.t.sol
+++ b/tests/protocol/pool/Pool.Borrow.t.sol
@@ -3,27 +3,25 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IStableDebtToken} from 'aave-v3-core/contracts/interfaces/IStableDebtToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {IReserveInterestRateStrategy} from 'aave-v3-core/contracts/interfaces/IReserveInterestRateStrategy.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {ISequencerOracle} from 'aave-v3-core/contracts/interfaces/ISequencerOracle.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {PriceOracleSentinel} from 'aave-v3-core/contracts/protocol/configuration/PriceOracleSentinel.sol';
-import {SequencerOracle} from 'aave-v3-core/contracts/mocks/oracle/SequencerOracle.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IVariableDebtToken} from '../../../src/contracts/interfaces/IVariableDebtToken.sol';
+import {IAaveOracle} from '../../../src/contracts/interfaces/IAaveOracle.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {IReserveInterestRateStrategy} from '../../../src/contracts/interfaces/IReserveInterestRateStrategy.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {ISequencerOracle} from '../../../src/contracts/interfaces/ISequencerOracle.sol';
+import {UserConfiguration} from '../../../src/contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {PriceOracleSentinel} from '../../../src/contracts/misc/PriceOracleSentinel.sol';
+import {SequencerOracle} from '../../../src/contracts/mocks/oracle/SequencerOracle.sol';
+import {MockAggregator} from '../../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveConfiguration} from '../../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IERC20} from '../../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract PoolBorrowTests is TestnetProcedures {
   using UserConfiguration for DataTypes.UserConfigurationMap;
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
 
-  IStableDebtToken internal staDebtUSDX;
   IVariableDebtToken internal varDebtUSDX;
   address internal aUSDX;
 
@@ -39,31 +37,21 @@ contract PoolBorrowTests is TestnetProcedures {
     uint256 borrowRate,
     uint16 indexed referralCode
   );
-  event RebalanceStableBorrowRate(address indexed reserve, address indexed user);
-  event SwapBorrowRateMode(
-    address indexed reserve,
-    address indexed user,
-    DataTypes.InterestRateMode interestRateMode
-  );
   event IsolationModeTotalDebtUpdated(address indexed asset, uint256 totalDebt);
 
   function setUp() public {
     initTestEnvironment();
 
-    (address atoken, address stableDebtUSDX, address variableDebtUSDX) = contracts
+    (address atoken, , address variableDebtUSDX) = contracts
       .protocolDataProvider
       .getReserveTokensAddresses(tokenList.usdx);
     aUSDX = atoken;
-    staDebtUSDX = IStableDebtToken(stableDebtUSDX);
     varDebtUSDX = IVariableDebtToken(variableDebtUSDX);
 
     vm.startPrank(carol);
     contracts.poolProxy.supply(tokenList.usdx, 100_000e6, carol, 0);
     vm.stopPrank();
 
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.usdx, true);
-
     sequencerOracleMock = new SequencerOracle(poolAdmin);
     priceOracleSentinel = new PriceOracleSentinel(
       IPoolAddressesProvider(report.poolAddressesProvider),
@@ -95,9 +83,7 @@ contract PoolBorrowTests is TestnetProcedures {
       unbacked: 0,
       liquidityAdded: 0,
       liquidityTaken: 800e6,
-      totalStableDebt: 0,
-      totalVariableDebt: 800e6,
-      averageStableBorrowRate: 0,
+      totalDebt: 800e6,
       reserveFactor: 1000,
       reserve: tokenList.usdx,
       usingVirtualBalance: contracts
@@ -107,7 +93,7 @@ contract PoolBorrowTests is TestnetProcedures {
       virtualUnderlyingBalance: contracts.poolProxy.getVirtualUnderlyingBalance(tokenList.usdx)
     });
 
-    (, , uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
+    (, uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
 
     vm.expectEmit(true, true, true, true, address(contracts.poolProxy));
     emit Borrow(
@@ -131,19 +117,6 @@ contract PoolBorrowTests is TestnetProcedures {
     assertEq(contracts.poolProxy.getUserConfiguration(alice).isBorrowing(reserveData.id), true);
   }
 
-  function test_stable_borrow() public {
-    uint256 amount = 1e8;
-    uint256 borrowAmount = 800e6;
-    vm.startPrank(alice);
-
-    contracts.poolProxy.supply(tokenList.wbtc, amount, alice, 0);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-
-    contracts.poolProxy.borrow(tokenList.usdx, borrowAmount, 1, 0, alice);
-    vm.stopPrank();
-  }
-
   function test_borrow_variable_in_isolation() public {
     uint256 borrowAmount = 100e6;
     vm.startPrank(poolAdmin);
@@ -157,7 +130,6 @@ contract PoolBorrowTests is TestnetProcedures {
     contracts.poolProxy.setUserUseReserveAsCollateral(tokenList.wbtc, true);
 
     uint256 balanceBefore = usdx.balanceOf(alice);
-    uint256 debtBalanceBefore = staDebtUSDX.principalBalanceOf(alice);
     DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
       tokenList.usdx
     );
@@ -169,9 +141,7 @@ contract PoolBorrowTests is TestnetProcedures {
       unbacked: 0,
       liquidityAdded: 0,
       liquidityTaken: borrowAmount,
-      totalStableDebt: 0,
-      totalVariableDebt: borrowAmount,
-      averageStableBorrowRate: 0,
+      totalDebt: borrowAmount,
       reserveFactor: 1000,
       reserve: tokenList.usdx,
       usingVirtualBalance: contracts
@@ -181,7 +151,7 @@ contract PoolBorrowTests is TestnetProcedures {
       virtualUnderlyingBalance: contracts.poolProxy.getVirtualUnderlyingBalance(tokenList.usdx)
     });
 
-    (, , uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
+    (, uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
 
     vm.expectEmit(address(contracts.poolProxy));
     emit IsolationModeTotalDebtUpdated(tokenList.wbtc, 100_00);
@@ -204,7 +174,7 @@ contract PoolBorrowTests is TestnetProcedures {
     uint256 debtBalanceAfter = varDebtUSDX.scaledBalanceOf(alice);
 
     assertEq(balanceAfter, balanceBefore + borrowAmount);
-    assertEq(debtBalanceAfter, debtBalanceBefore + borrowAmount);
+    assertEq(debtBalanceAfter, borrowAmount);
     assertEq(contracts.poolProxy.getUserConfiguration(alice).isBorrowing(reserveData.id), true);
   }
 
@@ -229,6 +199,18 @@ contract PoolBorrowTests is TestnetProcedures {
     contracts.poolProxy.borrow(tokenList.usdx, borrowAmount, 2, 0, alice);
   }
 
+  function test_reverts_deprecated_stable_borrow() public {
+    uint256 amount = 2000e6;
+    uint256 borrowAmount = 100;
+    vm.startPrank(alice);
+    contracts.poolProxy.supply(tokenList.usdx, amount, alice, 0);
+    contracts.poolProxy.supply(tokenList.wbtc, borrowAmount, bob, 0);
+
+    vm.expectRevert(bytes(Errors.INVALID_INTEREST_RATE_MODE_SELECTED));
+
+    contracts.poolProxy.borrow(tokenList.wbtc, borrowAmount, 1, 0, alice);
+  }
+
   function test_reverts_borrow_invalidAmount() public {
     vm.expectRevert(bytes(Errors.INVALID_AMOUNT));
 
@@ -243,7 +225,7 @@ contract PoolBorrowTests is TestnetProcedures {
     vm.expectRevert(bytes(Errors.RESERVE_INACTIVE));
 
     vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 1, 0, alice);
+    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 2, 0, alice);
   }
 
   function test_reverts_borrow_reservePaused() public {
@@ -253,7 +235,7 @@ contract PoolBorrowTests is TestnetProcedures {
     vm.expectRevert(bytes(Errors.RESERVE_PAUSED));
 
     vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 1, 0, alice);
+    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 2, 0, alice);
   }
 
   function test_reverts_borrow_reserveFrozen() public {
@@ -263,7 +245,7 @@ contract PoolBorrowTests is TestnetProcedures {
     vm.expectRevert(bytes(Errors.RESERVE_FROZEN));
 
     vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 1, 0, alice);
+    contracts.poolProxy.borrow(tokenList.wbtc, 0.2e8, 2, 0, alice);
   }
 
   function test_reverts_borrow_cap() public {
@@ -276,21 +258,7 @@ contract PoolBorrowTests is TestnetProcedures {
 
     vm.expectRevert(bytes(Errors.BORROW_CAP_EXCEEDED));
 
-    contracts.poolProxy.borrow(tokenList.wbtc, 10e8, 1, 0, alice);
-  }
-
-  function test_reverts_borrow_invalid_rate() public {
-    vm.startPrank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 50e8, alice, 0);
-    vm.stopPrank();
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setBorrowCap(tokenList.wbtc, 1);
-
-    vm.expectRevert(bytes(Errors.INVALID_INTEREST_RATE_MODE_SELECTED));
-
-    vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.wbtc, 100, 0, 0, alice);
+    contracts.poolProxy.borrow(tokenList.wbtc, 10e8, 2, 0, alice);
   }
 
   function test_reverts_borrow_sentinel_oracle_down() public {
@@ -312,19 +280,6 @@ contract PoolBorrowTests is TestnetProcedures {
     contracts.poolProxy.borrow(tokenList.wbtc, 100, 2, 0, alice);
   }
 
-  function test_reverts_borrow_stable_borrow_not_enabled() public {
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.usdx, false);
-
-    vm.prank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 50e8, alice, 0);
-
-    vm.expectRevert(bytes(Errors.STABLE_BORROWING_NOT_ENABLED));
-
-    vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.usdx, 100e6, 1, 0, alice);
-  }
-
   function test_reverts_borrow_not_borrowable_isolation() public {
     uint256 borrowAmount = 100e6;
     vm.startPrank(poolAdmin);
@@ -363,15 +318,8 @@ contract PoolBorrowTests is TestnetProcedures {
     EModeCategoryInput memory ct = _genCategoryOne();
 
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct.id, ct.ltv, ct.lt, ct.lb, ct.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct.id, true);
     vm.stopPrank();
 
     vm.startPrank(alice);
@@ -380,7 +328,7 @@ contract PoolBorrowTests is TestnetProcedures {
 
     contracts.poolProxy.supply(tokenList.wbtc, 0.5e8, alice, 0);
 
-    vm.expectRevert(bytes(Errors.INCONSISTENT_EMODE_CATEGORY));
+    vm.expectRevert(bytes(Errors.NOT_BORROWABLE_IN_EMODE));
     contracts.poolProxy.borrow(tokenList.usdx, 10001e6, 2, 0, alice);
     vm.stopPrank();
   }
@@ -389,7 +337,7 @@ contract PoolBorrowTests is TestnetProcedures {
     vm.expectRevert(bytes(Errors.COLLATERAL_BALANCE_IS_ZERO));
 
     vm.prank(alice);
-    contracts.poolProxy.borrow(tokenList.usdx, 0.2e8, 1, 0, alice);
+    contracts.poolProxy.borrow(tokenList.usdx, 0.2e8, 2, 0, alice);
   }
 
   function test_reverts_borrow_collateral_can_not_cover() public {
@@ -425,26 +373,6 @@ contract PoolBorrowTests is TestnetProcedures {
     contracts.poolProxy.borrow(tokenList.usdx, 10001e6, 2, 0, alice);
   }
 
-  function test_reverts_borrow_stable_collateral_same_borrow() public {
-    vm.startPrank(alice);
-
-    contracts.poolProxy.supply(tokenList.usdx, 100e6, alice, 0);
-
-    vm.expectRevert(bytes(Errors.COLLATERAL_SAME_AS_BORROWING_CURRENCY));
-    contracts.poolProxy.borrow(tokenList.usdx, 10e6, 1, 0, alice);
-    vm.stopPrank();
-  }
-
-  function test_reverts_borrow_stable_amount_gt_max_loan_size_stable() public {
-    vm.startPrank(alice);
-
-    contracts.poolProxy.supply(tokenList.wbtc, 100e8, alice, 0);
-
-    vm.expectRevert(bytes(Errors.AMOUNT_BIGGER_THAN_MAX_LOAN_SIZE_STABLE));
-    contracts.poolProxy.borrow(tokenList.usdx, 60_000e6, 1, 0, alice);
-    vm.stopPrank();
-  }
-
   function test_reverts_borrow_sioled_borrowing_violation() public {
     vm.startPrank(carol);
     contracts.poolProxy.supply(tokenList.wbtc, 100e8, carol, 0);
@@ -491,118 +419,4 @@ contract PoolBorrowTests is TestnetProcedures {
     contracts.poolProxy.borrow(tokenList.usdx, 10001e6, 2, 0, alice);
     vm.stopPrank();
   }
-
-  function test_reverts_rebalance_borrow_rate_reserve_inactive() public {
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveActive(tokenList.wbtc, false);
-
-    vm.expectRevert(bytes(Errors.RESERVE_INACTIVE));
-
-    vm.prank(alice);
-    contracts.poolProxy.rebalanceStableBorrowRate(tokenList.wbtc, alice);
-  }
-
-  function test_reverts_rebalance_borrow_rate_reserve_paused() public {
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReservePause(tokenList.wbtc, true, 0);
-
-    vm.expectRevert(bytes(Errors.RESERVE_PAUSED));
-    vm.prank(alice);
-    contracts.poolProxy.rebalanceStableBorrowRate(tokenList.wbtc, alice);
-  }
-
-  function test_reverts_rebalance_borrow_rate_conditions_not_met() public {
-    vm.startPrank(alice);
-
-    contracts.poolProxy.supply(tokenList.wbtc, 1e8, alice, 0);
-    contracts.poolProxy.borrow(tokenList.usdx, 15000e6, 2, 0, alice);
-
-    vm.expectRevert(bytes(Errors.INTEREST_RATE_REBALANCE_CONDITIONS_NOT_MET));
-    contracts.poolProxy.rebalanceStableBorrowRate(tokenList.usdx, alice);
-    vm.stopPrank();
-  }
-
-  function test_rebalance_borrow_rate() public {
-    DataTypes.ReserveDataLegacy memory usdxReserveData = contracts.poolProxy.getReserveData(
-      tokenList.usdx
-    );
-
-    vm.mockCall(
-      address(usdxReserveData.interestRateStrategyAddress),
-      abi.encodeWithSelector(IReserveInterestRateStrategy.calculateInterestRates.selector),
-      abi.encode(0, 0, 0)
-    );
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-
-    contracts.poolProxy.rebalanceStableBorrowRate(tokenList.usdx, alice);
-    vm.clearMockedCalls();
-  }
-
-  function test_swap_borrow_rate_from_variable_to_stable() public {
-    vm.startPrank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 100e8, alice, 0);
-    contracts.poolProxy.borrow(tokenList.usdx, 2000e6, 2, 0, alice);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 2);
-    vm.stopPrank();
-  }
-
-  function test_reverts_swap_borrow_rate_reserve_inactive() public {
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveActive(tokenList.wbtc, false);
-
-    vm.expectRevert(bytes(Errors.RESERVE_INACTIVE));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.wbtc, 1);
-  }
-
-  function test_reverts_swap_borrow_rate_reserve_paused() public {
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReservePause(tokenList.usdx, true, 0);
-
-    vm.expectRevert(bytes(Errors.RESERVE_PAUSED));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 2);
-  }
-
-  function test_swap_borrow_rate_reserve_frozen() public {
-    vm.startPrank(alice);
-    contracts.poolProxy.supply(tokenList.wbtc, 100e8, alice, 0);
-    contracts.poolProxy.borrow(tokenList.usdx, 2000e6, 2, 0, alice);
-    vm.stopPrank();
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveFreeze(tokenList.usdx, true);
-
-    vm.expectRevert(bytes(Errors.OPERATION_NOT_SUPPORTED));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 2);
-  }
-
-  function test_reverts_swap_borrow_rate_reserve_variable_no_debt() public {
-    vm.expectRevert(bytes(Errors.NO_OUTSTANDING_VARIABLE_DEBT));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 2);
-  }
-
-  function test_reverts_swap_borrow_rate_reserve_stable_no_debt() public {
-    vm.expectRevert(bytes(Errors.NO_OUTSTANDING_STABLE_DEBT));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 1);
-  }
-
-  function test_reverts_swap_borrow_rate_reserve_invalid_rate_mode() public {
-    vm.expectRevert(bytes(Errors.INVALID_INTEREST_RATE_MODE_SELECTED));
-
-    vm.prank(alice);
-    contracts.poolProxy.swapBorrowRateMode(tokenList.usdx, 0);
-  }
 }
diff --git a/tests/protocol/pool/Pool.EMode.sol b/tests/protocol/pool/Pool.EMode.sol
new file mode 100644
index 00000000..24c621e9
--- /dev/null
+++ b/tests/protocol/pool/Pool.EMode.sol
@@ -0,0 +1,309 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import 'forge-std/Test.sol';
+import 'forge-std/StdStorage.sol';
+
+import {IPriceOracleGetter} from '../../../src/contracts/interfaces/IPriceOracleGetter.sol';
+import {IAToken, IERC20} from '../../../src/contracts/interfaces/IAToken.sol';
+import {IPool, DataTypes} from '../../../src/contracts/interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {PoolInstance} from '../../../src/contracts/instances/PoolInstance.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ReserveConfiguration} from '../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {PercentageMath} from '../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {IAaveOracle} from '../../../src/contracts/interfaces/IAaveOracle.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+
+contract PoolEModeTests is TestnetProcedures {
+  using stdStorage for StdStorage;
+
+  using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
+  using WadRayMath for uint256;
+  using PercentageMath for uint256;
+
+  event UserEModeSet(address indexed user, uint8 categoryId);
+
+  IPool internal pool;
+
+  function setUp() public virtual {
+    initTestEnvironment(false);
+
+    pool = PoolInstance(report.poolProxy);
+  }
+
+  function test_setUserEMode_shouldRevertForNonExistingEmode() public {
+    vm.prank(alice);
+    vm.expectRevert(bytes(Errors.INCONSISTENT_EMODE_CATEGORY));
+    pool.setUserEMode(1);
+  }
+
+  function test_getUserEMode_shouldReflectEMode() public {
+    vm.startPrank(poolAdmin);
+    EModeCategoryInput memory ct1 = _genCategoryOne();
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, ct1.id, true);
+    vm.stopPrank();
+
+    vm.expectEmit(address(pool));
+    emit UserEModeSet(alice, ct1.id);
+    vm.prank(alice);
+    pool.setUserEMode(ct1.id);
+
+    assertEq(pool.getUserEMode(alice), ct1.id);
+  }
+
+  function test_reenterSameEmode_shouldSucceed() public {
+    test_getUserEMode_shouldReflectEMode();
+
+    assertEq(pool.getUserEMode(alice), 1);
+    vm.prank(alice);
+    pool.setUserEMode(1);
+    assertEq(pool.getUserEMode(alice), 1);
+  }
+
+  function test_getUserAccountData_shouldReflectEmodeParams() public {
+    vm.startPrank(poolAdmin);
+    EModeCategoryInput memory ct1 = _genCategoryOne();
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, ct1.id, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(ct1.id);
+    // supply some dust so the eMode asset is the only collateral
+    _mintTestnetToken(tokenList.usdx, alice, 1);
+    _supplyToPool(tokenList.usdx, alice, 1);
+
+    (, , , uint256 emodeLT, uint256 emodeLTV, ) = contracts.poolProxy.getUserAccountData(alice);
+    assertEq(emodeLT, ct1.lt);
+    assertEq(emodeLTV, ct1.ltv);
+
+    vm.prank(alice);
+    pool.setUserEMode(0);
+    (, uint256 assetBaseLTV, uint256 assetBaseLT, , , , , , , ) = contracts
+      .protocolDataProvider
+      .getReserveConfigurationData(tokenList.usdx);
+    (, , , uint256 baseLT, uint256 baseLTV, ) = contracts.poolProxy.getUserAccountData(alice);
+    assertEq(assetBaseLTV, baseLTV);
+    assertEq(assetBaseLT, baseLT);
+  }
+
+  function test_getUserAccountData_shouldReflectMixedCollateral() public {
+    vm.startPrank(poolAdmin);
+    EModeCategoryInput memory ct1 = _genCategoryOne();
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, ct1.id, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(ct1.id);
+    // supply some dust so the eMode asset is the only collateral
+    _mintTestnetToken(tokenList.usdx, alice, 1e6);
+    _supplyToPool(tokenList.usdx, alice, 1e6);
+    // supply some non eMode asset
+    _mintTestnetToken(tokenList.wbtc, alice, 1e8);
+    _supplyToPool(tokenList.wbtc, alice, 1e8);
+
+    (, , , uint256 realLT, uint256 realLTV, ) = contracts.poolProxy.getUserAccountData(alice);
+    assertLt(realLT, ct1.lt);
+    assertLt(realLTV, ct1.ltv);
+  }
+
+  function test_setUserEMode_shouldAllowSwitchingIfNoBorrows(uint8 eMode) public {
+    uint256 AVAILABLE_EMODES = 2;
+    EModeCategoryInput memory ct1 = _genCategoryOne();
+    EModeCategoryInput memory ct2 = _genCategoryTwo();
+    vm.startPrank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct2.id, ct2.ltv, ct2.lt, ct2.lb, ct2.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct2.id, true);
+    vm.stopPrank();
+
+    eMode = uint8(bound(eMode, 0, AVAILABLE_EMODES));
+    vm.prank(alice);
+    pool.setUserEMode(eMode);
+    eMode = uint8(bound(eMode + 1, 0, AVAILABLE_EMODES));
+    vm.prank(alice);
+    pool.setUserEMode(eMode);
+    assertEq(pool.getUserEMode(alice), eMode);
+  }
+
+  function test_setUserEmode_shouldAllowSwitchingWhenAssetIsBorrowableInEmode(
+    uint104 amount
+  ) public {
+    amount = uint104(bound(amount, 1 ether, type(uint104).max));
+    vm.startPrank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 9000, 9200, 10050, 'usdx eMode low');
+    contracts.poolConfiguratorProxy.setEModeCategory(2, 9000, 9700, 10050, 'usdx eMode high');
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 1, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 2, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 1, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 2, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(1);
+    _mintTestnetToken(tokenList.usdx, alice, amount);
+    _supplyToPool(tokenList.usdx, alice, amount);
+    _borrowMaxLt(tokenList.wbtc, alice);
+
+    (, , , , , uint256 hfBefore) = contracts.poolProxy.getUserAccountData(alice);
+    vm.prank(alice);
+    pool.setUserEMode(2);
+    (, , , , , uint256 hfAfter) = contracts.poolProxy.getUserAccountData(alice);
+    assertLt(hfBefore, hfAfter);
+  }
+
+  function test_setUserEmode_shouldRevertIfHfWouldFallBelow1(uint104 amount) public {
+    amount = uint104(bound(amount, 1 ether, type(uint104).max));
+    vm.startPrank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 9000, 9200, 10050, 'usdx eMode low');
+    contracts.poolConfiguratorProxy.setEModeCategory(2, 9000, 9700, 10050, 'usdx eMode high');
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 1, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 2, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 1, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 2, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(2);
+    _mintTestnetToken(tokenList.usdx, alice, amount);
+    _supplyToPool(tokenList.usdx, alice, amount);
+    _borrowMaxLt(tokenList.wbtc, alice);
+
+    vm.prank(alice);
+    vm.expectRevert(bytes(Errors.HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD));
+    pool.setUserEMode(1);
+  }
+
+  function test_setUserEmode_shouldRevertIfAssetNoLongerBorrowable(uint104 amount) public {
+    amount = uint104(bound(amount, 1 ether, type(uint104).max));
+    vm.startPrank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 9000, 9200, 10050, 'usdx eMode low');
+    contracts.poolConfiguratorProxy.setEModeCategory(2, 9000, 9700, 10050, 'usdx eMode high');
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 1, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 2, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 1, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(1);
+    _mintTestnetToken(tokenList.usdx, alice, amount);
+    _supplyToPool(tokenList.usdx, alice, amount);
+    _borrowMaxLt(tokenList.wbtc, alice);
+
+    vm.prank(alice);
+    vm.expectRevert(bytes(Errors.NOT_BORROWABLE_IN_EMODE));
+    pool.setUserEMode(2);
+  }
+
+  function test_borrowing_shouldRevert_ifNonBorrowableOutsideEmode(uint256 amount) public {
+    amount = bound(amount, 1 ether, type(uint104).max);
+    vm.startPrank(poolAdmin);
+    uint16 liquidationBonus = 10050;
+    contracts.poolConfiguratorProxy.setEModeCategory(
+      1,
+      9000,
+      9200,
+      liquidationBonus,
+      'usdx eMode low'
+    );
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 1, true);
+    contracts.poolConfiguratorProxy.setReserveBorrowing(tokenList.wbtc, false);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 1, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(1);
+    _mintTestnetToken(tokenList.usdx, alice, amount);
+    _supplyToPool(tokenList.usdx, alice, amount);
+
+    vm.prank(alice);
+    vm.expectRevert(bytes(Errors.BORROWING_NOT_ENABLED));
+    contracts.poolProxy.borrow(tokenList.wbtc, 1, 2, 0, alice);
+  }
+
+  function test_liquidations_shouldApplyEModeLBForEmodeAssets(uint256 amount) public {
+    amount = bound(amount, 1 ether, type(uint104).max);
+    vm.startPrank(poolAdmin);
+    uint16 liquidationBonus = 10050;
+    contracts.poolConfiguratorProxy.setEModeCategory(
+      1,
+      9000,
+      9200,
+      liquidationBonus,
+      'usdx eMode low'
+    );
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, 1, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, 1, true);
+    vm.stopPrank();
+
+    vm.prank(alice);
+    pool.setUserEMode(1);
+    _mintTestnetToken(tokenList.usdx, alice, amount);
+    _supplyToPool(tokenList.usdx, alice, amount);
+    (uint256 totalCollateralBase, , , , , ) = contracts.poolProxy.getUserAccountData(alice);
+    uint256 debtPrice = contracts.aaveOracle.getAssetPrice(tokenList.wbtc);
+    uint256 borrowAmount = (totalCollateralBase * 1e8) / debtPrice;
+    _borrowArbitraryAmount(tokenList.wbtc, alice, borrowAmount);
+
+    address liquidator = address(0x0f0f0f);
+    _mintTestnetToken(tokenList.wbtc, liquidator, borrowAmount);
+    vm.startPrank(liquidator);
+    IERC20(tokenList.wbtc).approve(address(contracts.poolProxy), borrowAmount);
+    contracts.poolProxy.liquidationCall(
+      tokenList.usdx,
+      tokenList.wbtc,
+      alice,
+      type(uint256).max,
+      false
+    );
+
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    uint256 bonus = amount - amount.percentDiv(liquidationBonus);
+    uint256 protocolFee = bonus.percentMul(reserveData.configuration.getLiquidationProtocolFee());
+    assertEq(IERC20(tokenList.usdx).balanceOf(liquidator), amount - protocolFee);
+  }
+
+  function _mintTestnetToken(address erc20, address user, uint256 amount) internal {
+    vm.prank(poolAdmin);
+    TestnetERC20(erc20).mint(user, amount);
+  }
+
+  function _supplyToPool(address erc20, address user, uint256 amount) internal {
+    vm.startPrank(user);
+    IERC20(erc20).approve(address(contracts.poolProxy), amount);
+    contracts.poolProxy.supply(erc20, amount, user, 0);
+    vm.stopPrank();
+  }
+
+  function _borrowMaxLt(address erc20, address user) internal {
+    (uint256 totalCollateralBase, , , uint256 currentLt, , ) = contracts
+      .poolProxy
+      .getUserAccountData(user);
+    uint256 maxBorrowInBase = (totalCollateralBase * currentLt) / 1e4;
+    uint256 debtPrice = contracts.aaveOracle.getAssetPrice(erc20);
+    uint256 borrowAmount = (maxBorrowInBase / debtPrice) * 10 ** TestnetERC20(erc20).decimals();
+    _borrowArbitraryAmount(erc20, user, borrowAmount);
+  }
+
+  function _borrowArbitraryAmount(address erc20, address user, uint256 amount) internal {
+    _mintTestnetToken(erc20, bob, amount); // todo: better not bob
+    _supplyToPool(erc20, bob, amount);
+
+    vm.mockCall(
+      address(contracts.aaveOracle),
+      abi.encodeWithSelector(IPriceOracleGetter.getAssetPrice.selector, address(erc20)),
+      abi.encode(0)
+    );
+    vm.prank(user);
+    contracts.poolProxy.borrow(erc20, amount, 2, 0, user);
+    vm.clearMockedCalls();
+  }
+}
diff --git a/tests/core/Pool.FlashLoans.t.sol b/tests/protocol/pool/Pool.FlashLoans.t.sol
similarity index 88%
rename from tests/core/Pool.FlashLoans.t.sol
rename to tests/protocol/pool/Pool.FlashLoans.t.sol
index 60985f9f..d30f87a5 100644
--- a/tests/core/Pool.FlashLoans.t.sol
+++ b/tests/protocol/pool/Pool.FlashLoans.t.sol
@@ -3,20 +3,20 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {FlashLoanLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/FlashLoanLogic.sol';
-import {BorrowLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {MockFlashLoanReceiver} from 'aave-v3-core/contracts/mocks/flashloan/MockFlashLoanReceiver.sol';
-import {MockFlashLoanSimpleReceiver} from 'aave-v3-core/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {MockFlashLoanATokenReceiver} from '../mocks/MockFlashLoanATokenReceiver.sol';
-import {TestnetProcedures, TestReserveConfig} from '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {ReserveConfiguration} from '../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {FlashLoanLogic} from '../../../src/contracts/protocol/libraries/logic/FlashLoanLogic.sol';
+import {BorrowLogic} from '../../../src/contracts/protocol/libraries/logic/BorrowLogic.sol';
+import {PercentageMath} from '../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {MockFlashLoanReceiver} from '../../../src/contracts/mocks/flashloan/MockFlashLoanReceiver.sol';
+import {MockFlashLoanSimpleReceiver} from '../../../src/contracts/mocks/flashloan/MockSimpleFlashLoanReceiver.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {IERC20} from '../../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {MockFlashLoanATokenReceiver} from '../../mocks/MockFlashLoanATokenReceiver.sol';
+import {TestnetProcedures, TestReserveConfig} from '../../utils/TestnetProcedures.sol';
 
 contract PoolFlashLoansTests is TestnetProcedures {
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
@@ -419,6 +419,27 @@ contract PoolFlashLoansTests is TestnetProcedures {
     );
   }
 
+  function test_revert_flashloan_borrow_stable() public {
+    (
+      address[] memory assets,
+      uint256[] memory amounts,
+      uint256[] memory modes,
+      bytes memory emptyParams
+    ) = _defaultInput(false, 1);
+
+    vm.prank(alice);
+    vm.expectRevert(bytes(Errors.INVALID_INTEREST_RATE_MODE_SELECTED));
+    contracts.poolProxy.flashLoan(
+      address(mockFlashReceiver),
+      assets,
+      amounts,
+      modes,
+      alice,
+      emptyParams,
+      0
+    );
+  }
+
   function _defaultInput()
     internal
     returns (address[] memory, uint256[] memory, uint256[] memory, bytes memory)
@@ -438,13 +459,12 @@ contract PoolFlashLoansTests is TestnetProcedures {
     assets[0] = tokenList.usdx;
     amounts[0] = 12e6;
     modes[0] = mode;
+    for (uint8 x; x < assets.length; x++) {
+      vm.prank(poolAdmin);
+      TestnetERC20(assets[x]).transferOwnership(address(mockFlashReceiver));
+    }
 
     if (checkEvents) {
-      for (uint8 x; x < assets.length; x++) {
-        vm.prank(poolAdmin);
-        TestnetERC20(assets[x]).transferOwnership(address(mockFlashReceiver));
-      }
-
       _checkFlashLoanEvents(assets, amounts, modes);
     }
     return (assets, amounts, modes, emptyParams);
@@ -493,7 +513,7 @@ contract PoolFlashLoansTests is TestnetProcedures {
           alice,
           amounts[x],
           DataTypes.InterestRateMode(modes[x]),
-          _calculateInterestRates(amounts[x], modes[x], assets[x]),
+          _calculateInterestRates(amounts[x], assets[x]),
           0
         );
       }
diff --git a/tests/core/Pool.Liquidations.t.sol b/tests/protocol/pool/Pool.Liquidations.t.sol
similarity index 88%
rename from tests/core/Pool.Liquidations.t.sol
rename to tests/protocol/pool/Pool.Liquidations.t.sol
index 65391f74..66dfc23e 100644
--- a/tests/core/Pool.Liquidations.t.sol
+++ b/tests/protocol/pool/Pool.Liquidations.t.sol
@@ -3,23 +3,22 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IStableDebtToken} from 'aave-v3-core/contracts/interfaces/IStableDebtToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {ReserveLogic, IERC20} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {PriceOracleSentinel} from 'aave-v3-core/contracts/protocol/configuration/PriceOracleSentinel.sol';
-import {SequencerOracle, ISequencerOracle} from 'aave-v3-core/contracts/mocks/oracle/SequencerOracle.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
-import {LiquidationLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/LiquidationLogic.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IVariableDebtToken} from '../../../src/contracts/interfaces/IVariableDebtToken.sol';
+import {IAaveOracle} from '../../../src/contracts/interfaces/IAaveOracle.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {UserConfiguration} from '../../../src/contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {ReserveLogic, IERC20} from '../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {ReserveConfiguration} from '../../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {PriceOracleSentinel} from '../../../src/contracts/misc/PriceOracleSentinel.sol';
+import {SequencerOracle, ISequencerOracle} from '../../../src/contracts/mocks/oracle/SequencerOracle.sol';
+import {MockAggregator} from '../../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {LiquidationLogic} from '../../../src/contracts/protocol/libraries/logic/LiquidationLogic.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {PercentageMath} from '../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract PoolLiquidationTests is TestnetProcedures {
   using stdStorage for StdStorage;
@@ -31,7 +30,6 @@ contract PoolLiquidationTests is TestnetProcedures {
   using ReserveLogic for DataTypes.ReserveCache;
   using ReserveLogic for DataTypes.ReserveData;
 
-  IStableDebtToken internal staDebtUSDX;
   IVariableDebtToken internal varDebtUSDX;
   address internal aUSDX;
 
@@ -45,11 +43,10 @@ contract PoolLiquidationTests is TestnetProcedures {
   function setUp() public {
     initTestEnvironment();
 
-    (address atoken, address stableDebtUSDX, address variableDebtUSDX) = contracts
+    (address atoken, , address variableDebtUSDX) = contracts
       .protocolDataProvider
       .getReserveTokensAddresses(tokenList.usdx);
     aUSDX = atoken;
-    staDebtUSDX = IStableDebtToken(stableDebtUSDX);
     varDebtUSDX = IVariableDebtToken(variableDebtUSDX);
 
     vm.startPrank(carol);
@@ -57,9 +54,6 @@ contract PoolLiquidationTests is TestnetProcedures {
     contracts.poolProxy.supply(tokenList.weth, 100e18, carol, 0);
     vm.stopPrank();
 
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.usdx, true);
-
     sequencerOracleMock = new SequencerOracle(poolAdmin);
     priceOracleSentinel = new PriceOracleSentinel(
       IPoolAddressesProvider(report.poolAddressesProvider),
@@ -621,16 +615,10 @@ contract PoolLiquidationTests is TestnetProcedures {
     EModeCategoryInput memory ct = _genCategoryOne();
 
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct.id);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct.id, ct.ltv, ct.lt, ct.lb, ct.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct.id, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.weth, ct.id, true);
     vm.stopPrank();
 
     uint256 amount = 1e8;
@@ -690,80 +678,6 @@ contract PoolLiquidationTests is TestnetProcedures {
     _afterLiquidationChecksVariable(params, bob, liquidatorBalanceBefore, userDebtBefore);
   }
 
-  function test_liquidate_emode_position_with_emode_oracle() public {
-    EModeCategoryInput memory ct = _genCategoryOne();
-
-    vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      tokenList.wbtc,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct.id);
-    vm.stopPrank();
-
-    uint256 amount = 1e8;
-    uint256 borrowAmount = 0.94e18;
-
-    vm.startPrank(alice);
-    contracts.poolProxy.setUserEMode(ct.id);
-
-    contracts.poolProxy.supply(tokenList.wbtc, amount, alice, 0);
-    contracts.poolProxy.borrow(tokenList.weth, borrowAmount, 2, 0, alice);
-    vm.stopPrank();
-
-    vm.warp(block.timestamp + 20000 days);
-
-    LiquidationInput memory params = _loadLiquidationInput(
-      alice,
-      tokenList.wbtc,
-      tokenList.weth,
-      UINT256_MAX,
-      tokenList.wbtc,
-      0
-    );
-    (, , address varDebtToken) = contracts.protocolDataProvider.getReserveTokensAddresses(
-      params.debtAsset
-    );
-    uint256 userDebtBefore = IERC20(varDebtToken).balanceOf(params.user);
-    uint256 liquidatorBalanceBefore;
-    if (params.receiveAToken) {
-      (address atoken, , ) = contracts.protocolDataProvider.getReserveTokensAddresses(
-        params.collateralAsset
-      );
-      liquidatorBalanceBefore = IERC20(atoken).balanceOf(bob);
-    } else {
-      liquidatorBalanceBefore = IERC20(params.collateralAsset).balanceOf(bob);
-    }
-
-    vm.expectEmit(address(contracts.poolProxy));
-    emit LiquidationLogic.LiquidationCall(
-      params.collateralAsset,
-      params.debtAsset,
-      params.user,
-      params.actualDebtToLiquidate,
-      params.actualCollateralToLiquidate,
-      bob,
-      params.receiveAToken
-    );
-
-    // Liquidate
-    vm.prank(bob);
-    contracts.poolProxy.liquidationCall(
-      params.collateralAsset,
-      params.debtAsset,
-      params.user,
-      params.liquidationAmountInput,
-      params.receiveAToken
-    );
-
-    _afterLiquidationChecksVariable(params, bob, liquidatorBalanceBefore, userDebtBefore);
-  }
-
   function _loadLiquidationInput(
     address user,
     address collateralAsset,
@@ -1095,12 +1009,10 @@ contract PoolLiquidationTests is TestnetProcedures {
   ) internal view returns (uint256, address, address) {
     uint256 id = contracts.poolProxy.getUserEMode(user);
     if (id != 0) {
-      DataTypes.EModeCategory memory cat = contracts.poolProxy.getEModeCategoryData(uint8(id));
-      if (cat.priceSource != address(0)) {
-        return (cat.liquidationBonus, cat.priceSource, cat.priceSource);
-      } else {
-        return (cat.liquidationBonus, collateralAsset, debtAsset);
-      }
+      DataTypes.CollateralConfig memory cfg = contracts.poolProxy.getEModeCategoryCollateralConfig(
+        uint8(id)
+      );
+      return (cfg.liquidationBonus, collateralAsset, debtAsset);
     } else {
       DataTypes.ReserveConfigurationMap memory conf = contracts.poolProxy.getConfiguration(
         debtAsset
@@ -1152,11 +1064,9 @@ contract PoolLiquidationTests is TestnetProcedures {
     tempReserveData.currentLiquidityRate = reserveDataLegacy.currentLiquidityRate;
     tempReserveData.variableBorrowIndex = reserveDataLegacy.variableBorrowIndex;
     tempReserveData.currentVariableBorrowRate = reserveDataLegacy.currentVariableBorrowRate;
-    tempReserveData.currentStableBorrowRate = reserveDataLegacy.currentStableBorrowRate;
     tempReserveData.lastUpdateTimestamp = reserveDataLegacy.lastUpdateTimestamp;
     tempReserveData.id = reserveDataLegacy.id;
     tempReserveData.aTokenAddress = reserveDataLegacy.aTokenAddress;
-    tempReserveData.stableDebtTokenAddress = reserveDataLegacy.stableDebtTokenAddress;
     tempReserveData.variableDebtTokenAddress = reserveDataLegacy.variableDebtTokenAddress;
     tempReserveData.interestRateStrategyAddress = reserveDataLegacy.interestRateStrategyAddress;
     tempReserveData.accruedToTreasury = reserveDataLegacy.accruedToTreasury;
diff --git a/tests/core/Pool.Repay.t.sol b/tests/protocol/pool/Pool.Repay.t.sol
similarity index 92%
rename from tests/core/Pool.Repay.t.sol
rename to tests/protocol/pool/Pool.Repay.t.sol
index 25530d81..84a39ccb 100644
--- a/tests/core/Pool.Repay.t.sol
+++ b/tests/protocol/pool/Pool.Repay.t.sol
@@ -3,24 +3,22 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IStableDebtToken} from 'aave-v3-core/contracts/interfaces/IStableDebtToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {ISequencerOracle} from 'aave-v3-core/contracts/interfaces/ISequencerOracle.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {UserConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/UserConfiguration.sol';
-import {PriceOracleSentinel} from 'aave-v3-core/contracts/protocol/configuration/PriceOracleSentinel.sol';
-import {SequencerOracle} from 'aave-v3-core/contracts/mocks/oracle/SequencerOracle.sol';
-import {BorrowLogic, IERC20} from 'aave-v3-core/contracts/protocol/libraries/logic/BorrowLogic.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
+import {IVariableDebtToken} from '../../../src/contracts/interfaces/IVariableDebtToken.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {ISequencerOracle} from '../../../src/contracts/interfaces/ISequencerOracle.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {UserConfiguration} from '../../../src/contracts/protocol/libraries/configuration/UserConfiguration.sol';
+import {PriceOracleSentinel} from '../../../src/contracts/misc/PriceOracleSentinel.sol';
+import {SequencerOracle} from '../../../src/contracts/mocks/oracle/SequencerOracle.sol';
+import {BorrowLogic, IERC20} from '../../../src/contracts/protocol/libraries/logic/BorrowLogic.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
 
 contract PoolRepayTests is TestnetProcedures {
   using UserConfiguration for DataTypes.UserConfigurationMap;
 
-  IStableDebtToken internal staDebtUSDX;
   IVariableDebtToken internal varDebtUSDX;
   address internal aUSDX;
 
@@ -32,20 +30,16 @@ contract PoolRepayTests is TestnetProcedures {
   function setUp() public {
     initTestEnvironment();
 
-    (address atoken, address stableDebtUSDX, address variableDebtUSDX) = contracts
+    (address atoken, , address variableDebtUSDX) = contracts
       .protocolDataProvider
       .getReserveTokensAddresses(tokenList.usdx);
     aUSDX = atoken;
-    staDebtUSDX = IStableDebtToken(stableDebtUSDX);
     varDebtUSDX = IVariableDebtToken(variableDebtUSDX);
 
     vm.startPrank(carol);
     contracts.poolProxy.supply(tokenList.usdx, 100_000e6, carol, 0);
     vm.stopPrank();
 
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.usdx, true);
-
     sequencerOracleMock = new SequencerOracle(poolAdmin);
     priceOracleSentinel = new PriceOracleSentinel(
       IPoolAddressesProvider(report.poolAddressesProvider),
@@ -94,6 +88,20 @@ contract PoolRepayTests is TestnetProcedures {
     );
   }
 
+  function test_revert_repay_full_stable_borrow() public {
+    uint256 amount = 2000e6;
+    uint256 borrowAmount = 800e6;
+    vm.startPrank(alice);
+
+    contracts.poolProxy.supply(tokenList.usdx, amount, alice, 0);
+    contracts.poolProxy.borrow(tokenList.usdx, borrowAmount, 2, 0, alice);
+    vm.warp(block.timestamp + 10 days);
+
+    vm.expectRevert(bytes(Errors.INVALID_INTEREST_RATE_MODE_SELECTED));
+    contracts.poolProxy.repay(tokenList.usdx, UINT256_MAX, 1, alice);
+    vm.stopPrank();
+  }
+
   function test_repayWithATokens_full_variable_borrow() public {
     uint256 amount = 2000e6;
     uint256 borrowAmount = 800e6;
diff --git a/tests/core/Pool.Supply.t.sol b/tests/protocol/pool/Pool.Supply.t.sol
similarity index 95%
rename from tests/core/Pool.Supply.t.sol
rename to tests/protocol/pool/Pool.Supply.t.sol
index 507c4da9..12cc4135 100644
--- a/tests/core/Pool.Supply.t.sol
+++ b/tests/protocol/pool/Pool.Supply.t.sol
@@ -3,12 +3,12 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IAToken, IERC20} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetERC20, IERC20WithPermit} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
+import {IPool} from '../../../src/contracts/interfaces/IPool.sol';
+import {IAToken, IERC20} from '../../../src/contracts/interfaces/IAToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetERC20, IERC20WithPermit} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
 
 contract PoolSupplyTests is TestnetProcedures {
   IPool internal pool;
diff --git a/tests/core/Pool.Withdraw.t.sol b/tests/protocol/pool/Pool.Withdraw.t.sol
similarity index 97%
rename from tests/core/Pool.Withdraw.t.sol
rename to tests/protocol/pool/Pool.Withdraw.t.sol
index bb5fc57f..05598338 100644
--- a/tests/core/Pool.Withdraw.t.sol
+++ b/tests/protocol/pool/Pool.Withdraw.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken, IERC20} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAToken, IERC20} from '../../../src/contracts/interfaces/IAToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract PoolWithdrawTests is TestnetProcedures {
   address internal aUSDX;
diff --git a/tests/core/Pool.t.sol b/tests/protocol/pool/Pool.t.sol
similarity index 86%
rename from tests/core/Pool.t.sol
rename to tests/protocol/pool/Pool.t.sol
index 3f982b2b..6aec766a 100644
--- a/tests/core/Pool.t.sol
+++ b/tests/protocol/pool/Pool.t.sol
@@ -4,15 +4,15 @@ pragma solidity ^0.8.0;
 import 'forge-std/Test.sol';
 import 'forge-std/StdStorage.sol';
 
-import {IAToken, IERC20} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {IPool, DataTypes} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {PoolInstance} from 'aave-v3-core/instances/PoolInstance.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAToken, IERC20} from '../../../src/contracts/interfaces/IAToken.sol';
+import {IPool, DataTypes} from '../../../src/contracts/interfaces/IPool.sol';
+import {IPoolAddressesProvider} from '../../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {PoolInstance} from '../../../src/contracts/instances/PoolInstance.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ReserveConfiguration} from '../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {IAaveOracle} from '../../../src/contracts/interfaces/IAaveOracle.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract PoolTests is TestnetProcedures {
   using stdStorage for StdStorage;
@@ -60,12 +60,6 @@ contract PoolTests is TestnetProcedures {
     bool useATokens
   );
 
-  event SwapBorrowRateMode(
-    address indexed reserve,
-    address indexed user,
-    DataTypes.InterestRateMode interestRateMode
-  );
-
   event IsolationModeTotalDebtUpdated(address indexed asset, uint256 totalDebt);
 
   event UserEModeSet(address indexed user, uint8 categoryId);
@@ -74,8 +68,6 @@ contract PoolTests is TestnetProcedures {
 
   event ReserveUsedAsCollateralDisabled(address indexed reserve, address indexed user);
 
-  event RebalanceStableBorrowRate(address indexed reserve, address indexed user);
-
   event FlashLoan(
     address indexed target,
     address initiator,
@@ -116,7 +108,6 @@ contract PoolTests is TestnetProcedures {
     p.initialize(IPoolAddressesProvider(report.poolAddressesProvider));
 
     // Default values after deployment and initialized
-    assertEq(p.MAX_STABLE_RATE_BORROW_SIZE_PERCENT(), 2500);
     assertEq(p.MAX_NUMBER_RESERVES(), 128);
     assertEq(address(p.ADDRESSES_PROVIDER()), report.poolAddressesProvider);
     assertEq(p.FLASHLOAN_PREMIUM_TOTAL(), 0);
@@ -129,7 +120,7 @@ contract PoolTests is TestnetProcedures {
 
     vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
     vm.prank(caller);
-    pool.initReserve(address(0), address(0), address(0), address(0), address(0));
+    pool.initReserve(address(0), address(0), address(0), address(0));
   }
 
   function test_setUserUseReserveAsCollateral_false() public {
@@ -248,10 +239,10 @@ contract PoolTests is TestnetProcedures {
 
     DataTypes.ReserveConfigurationMap memory configuration;
 
-    DataTypes.EModeCategory memory category;
+    DataTypes.EModeCategoryBaseConfiguration memory category;
 
     vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
-    pool.initReserve(address(0), address(0), address(0), address(0), address(0));
+    pool.initReserve(address(0), address(0), address(0), address(0));
 
     vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_CONFIGURATOR));
     pool.dropReserve(address(0));
@@ -283,7 +274,7 @@ contract PoolTests is TestnetProcedures {
       tokenList.usdx
     );
     assertTrue(pA != address(0));
-    assertTrue(pS != address(0));
+    assertTrue(pS == address(0));
     assertTrue(pV != address(0));
 
     vm.prank(report.poolConfiguratorProxy);
@@ -301,7 +292,7 @@ contract PoolTests is TestnetProcedures {
       uint256 reserveFactor,
       bool usageAsCollateralEnabled,
       bool borrowingEnabled,
-      bool stableBorrowRateEnabled,
+      ,
       bool isActive,
       bool isFrozen
     ) = contracts.protocolDataProvider.getReserveConfigurationData(tokenList.usdx);
@@ -316,7 +307,6 @@ contract PoolTests is TestnetProcedures {
     assertEq(reserveFactor, 0);
     assertEq(usageAsCollateralEnabled, false);
     assertEq(borrowingEnabled, false);
-    assertEq(stableBorrowRateEnabled, false);
     assertEq(isActive, false);
     assertEq(isFrozen, false);
   }
@@ -375,7 +365,7 @@ contract PoolTests is TestnetProcedures {
     address strategy
   ) public {
     address[] memory listedAssets = contracts.poolProxy.getReservesList();
-    for (uint i = 0; i < listedAssets.length; i++) {
+    for (uint256 i = 0; i < listedAssets.length; i++) {
       vm.assume(asset != listedAssets[i]);
     }
 
@@ -505,16 +495,9 @@ contract PoolTests is TestnetProcedures {
   function test_setUserEmode() public {
     EModeCategoryInput memory ct = _genCategoryOne();
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct.id,
-      ct.ltv,
-      ct.lt,
-      ct.lb,
-      ct.oracle,
-      ct.label
-    );
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct.id);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct.id, ct.ltv, ct.lt, ct.lb, ct.label);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct.id, true);
     vm.stopPrank();
     vm.expectEmit(address(contracts.poolProxy));
     emit UserEModeSet(alice, ct.id);
@@ -527,27 +510,13 @@ contract PoolTests is TestnetProcedures {
     EModeCategoryInput memory ct1 = _genCategoryOne();
     EModeCategoryInput memory ct2 = _genCategoryTwo();
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct1.id,
-      ct1.ltv,
-      ct1.lt,
-      ct1.lb,
-      ct1.oracle,
-      ct1.label
-    );
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct2.id,
-      ct2.ltv,
-      ct2.lt,
-      ct2.lb,
-      ct2.oracle,
-      ct2.label
-    );
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct2.id, ct2.ltv, ct2.lt, ct2.lb, ct2.label);
 
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct1.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct1.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct2.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct2.id);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct2.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, ct2.id, true);
     vm.stopPrank();
 
     vm.expectEmit(address(contracts.poolProxy));
@@ -572,27 +541,14 @@ contract PoolTests is TestnetProcedures {
     EModeCategoryInput memory ct1 = _genCategoryOne();
     EModeCategoryInput memory ct2 = _genCategoryTwo();
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct1.id,
-      ct1.ltv,
-      ct1.lt,
-      ct1.lb,
-      ct1.oracle,
-      ct1.label
-    );
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct2.id,
-      ct2.ltv,
-      ct2.lt,
-      ct2.lb,
-      ct2.oracle,
-      ct2.label
-    );
-
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct1.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct1.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct2.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.usdx, ct2.id);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct2.id, ct2.ltv, ct2.lt, ct2.lb, ct2.label);
+
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.weth, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct2.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, ct2.id, true);
     vm.stopPrank();
 
     vm.expectEmit(address(contracts.poolProxy));
@@ -607,7 +563,7 @@ contract PoolTests is TestnetProcedures {
     pool.supply(tokenList.wbtc, amount, alice, 0);
     pool.borrow(tokenList.weth, borrowAmount, 2, 0, alice);
 
-    vm.expectRevert(bytes(Errors.INCONSISTENT_EMODE_CATEGORY));
+    vm.expectRevert(bytes(Errors.NOT_BORROWABLE_IN_EMODE));
 
     pool.setUserEMode(ct2.id);
     vm.stopPrank();
@@ -621,17 +577,11 @@ contract PoolTests is TestnetProcedures {
 
     EModeCategoryInput memory ct1 = _genCategoryOne();
     vm.startPrank(poolAdmin);
-    contracts.poolConfiguratorProxy.setEModeCategory(
-      ct1.id,
-      ct1.ltv,
-      ct1.lt,
-      ct1.lb,
-      address(0),
-      ct1.label
-    );
+    contracts.poolConfiguratorProxy.setEModeCategory(ct1.id, ct1.ltv, ct1.lt, ct1.lb, ct1.label);
 
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.wbtc, ct1.id);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(tokenList.weth, ct1.id);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.weth, ct1.id, true);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.weth, ct1.id, true);
     vm.stopPrank();
 
     vm.prank(alice);
diff --git a/tests/core/PoolConfigurator.ACLModifiers.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.ACLModifiers.t.sol
similarity index 88%
rename from tests/core/PoolConfigurator.ACLModifiers.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.ACLModifiers.t.sol
index 4a20bb75..e3dfdfe3 100644
--- a/tests/core/PoolConfigurator.ACLModifiers.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.ACLModifiers.t.sol
@@ -3,17 +3,22 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ConfiguratorInputTypes} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ConfiguratorInputTypes} from '../../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {TestnetProcedures, TestVars} from '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
   function setUp() public {
     initTestEnvironment();
   }
 
-  function test_reverts_notAdmin_initReserves(address caller) public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input;
+  function test_reverts_notAdmin_initReserves(TestVars memory t, address caller) public {
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
+      report,
+      poolAdmin,
+      true
+    );
     vm.assume(
       !contracts.aclManager.isPoolAdmin(caller) &&
         !contracts.aclManager.isAssetListingAdmin(caller) &&
@@ -64,19 +69,6 @@ contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
     contracts.poolConfiguratorProxy.updateVariableDebtToken(input);
   }
 
-  function test_reverts_notAdmin_updateStableDebtToken(address caller) public {
-    ConfiguratorInputTypes.UpdateDebtTokenInput memory input;
-    vm.assume(
-      !contracts.aclManager.isPoolAdmin(caller) &&
-        caller != address(contracts.poolAddressesProvider)
-    );
-
-    vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_ADMIN));
-
-    vm.prank(caller);
-    contracts.poolConfiguratorProxy.updateStableDebtToken(input);
-  }
-
   function test_reverts_notAdmin_setReserveActive(address caller) public {
     vm.assume(
       !contracts.aclManager.isPoolAdmin(caller) &&
@@ -139,19 +131,6 @@ contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
     contracts.poolConfiguratorProxy.configureReserveAsCollateral(address(0), 1, 1, 1);
   }
 
-  function test_reverts_notRiskAdmin_setReserveStableRateBorrowing(address caller) public {
-    vm.assume(
-      !contracts.aclManager.isPoolAdmin(caller) &&
-        !contracts.aclManager.isRiskAdmin(caller) &&
-        caller != address(contracts.poolAddressesProvider)
-    );
-
-    vm.expectRevert(bytes(Errors.CALLER_NOT_RISK_OR_POOL_ADMIN));
-
-    vm.prank(caller);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(address(0), true);
-  }
-
   function test_reverts_notRiskOrPoolOrEmergencyAdmin_setReserveFreeze(address caller) public {
     vm.assume(
       !contracts.aclManager.isPoolAdmin(caller) &&
@@ -244,14 +223,13 @@ contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
         !contracts.aclManager.isRiskAdmin(caller) &&
         caller != address(contracts.poolAddressesProvider)
     );
-
     vm.expectRevert(bytes(Errors.CALLER_NOT_RISK_OR_POOL_ADMIN));
 
     vm.prank(caller);
-    contracts.poolConfiguratorProxy.setEModeCategory(1, 1, 1, 1, address(0), '');
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 1, 1, 1, '');
   }
 
-  function test_reverts_notRiskAdmin_setAssetEModeCategory(address caller) public {
+  function test_reverts_notRiskAdmin_setAssetCollateralInEMode(address caller) public {
     vm.assume(
       !contracts.aclManager.isPoolAdmin(caller) &&
         !contracts.aclManager.isRiskAdmin(caller) &&
@@ -261,7 +239,7 @@ contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
     vm.expectRevert(bytes(Errors.CALLER_NOT_RISK_OR_POOL_ADMIN));
 
     vm.prank(caller);
-    contracts.poolConfiguratorProxy.setAssetEModeCategory(address(0), 1);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(address(0), 1, true);
   }
 
   function test_reverts_setDebtCeiling(address caller) public {
@@ -290,7 +268,6 @@ contract PoolConfiguratorACLModifiersTest is TestnetProcedures {
     );
 
     vm.prank(caller);
-
     vm.expectRevert(bytes(Errors.CALLER_NOT_POOL_OR_EMERGENCY_ADMIN));
     contracts.poolConfiguratorProxy.setReservePause(asset, paused, gracePeriod);
   }
diff --git a/tests/core/PoolConfigurator.borrowCaps.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.borrowCaps.t.sol
similarity index 87%
rename from tests/core/PoolConfigurator.borrowCaps.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.borrowCaps.t.sol
index 6f347905..59bba274 100644
--- a/tests/core/PoolConfigurator.borrowCaps.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.borrowCaps.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {IERC20} from '../../../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {DataTypes} from '../../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorBorrowCapTests is TestnetProcedures {
   address internal aUSDX;
@@ -92,11 +92,10 @@ contract PoolConfiguratorBorrowCapTests is TestnetProcedures {
       tokenList.usdx
     );
 
-    uint256 stableDebt = IERC20(reserveData.stableDebtTokenAddress).totalSupply();
     uint256 variableDebt = IERC20(reserveData.variableDebtTokenAddress).totalSupply();
 
     assertEq(
-      stableDebt + variableDebt,
+      variableDebt,
       borrowCapUsdx * 10 ** 6,
       'Borrow Cap should match same amount than total debt'
     );
@@ -119,16 +118,11 @@ contract PoolConfiguratorBorrowCapTests is TestnetProcedures {
       tokenList.usdx
     );
 
-    uint256 stableDebt = IERC20(reserveData.stableDebtTokenAddress).totalSupply();
     uint256 variableDebt = IERC20(reserveData.variableDebtTokenAddress).totalSupply();
 
     (uint256 borrowCapUsdx, ) = contracts.protocolDataProvider.getReserveCaps(tokenList.usdx);
 
-    assertGt(
-      stableDebt + variableDebt,
-      borrowCapUsdx * 10 ** 6,
-      'Total debt should be greater than cap'
-    );
+    assertGt(variableDebt, borrowCapUsdx * 10 ** 6, 'Total debt should be greater than cap');
   }
 
   function test_setBorrowCap_them_setBorrowCap_zero() public {
diff --git a/tests/protocol/pool/pool-configurator/PoolConfigurator.eMode.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.eMode.sol
new file mode 100644
index 00000000..b15dfc4a
--- /dev/null
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.eMode.sol
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import 'forge-std/Test.sol';
+
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {PercentageMath} from '../../../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {ReserveConfiguration, DataTypes} from '../../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {EModeConfiguration} from '../../../../src/contracts/protocol/libraries/configuration/EModeConfiguration.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
+
+contract PoolConfiguratorEModeConfigTests is TestnetProcedures {
+  using PercentageMath for uint256;
+  using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
+
+  event EModeCategoryAdded(
+    uint8 indexed categoryId,
+    uint256 ltv,
+    uint256 liquidationThreshold,
+    uint256 liquidationBonus,
+    address oracle,
+    string label
+  );
+
+  event AssetCollateralInEModeChanged(address indexed asset, uint8 categoryId, bool allowed);
+  event AssetBorrowableInEModeChanged(address indexed asset, uint8 categoryId, bool borrowable);
+
+  function setUp() public {
+    initTestEnvironment();
+  }
+
+  function test_configureEmodeCategory() public {
+    EModeCategoryInput memory ct = _genCategoryOne();
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit EModeCategoryAdded(ct.id, ct.ltv, ct.lt, ct.lb, address(0), ct.label);
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(ct.id, ct.ltv, ct.lt, ct.lb, ct.label);
+
+    DataTypes.EModeCategory memory emodeConfig = _getFullEMode(ct.id);
+    assertEq(emodeConfig.ltv, ct.ltv);
+    assertEq(emodeConfig.liquidationThreshold, ct.lt);
+    assertEq(emodeConfig.liquidationBonus, ct.lb);
+    assertEq(emodeConfig.label, ct.label);
+    assertEq(emodeConfig.collateralBitmap, 0);
+    assertEq(emodeConfig.borrowableBitmap, 0);
+  }
+
+  function test_updateEModeCategory() public {
+    test_configureEmodeCategory();
+    EModeCategoryInput memory ct = _genCategoryOne();
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, 1, true);
+    DataTypes.EModeCategory memory ogCategory = _getFullEMode(ct.id);
+    EModeCategoryInput memory updatedCategory = EModeCategoryInput(
+      ct.id,
+      90_00,
+      92_00,
+      101_00,
+      'GROUP_B'
+    );
+
+    vm.prank(poolAdmin);
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit EModeCategoryAdded(
+      ct.id,
+      updatedCategory.ltv,
+      updatedCategory.lt,
+      updatedCategory.lb,
+      address(0),
+      updatedCategory.label
+    );
+
+    contracts.poolConfiguratorProxy.setEModeCategory(
+      ct.id,
+      updatedCategory.ltv,
+      updatedCategory.lt,
+      updatedCategory.lb,
+      updatedCategory.label
+    );
+
+    DataTypes.EModeCategory memory emodeConfig = _getFullEMode(ct.id);
+    assertEq(emodeConfig.ltv, updatedCategory.ltv);
+    assertEq(emodeConfig.liquidationThreshold, updatedCategory.lt);
+    assertEq(emodeConfig.liquidationBonus, updatedCategory.lb);
+    assertEq(emodeConfig.label, updatedCategory.label);
+    assertEq(emodeConfig.collateralBitmap, ogCategory.collateralBitmap);
+    assertEq(emodeConfig.borrowableBitmap, ogCategory.borrowableBitmap);
+  }
+
+  function test_reverts_setEmodeCategory_zero_ltv() public {
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 0, 80_00, 105_00, 'LABEL');
+  }
+
+  function test_reverts_setEmodeCategory_zero_liqThreshold() public {
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 0, 105_00, 'LABEL');
+  }
+
+  function test_reverts_setEmodeCategory_ltv_gt_liqThreshold() public {
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 79_00, 105_00, 'LABEL');
+  }
+
+  function test_reverts_setEmodeCategory_lb_lte_percentageFactor() public {
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 81_00, 100_00, 'LABEL');
+
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(1, 80_00, 81_00, 99_00, 'LABEL');
+  }
+
+  function test_reverts_setEmodeCategory_liquidation_threshold_doesnt_match_bonus() public {
+    uint16 liquidationThreshold = 98_00;
+    uint16 liquidationBonus = 120_00;
+    uint256 isBonusNotCovered = uint256(liquidationThreshold).percentMul(liquidationBonus);
+    assertGt(
+      isBonusNotCovered,
+      PercentageMath.PERCENTAGE_FACTOR,
+      'Input should be gt than percentage factor to revert at "threshold * bonus is required to be less than PERCENTAGE_FACTOR"'
+    );
+    vm.expectRevert(bytes(Errors.INVALID_EMODE_CATEGORY_PARAMS));
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setEModeCategory(
+      1,
+      90_00,
+      liquidationThreshold,
+      liquidationBonus,
+      'LABEL'
+    );
+  }
+
+  function test_setAssetCollateralInEMode() public {
+    EModeCategoryInput memory input = _genCategoryOne();
+    test_configureEmodeCategory();
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit AssetCollateralInEModeChanged(tokenList.usdx, input.id, true);
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, input.id, true);
+    DataTypes.EModeCategory memory config = _getFullEMode(input.id);
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.collateralBitmap, reserveData.id),
+      true
+    );
+  }
+
+  function test_addAnotherAssetCollateralInEMode() public {
+    EModeCategoryInput memory input = _genCategoryOne();
+    test_setAssetCollateralInEMode();
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.wbtc, input.id, true);
+    DataTypes.EModeCategory memory config = _getFullEMode(input.id);
+    DataTypes.ReserveDataLegacy memory reserveDataUSDX = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    DataTypes.ReserveDataLegacy memory reserveDataWBTC = contracts.poolProxy.getReserveData(
+      tokenList.wbtc
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.collateralBitmap, reserveDataUSDX.id),
+      true
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.collateralBitmap, reserveDataWBTC.id),
+      true
+    );
+  }
+
+  function test_removeCollateralFromEmode() public {
+    EModeCategoryInput memory prevCt = _genCategoryOne();
+    test_setAssetCollateralInEMode();
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit AssetCollateralInEModeChanged(tokenList.usdx, prevCt.id, false);
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetCollateralInEMode(tokenList.usdx, prevCt.id, false);
+
+    DataTypes.EModeCategory memory config = _getFullEMode(prevCt.id);
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.collateralBitmap, reserveData.id),
+      false
+    );
+  }
+
+  function test_setAssetBorrowableInEMode() public {
+    EModeCategoryInput memory input = _genCategoryOne();
+    test_configureEmodeCategory();
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit AssetBorrowableInEModeChanged(tokenList.usdx, input.id, true);
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.usdx, input.id, true);
+    DataTypes.EModeCategory memory config = _getFullEMode(input.id);
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.borrowableBitmap, reserveData.id),
+      true
+    );
+  }
+
+  function test_addAnotherAssetBorrowableInEMode() public {
+    EModeCategoryInput memory input = _genCategoryOne();
+    test_setAssetBorrowableInEMode();
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.wbtc, input.id, true);
+    DataTypes.EModeCategory memory config = _getFullEMode(input.id);
+    DataTypes.ReserveDataLegacy memory reserveDataUSDX = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    DataTypes.ReserveDataLegacy memory reserveDataWBTC = contracts.poolProxy.getReserveData(
+      tokenList.wbtc
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.borrowableBitmap, reserveDataUSDX.id),
+      true
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.borrowableBitmap, reserveDataWBTC.id),
+      true
+    );
+  }
+
+  function test_removeBorrowableFromEmode() public {
+    EModeCategoryInput memory input = _genCategoryOne();
+    test_configureEmodeCategory();
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit AssetBorrowableInEModeChanged(tokenList.usdx, input.id, false);
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setAssetBorrowableInEMode(tokenList.usdx, input.id, false);
+    DataTypes.EModeCategory memory config = _getFullEMode(input.id);
+    DataTypes.ReserveDataLegacy memory reserveData = contracts.poolProxy.getReserveData(
+      tokenList.usdx
+    );
+    assertEq(
+      EModeConfiguration.isReserveEnabledOnBitmap(config.borrowableBitmap, reserveData.id),
+      false
+    );
+  }
+
+  function _getFullEMode(uint8 eMode) internal view returns (DataTypes.EModeCategory memory) {
+    DataTypes.EModeCategory memory eModeCategory;
+    DataTypes.CollateralConfig memory cfg = contracts.poolProxy.getEModeCategoryCollateralConfig(
+      eMode
+    );
+    eModeCategory.ltv = cfg.ltv;
+    eModeCategory.liquidationThreshold = cfg.liquidationThreshold;
+    eModeCategory.liquidationBonus = cfg.liquidationBonus;
+    (eModeCategory.label) = contracts.poolProxy.getEModeCategoryLabel(eMode);
+    (eModeCategory.collateralBitmap) = contracts.poolProxy.getEModeCategoryCollateralBitmap(eMode);
+    (eModeCategory.borrowableBitmap) = contracts.poolProxy.getEModeCategoryBorrowableBitmap(eMode);
+    return eModeCategory;
+  }
+}
diff --git a/tests/protocol/pool/pool-configurator/PoolConfigurator.initReserves.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.initReserves.t.sol
new file mode 100644
index 00000000..672f8291
--- /dev/null
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.initReserves.t.sol
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import 'forge-std/Test.sol';
+
+import {AToken} from '../../../../src/contracts/protocol/tokenization/AToken.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetERC20} from '../../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {ConfiguratorInputTypes} from '../../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {IDefaultInterestRateStrategyV2} from '../../../../src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol';
+import {TestnetProcedures, TestVars, TestReserveConfig} from '../../../utils/TestnetProcedures.sol';
+
+contract PoolConfiguratorInitReservesTest is TestnetProcedures {
+  event ReserveInitialized(
+    address indexed asset,
+    address indexed aToken,
+    address stableDebtToken,
+    address variableDebtToken,
+    address interestRateStrategyAddress
+  );
+
+  function setUp() public {
+    initTestEnvironment();
+  }
+
+  function test_initReserves_validNumberOfAssets(TestVars[128] memory t, uint8 length) public {
+    vm.assume(length > 0 && length < 128);
+
+    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
+    uint256 maxListings = contracts.poolProxy.MAX_NUMBER_RESERVES() - previousListedAssets + 1;
+    vm.assume(length < maxListings);
+
+    ConfiguratorInputTypes.InitReserveInput[]
+      memory input = new ConfiguratorInputTypes.InitReserveInput[](length);
+    for (uint256 i = 0; i < length; i++) {
+      input[i] = _generateInitReserveInput(t[i], report, poolAdmin, true);
+
+      vm.expectEmit(true, false, false, false, address(contracts.poolConfiguratorProxy));
+      emit ReserveInitialized(
+        input[i].underlyingAsset,
+        address(0),
+        address(0),
+        address(0),
+        input[i].interestRateStrategyAddress
+      );
+    }
+    // Perform action
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.initReserves(input);
+
+    for (uint256 i = 0; i < length; i++) {
+      ConfiguratorInputTypes.InitReserveInput memory initConfig = input[i];
+      // Perform assertions
+      {
+        (address aTokenProxy, , address variableDebtProxy) = contracts
+          .protocolDataProvider
+          .getReserveTokensAddresses(initConfig.underlyingAsset);
+
+        assertEq(AToken(aTokenProxy).name(), initConfig.aTokenName);
+        assertEq(AToken(aTokenProxy).symbol(), initConfig.aTokenSymbol);
+        assertEq(
+          AToken(aTokenProxy).decimals(),
+          TestnetERC20(initConfig.underlyingAsset).decimals()
+        );
+        assertEq(AToken(aTokenProxy).RESERVE_TREASURY_ADDRESS(), initConfig.treasury);
+        assertEq(AToken(aTokenProxy).UNDERLYING_ASSET_ADDRESS(), initConfig.underlyingAsset);
+        assertEq(
+          address(AToken(aTokenProxy).getIncentivesController()),
+          initConfig.incentivesController
+        );
+
+        assertEq(AToken(variableDebtProxy).name(), initConfig.variableDebtTokenName);
+        assertEq(AToken(variableDebtProxy).symbol(), initConfig.variableDebtTokenSymbol);
+        assertEq(
+          AToken(variableDebtProxy).decimals(),
+          TestnetERC20(initConfig.underlyingAsset).decimals()
+        );
+        assertEq(AToken(variableDebtProxy).UNDERLYING_ASSET_ADDRESS(), initConfig.underlyingAsset);
+        assertEq(
+          address(AToken(variableDebtProxy).getIncentivesController()),
+          initConfig.incentivesController
+        );
+      }
+      // Perform default asset checks
+      TestReserveConfig memory c = _getReserveConfig(
+        initConfig.underlyingAsset,
+        report.protocolDataProvider
+      );
+
+      assertEq(c.isActive, true);
+      assertEq(c.isFrozen, false);
+      assertEq(c.isPaused, false);
+      assertEq(c.decimals, TestnetERC20(initConfig.underlyingAsset).decimals());
+
+      assertEq(c.ltv, 0);
+      assertEq(c.liquidationThreshold, 0);
+      assertEq(c.liquidationBonus, 0);
+      assertEq(c.reserveFactor, 0);
+      assertEq(c.usageAsCollateralEnabled, false);
+      assertEq(c.borrowingEnabled, false);
+      assertEq(c.isVirtualAccActive, initConfig.useVirtualBalance);
+    }
+    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets + length);
+  }
+
+  function test_initReserves_zeroAssets() public {
+    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
+
+    ConfiguratorInputTypes.InitReserveInput[] memory input;
+
+    // Perform action, does not revert but does nothing due empty array, no-op
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.initReserves(input);
+
+    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets);
+  }
+
+  function test_reverts_initReserves_maxAssets(TestVars memory t, uint8 lengthSeed) public {
+    uint256 previousListedAssets = contracts.poolProxy.getReservesList().length;
+
+    uint256 maxListings = contracts.poolProxy.MAX_NUMBER_RESERVES() - previousListedAssets + 1;
+    uint256 length = maxListings + lengthSeed;
+
+    ConfiguratorInputTypes.InitReserveInput[]
+      memory input = new ConfiguratorInputTypes.InitReserveInput[](length);
+    for (uint256 i = 0; i < length; i++)
+      input[i] = _generateInitReserveInput(t, report, poolAdmin, true);
+
+    vm.expectRevert(bytes(Errors.NO_MORE_RESERVES_ALLOWED));
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.initReserves(input);
+
+    assertEq(contracts.poolProxy.getReservesList().length, previousListedAssets);
+  }
+
+  function test_initReserves_notEnoughDecimal(TestVars memory t) public {
+    vm.assume(t.underlyingDecimals < 6);
+
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
+      report,
+      poolAdmin,
+      false
+    );
+
+    vm.expectRevert(bytes(Errors.INVALID_DECIMALS));
+
+    // Perform action
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.initReserves(input);
+  }
+}
diff --git a/tests/core/PoolConfigurator.liquidationFee.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.liquidationFee.t.sol
similarity index 94%
rename from tests/core/PoolConfigurator.liquidationFee.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.liquidationFee.t.sol
index d509d49d..628485bb 100644
--- a/tests/core/PoolConfigurator.liquidationFee.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.liquidationFee.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorLiquidationFeeTests is TestnetProcedures {
   address internal aUSDX;
diff --git a/tests/core/PoolConfigurator.pendingLTV.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.pendingLTV.t.sol
similarity index 92%
rename from tests/core/PoolConfigurator.pendingLTV.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.pendingLTV.t.sol
index 828db0d4..3ce52781 100644
--- a/tests/core/PoolConfigurator.pendingLTV.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.pendingLTV.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {IERC20} from '../../../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {DataTypes} from '../../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorPendingLtvTests is TestnetProcedures {
   event PendingLtvChanged(address indexed asset, uint256 ltv);
diff --git a/tests/core/PoolConfigurator.reserveRiskConfig.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.reserveRiskConfig.t.sol
similarity index 88%
rename from tests/core/PoolConfigurator.reserveRiskConfig.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.reserveRiskConfig.t.sol
index 002a6cea..bcd62e00 100644
--- a/tests/core/PoolConfigurator.reserveRiskConfig.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.reserveRiskConfig.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ReserveLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ReserveLogic} from '../../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
@@ -22,7 +22,6 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     uint256 liquidationThreshold,
     uint256 liquidationBonus
   );
-  event ReserveStableRateBorrowing(address indexed asset, bool enabled);
   event ReserveFrozen(address indexed asset, bool frozen);
   event ReservePaused(address indexed asset, bool paused);
   event ReserveDropped(address indexed asset);
@@ -58,18 +57,18 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
 
     vm.startPrank(poolAdmin);
     wbtc.mint(bob, 100e8);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(tokenList.wbtc, true);
     vm.stopPrank();
 
     vm.prank(bob);
     contracts.poolProxy.supply(tokenList.wbtc, 100e8, bob, 0);
   }
 
-  function test_enableBorrowing() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
+  function test_enableBorrowing(TestVars memory t) public {
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
       report,
-      poolAdmin
+      poolAdmin,
+      true
     );
 
     // Perform action
@@ -103,11 +102,12 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     assertEq(borrowingConfigAfter, false);
   }
 
-  function test_enableFlashBorrow() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
+  function test_enableFlashBorrow(TestVars memory t) public {
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
       report,
-      poolAdmin
+      poolAdmin,
+      true
     );
 
     // Perform action
@@ -130,15 +130,16 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     assertEq(valueAfter, false);
   }
 
-  function test_setCollateralConfig() public {
+  function test_setCollateralConfig(TestVars memory t) public {
     uint256 ltv = 80_00;
     uint256 liquidationThreshold = 85_00;
     uint256 liquidationBonus = 105_00;
 
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
       report,
-      poolAdmin
+      poolAdmin,
+      true
     );
 
     // Perform action
@@ -169,11 +170,12 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     assertEq(liqBonus, liquidationBonus);
   }
 
-  function test_reverts_setCollateralConfig_invalidParams() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
+  function test_reverts_setCollateralConfig_invalidParams(TestVars memory t) public {
+    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateInitConfig(
+      t,
       report,
-      poolAdmin
+      poolAdmin,
+      true
     );
 
     // Perform action
@@ -234,68 +236,6 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     contracts.poolConfiguratorProxy.configureReserveAsCollateral(tokenList.usdx, 0, 0, 0);
   }
 
-  function test_enableStableBorrowing() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
-      report,
-      poolAdmin
-    );
-
-    // Perform action
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveBorrowing(input[0].underlyingAsset, true);
-
-    (, , , , , , , bool borrowingEnabledDefault, , ) = contracts
-      .protocolDataProvider
-      .getReserveConfigurationData(input[0].underlyingAsset);
-    assertEq(borrowingEnabledDefault, false);
-
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit ReserveStableRateBorrowing(input[0].underlyingAsset, true);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(input[0].underlyingAsset, true);
-
-    (, , , , , , , bool borrowingEnabledAfter, , ) = contracts
-      .protocolDataProvider
-      .getReserveConfigurationData(input[0].underlyingAsset);
-    assertEq(borrowingEnabledAfter, true);
-
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit ReserveStableRateBorrowing(input[0].underlyingAsset, false);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(input[0].underlyingAsset, false);
-
-    (, , , , , , , bool borrowingConfigAfter, , ) = contracts
-      .protocolDataProvider
-      .getReserveConfigurationData(input[0].underlyingAsset);
-    assertEq(borrowingConfigAfter, false);
-  }
-
-  function test_reverts_enableStableBorrowing_borrowNotEnabled() public {
-    ConfiguratorInputTypes.InitReserveInput[] memory input = _generateListingInput(
-      1,
-      report,
-      poolAdmin
-    );
-
-    // Perform action
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.initReserves(input);
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveBorrowing(input[0].underlyingAsset, false);
-
-    vm.expectRevert(bytes(Errors.BORROWING_NOT_ENABLED));
-
-    vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setReserveStableRateBorrowing(input[0].underlyingAsset, true);
-  }
-
   function test_reverts_setReserveActive_false_if_suppliers() public {
     // Revert due for LQT == 0 there should be no suppliers
     vm.prank(alice);
@@ -608,7 +548,7 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
       emit ReservePaused(reserves[x], true);
     }
     vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setPoolPause(true, 0);
+    contracts.poolConfiguratorProxy.setPoolPause(true);
 
     for (uint16 x; x < reserves.length; ++x) {
       bool isPaused = contracts.protocolDataProvider.getPaused(reserves[x]);
@@ -624,7 +564,7 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
       emit ReservePaused(reserves[x], false);
     }
     vm.prank(poolAdmin);
-    contracts.poolConfiguratorProxy.setPoolPause(false, 0);
+    contracts.poolConfiguratorProxy.setPoolPause(false);
 
     for (uint16 x; x < reserves.length; ++x) {
       bool isPaused = contracts.protocolDataProvider.getPaused(reserves[x]);
@@ -691,7 +631,7 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
       tokenList.usdx
     );
     assertTrue(pA != address(0));
-    assertTrue(pS != address(0));
+    assertTrue(pS == address(0));
     assertTrue(pV != address(0));
 
     vm.prank(poolAdmin);
@@ -709,7 +649,7 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
         uint256 reserveFactor,
         bool usageAsCollateralEnabled,
         bool borrowingEnabled,
-        bool stableBorrowRateEnabled,
+        ,
         bool isActive,
         bool isFrozen
       ) = contracts.protocolDataProvider.getReserveConfigurationData(tokenList.usdx);
@@ -724,7 +664,6 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
       assertEq(reserveFactor, 0);
       assertEq(usageAsCollateralEnabled, false);
       assertEq(borrowingEnabled, false);
-      assertEq(stableBorrowRateEnabled, false);
       assertEq(isActive, false);
       assertEq(isFrozen, false);
     }
@@ -767,7 +706,7 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
   }
 
   function test_setLiquidationGracePeriodReserve(uint40 gracePeriod) public {
-    vm.assume(gracePeriod < contracts.poolConfiguratorProxy.MAX_GRACE_PERIOD() && gracePeriod != 0);
+    gracePeriod = uint40(bound(gracePeriod, 1, contracts.poolConfiguratorProxy.MAX_GRACE_PERIOD()));
 
     address asset = tokenList.usdx;
 
@@ -782,19 +721,19 @@ contract PoolConfiguratorReserveRiskConfigs is TestnetProcedures {
     assertEq(contracts.poolProxy.getLiquidationGracePeriod(asset), until);
 
     // reserve unpause -> pause, liquidationGracePeriod would not be set
-    contracts.poolConfiguratorProxy.setReservePause(asset, true, gracePeriod + 1);
+    contracts.poolConfiguratorProxy.setReservePause(asset, true, gracePeriod);
     assertEq(contracts.poolProxy.getLiquidationGracePeriod(asset), until);
     assertTrue(contracts.protocolDataProvider.getPaused(asset));
 
     // reserve pause -> pause, liquidationGracePeriod would not be set
-    contracts.poolConfiguratorProxy.setReservePause(asset, true, gracePeriod + 1);
+    contracts.poolConfiguratorProxy.setReservePause(asset, true, gracePeriod);
     assertEq(contracts.poolProxy.getLiquidationGracePeriod(asset), until);
 
     // reserve pause -> unpause, liquidationGracePeriod would be set
     vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit LiquidationGracePeriodChanged(asset, until + 1);
-    contracts.poolConfiguratorProxy.setReservePause(asset, false, gracePeriod + 1);
-    assertEq(contracts.poolProxy.getLiquidationGracePeriod(asset), until + 1);
+    emit LiquidationGracePeriodChanged(asset, until);
+    contracts.poolConfiguratorProxy.setReservePause(asset, false, gracePeriod);
+    assertEq(contracts.poolProxy.getLiquidationGracePeriod(asset), until);
 
     vm.stopPrank();
   }
diff --git a/tests/core/PoolConfigurator.supplyCaps.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.supplyCaps.t.sol
similarity index 94%
rename from tests/core/PoolConfigurator.supplyCaps.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.supplyCaps.t.sol
index a1f7c01f..151d29fe 100644
--- a/tests/core/PoolConfigurator.supplyCaps.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.supplyCaps.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {IERC20} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {IERC20} from '../../../../src/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorSupplyCapTests is TestnetProcedures {
   address internal aUSDX;
diff --git a/tests/core/PoolConfigurator.upgradeabilty.t.sol b/tests/protocol/pool/pool-configurator/PoolConfigurator.upgradeabilty.t.sol
similarity index 72%
rename from tests/core/PoolConfigurator.upgradeabilty.t.sol
rename to tests/protocol/pool/pool-configurator/PoolConfigurator.upgradeabilty.t.sol
index 840a4fff..f6bb692a 100644
--- a/tests/core/PoolConfigurator.upgradeabilty.t.sol
+++ b/tests/protocol/pool/pool-configurator/PoolConfigurator.upgradeabilty.t.sol
@@ -3,18 +3,17 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {AToken} from 'aave-v3-core/contracts/protocol/tokenization/AToken.sol';
-import {VariableDebtToken} from 'aave-v3-core/contracts/protocol/tokenization/VariableDebtToken.sol';
-import {StableDebtToken} from 'aave-v3-core/contracts/protocol/tokenization/StableDebtToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {ConfiguratorInputTypes, IPool, IPoolAddressesProvider} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {MockATokenRepayment} from 'aave-v3-core/contracts/mocks/tokens/MockATokenRepayment.sol';
-import {MockVariableDebtToken, MockStableDebtToken} from 'aave-v3-core/contracts/mocks/tokens/MockDebtTokens.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {ReserveLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-
-import {SlotParser} from '../utils/SlotParser.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {AToken} from '../../../../src/contracts/protocol/tokenization/AToken.sol';
+import {VariableDebtToken} from '../../../../src/contracts/protocol/tokenization/VariableDebtToken.sol';
+import {Errors} from '../../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {ConfiguratorInputTypes, IPool, IPoolAddressesProvider} from '../../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {MockATokenRepayment} from '../../../../src/contracts/mocks/tokens/MockATokenRepayment.sol';
+import {MockVariableDebtToken} from '../../../../src/contracts/mocks/tokens/MockDebtTokens.sol';
+import {DataTypes} from '../../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {ReserveLogic} from '../../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+
+import {SlotParser} from '../../../utils/SlotParser.sol';
+import {TestnetProcedures} from '../../../utils/TestnetProcedures.sol';
 
 contract PoolConfiguratorUpgradeabilityTests is TestnetProcedures {
   using stdStorage for StdStorage;
@@ -31,13 +30,9 @@ contract PoolConfiguratorUpgradeabilityTests is TestnetProcedures {
     address newStrategy
   );
 
-  event ATokenUpgraded(
-    address indexed asset,
-    address indexed proxy,
-    address indexed implementation
-  );
+  event ReserveInterestRateDataChanged(address indexed asset, address indexed strategy, bytes data);
 
-  event StableDebtTokenUpgraded(
+  event ATokenUpgraded(
     address indexed asset,
     address indexed proxy,
     address indexed implementation
@@ -85,6 +80,32 @@ contract PoolConfiguratorUpgradeabilityTests is TestnetProcedures {
     assertEq(newInterestRateStrategy, updatedInterestsRateStrategy);
   }
 
+  function test_setReserveInterestRateData() public {
+    address currentInterestRateStrategy = contracts
+      .protocolDataProvider
+      .getInterestRateStrategyAddress(tokenList.usdx);
+
+    bytes memory newInterestRateData = _getDefaultInterestRatesStrategyData();
+
+    vm.expectEmit(address(contracts.poolConfiguratorProxy));
+    emit ReserveInterestRateDataChanged(
+      tokenList.usdx,
+      currentInterestRateStrategy,
+      newInterestRateData
+    );
+
+    vm.prank(poolAdmin);
+    contracts.poolConfiguratorProxy.setReserveInterestRateData(
+      tokenList.usdx,
+      _getDefaultInterestRatesStrategyData()
+    );
+
+    address newInterestRateStrategy = contracts.protocolDataProvider.getInterestRateStrategyAddress(
+      tokenList.usdx
+    );
+    assertEq(currentInterestRateStrategy, newInterestRateStrategy);
+  }
+
   function test_interestRateStrategy_update() public {
     vm.prank(carol);
     contracts.poolProxy.supply(tokenList.usdx, 100_000e6, carol, 0);
@@ -131,6 +152,7 @@ contract PoolConfiguratorUpgradeabilityTests is TestnetProcedures {
     assertEq(updatedCache.currVariableBorrowRate, 107585394738663515131637198);
   }
 
+  // TODO: deduplicate, reuse in vTokenUpdate too
   function test_updateAToken() public {
     ConfiguratorInputTypes.UpdateATokenInput memory input = ConfiguratorInputTypes
       .UpdateATokenInput({
@@ -215,47 +237,4 @@ contract PoolConfiguratorUpgradeabilityTests is TestnetProcedures {
       input.incentivesController
     );
   }
-
-  function test_updateStableDebtToken() public {
-    (, address stableDebtToken, ) = contracts.protocolDataProvider.getReserveTokensAddresses(
-      tokenList.usdx
-    );
-    ConfiguratorInputTypes.UpdateDebtTokenInput memory input = ConfiguratorInputTypes
-      .UpdateDebtTokenInput({
-        asset: tokenList.usdx,
-        incentivesController: report.rewardsControllerProxy,
-        name: 'New Stable Debt Test USDX',
-        symbol: 'newTestStaDebtUSDX',
-        implementation: address(new MockStableDebtToken(IPool(report.poolProxy))),
-        params: bytes('')
-      });
-
-    address previousImplementation = SlotParser.loadAddressFromSlot(
-      stableDebtToken,
-      bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
-    );
-
-    vm.startPrank(poolAdmin);
-
-    vm.expectEmit(address(contracts.poolConfiguratorProxy));
-    emit StableDebtTokenUpgraded(tokenList.usdx, stableDebtToken, input.implementation);
-
-    // Perform upgrade
-    contracts.poolConfiguratorProxy.updateStableDebtToken(input);
-    vm.stopPrank();
-
-    address upgradedImplementation = SlotParser.loadAddressFromSlot(
-      stableDebtToken,
-      bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
-    );
-
-    assertTrue(upgradedImplementation != previousImplementation);
-    assertEq(upgradedImplementation, input.implementation);
-    assertEq(StableDebtToken(stableDebtToken).name(), input.name);
-    assertEq(StableDebtToken(stableDebtToken).symbol(), input.symbol);
-    assertEq(
-      address(StableDebtToken(stableDebtToken).getIncentivesController()),
-      input.incentivesController
-    );
-  }
 }
diff --git a/tests/core/ATokenEdgeCases.t.sol b/tests/protocol/tokenization/ATokenEdgeCases.t.sol
similarity index 95%
rename from tests/core/ATokenEdgeCases.t.sol
rename to tests/protocol/tokenization/ATokenEdgeCases.t.sol
index ddce0cac..247ed6fd 100644
--- a/tests/core/ATokenEdgeCases.t.sol
+++ b/tests/protocol/tokenization/ATokenEdgeCases.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {ATokenInstance} from 'aave-v3-core/instances/ATokenInstance.sol';
-import {IAaveIncentivesController} from 'aave-v3-core/contracts/interfaces/IAaveIncentivesController.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
+import {ATokenInstance} from '../../../src/contracts/instances/ATokenInstance.sol';
+import {IAaveIncentivesController} from '../../../src/contracts/interfaces/IAaveIncentivesController.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
 
 contract ATokenEdgeCasesTests is TestnetProcedures {
   ATokenInstance public aToken;
diff --git a/tests/core/ATokenEvents.t.sol b/tests/protocol/tokenization/ATokenEvents.t.sol
similarity index 96%
rename from tests/core/ATokenEvents.t.sol
rename to tests/protocol/tokenization/ATokenEvents.t.sol
index 6911d439..9ba61ceb 100644
--- a/tests/core/ATokenEvents.t.sol
+++ b/tests/protocol/tokenization/ATokenEvents.t.sol
@@ -3,12 +3,12 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {ReserveLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {MathUtils} from 'aave-v3-core/contracts/protocol/libraries/math/MathUtils.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {ReserveLogic} from '../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {MathUtils} from '../../../src/contracts/protocol/libraries/math/MathUtils.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
 
 contract ATokenEventsTests is TestnetProcedures {
   using WadRayMath for uint256;
diff --git a/tests/core/ATokenModifiers.t.sol b/tests/protocol/tokenization/ATokenModifiers.t.sol
similarity index 85%
rename from tests/core/ATokenModifiers.t.sol
rename to tests/protocol/tokenization/ATokenModifiers.t.sol
index e29cb4dc..b29988bb 100644
--- a/tests/core/ATokenModifiers.t.sol
+++ b/tests/protocol/tokenization/ATokenModifiers.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
 
 contract ATokenModifiersTests is TestnetProcedures {
   IAToken public aToken;
diff --git a/tests/core/ATokenPermit.t.sol b/tests/protocol/tokenization/ATokenPermit.t.sol
similarity index 96%
rename from tests/core/ATokenPermit.t.sol
rename to tests/protocol/tokenization/ATokenPermit.t.sol
index e7d90084..a1f708e4 100644
--- a/tests/core/ATokenPermit.t.sol
+++ b/tests/protocol/tokenization/ATokenPermit.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
 
 interface IATokenWithMetadata is IAToken {
   function name() external view returns (string memory);
diff --git a/tests/core/ATokenRepay.t.sol b/tests/protocol/tokenization/ATokenRepay.t.sol
similarity index 91%
rename from tests/core/ATokenRepay.t.sol
rename to tests/protocol/tokenization/ATokenRepay.t.sol
index eb650f78..1aee8136 100644
--- a/tests/core/ATokenRepay.t.sol
+++ b/tests/protocol/tokenization/ATokenRepay.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {IVariableDebtToken} from '../../../src/contracts/interfaces/IVariableDebtToken.sol';
+import {IERC20Detailed} from '../../../src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 interface IVariableDebtTokenWithERC20 is IVariableDebtToken, IERC20Detailed {}
 
diff --git a/tests/core/ATokenRescueTokens.sol b/tests/protocol/tokenization/ATokenRescueTokens.sol
similarity index 90%
rename from tests/core/ATokenRescueTokens.sol
rename to tests/protocol/tokenization/ATokenRescueTokens.sol
index 19592b12..870b3f9f 100644
--- a/tests/core/ATokenRescueTokens.sol
+++ b/tests/protocol/tokenization/ATokenRescueTokens.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAToken} from '../../../src/contracts/interfaces/IAToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract ATokenRescueTokensTests is TestnetProcedures {
   IAToken public aTokenUSDX;
diff --git a/tests/core/ATokenTransfers.t.sol b/tests/protocol/tokenization/ATokenTransfers.t.sol
similarity index 95%
rename from tests/core/ATokenTransfers.t.sol
rename to tests/protocol/tokenization/ATokenTransfers.t.sol
index dbf49542..1304da8b 100644
--- a/tests/core/ATokenTransfers.t.sol
+++ b/tests/protocol/tokenization/ATokenTransfers.t.sol
@@ -3,14 +3,14 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IAToken, IERC20} from 'aave-v3-core/contracts/interfaces/IAToken.sol';
-import {IVariableDebtToken} from 'aave-v3-core/contracts/interfaces/IVariableDebtToken.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {SupplyLogic} from 'aave-v3-core/contracts/protocol/libraries/logic/SupplyLogic.sol';
-import {MathUtils} from 'aave-v3-core/contracts/protocol/libraries/math/MathUtils.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {IAToken, IERC20} from '../../../src/contracts/interfaces/IAToken.sol';
+import {IVariableDebtToken} from '../../../src/contracts/interfaces/IVariableDebtToken.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {SupplyLogic} from '../../../src/contracts/protocol/libraries/logic/SupplyLogic.sol';
+import {MathUtils} from '../../../src/contracts/protocol/libraries/math/MathUtils.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {DataTypes} from '../../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {TestnetProcedures} from '../../utils/TestnetProcedures.sol';
 
 contract ATokenTransferTests is TestnetProcedures {
   using WadRayMath for uint256;
diff --git a/tests/core/ScaledBalanceTokenBase.t.sol b/tests/protocol/tokenization/ScaledBalanceTokenBase.t.sol
similarity index 94%
rename from tests/core/ScaledBalanceTokenBase.t.sol
rename to tests/protocol/tokenization/ScaledBalanceTokenBase.t.sol
index aab5cfc5..cff2dd15 100644
--- a/tests/core/ScaledBalanceTokenBase.t.sol
+++ b/tests/protocol/tokenization/ScaledBalanceTokenBase.t.sol
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {MockScaledToken} from 'aave-v3-core/contracts/mocks/tokens/MockScaledToken.sol';
-
-import '../utils/TestnetProcedures.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {MockScaledToken} from '../../../src/contracts/mocks/tokens/MockScaledToken.sol';
+import '../../utils/TestnetProcedures.sol';
 
 contract ScaledBalanceTokenBaseEdgeTests is TestnetProcedures {
   using WadRayMath for uint256;
diff --git a/tests/core/VariableDebtToken.t.sol b/tests/protocol/tokenization/VariableDebtToken.t.sol
similarity index 89%
rename from tests/core/VariableDebtToken.t.sol
rename to tests/protocol/tokenization/VariableDebtToken.t.sol
index 9435b543..ffe6ca5e 100644
--- a/tests/core/VariableDebtToken.t.sol
+++ b/tests/protocol/tokenization/VariableDebtToken.t.sol
@@ -3,15 +3,15 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {VariableDebtTokenHarness as VariableDebtTokenInstance} from '../harness/VariableDebtToken.sol';
-import {IAaveIncentivesController} from 'aave-v3-core/contracts/interfaces/IAaveIncentivesController.sol';
-import {Errors} from 'aave-v3-core/contracts/protocol/libraries/helpers/Errors.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {ReserveLogic, DataTypes} from 'aave-v3-core/contracts/protocol/libraries/logic/ReserveLogic.sol';
-import {WadRayMath} from 'aave-v3-core/contracts/protocol/libraries/math/WadRayMath.sol';
-import {ConfiguratorInputTypes, IPool} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {EIP712SigUtils} from '../utils/EIP712SigUtils.sol';
-import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
+import {VariableDebtTokenHarness as VariableDebtTokenInstance} from '../../harness/VariableDebtToken.sol';
+import {IAaveIncentivesController} from '../../../src/contracts/interfaces/IAaveIncentivesController.sol';
+import {Errors} from '../../../src/contracts/protocol/libraries/helpers/Errors.sol';
+import {TestnetERC20} from '../../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {ReserveLogic, DataTypes} from '../../../src/contracts/protocol/libraries/logic/ReserveLogic.sol';
+import {WadRayMath} from '../../../src/contracts/protocol/libraries/math/WadRayMath.sol';
+import {ConfiguratorInputTypes, IPool} from '../../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {EIP712SigUtils} from '../../utils/EIP712SigUtils.sol';
+import {TestnetProcedures, TestVars} from '../../utils/TestnetProcedures.sol';
 
 contract VariableDebtTokenEventsTests is TestnetProcedures {
   using WadRayMath for uint256;
@@ -82,17 +82,22 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     return varDebtToken;
   }
 
-  function test_initialize_VariableDebtToken() public returns (VariableDebtTokenInstance) {
+  function test_initialize_VariableDebtToken(
+    TestVars memory t
+  ) public returns (VariableDebtTokenInstance) {
     VariableDebtTokenInstance varDebtToken = test_new_VariableDebtToken_implementation();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
+    ConfiguratorInputTypes.InitReserveInput memory listing = _generateInitReserveInput(
+      t,
+      report,
+      poolAdmin,
+      true
+    );
 
     vm.expectEmit(address(varDebtToken));
     emit Initialized(
       listing.underlyingAsset,
       report.poolProxy,
-      report.rewardsControllerProxy,
+      listing.incentivesController,
       TestnetERC20(listing.underlyingAsset).decimals(),
       listing.variableDebtTokenName,
       listing.variableDebtTokenSymbol,
@@ -120,11 +125,14 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     return varDebtToken;
   }
 
-  function test_reverts_initialize_twice() public {
-    VariableDebtTokenInstance varDebtToken = test_initialize_VariableDebtToken();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
+  function test_reverts_initialize_twice(TestVars memory t) public {
+    VariableDebtTokenInstance varDebtToken = test_initialize_VariableDebtToken(t);
+    ConfiguratorInputTypes.InitReserveInput memory listing = _generateInitReserveInput(
+      t,
+      report,
+      poolAdmin,
+      true
+    );
 
     uint8 decimals = TestnetERC20(listing.underlyingAsset).decimals();
 
@@ -141,11 +149,14 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     );
   }
 
-  function test_reverts_initialize_pool_do_not_match() public {
+  function test_reverts_initialize_pool_do_not_match(TestVars memory t) public {
     VariableDebtTokenInstance varDebtToken = test_new_VariableDebtToken_implementation();
-    ConfiguratorInputTypes.InitReserveInput memory listing = (
-      _generateListingInput(1, report, poolAdmin)
-    )[0];
+    ConfiguratorInputTypes.InitReserveInput memory listing = _generateInitReserveInput(
+      t,
+      report,
+      poolAdmin,
+      true
+    );
 
     uint8 decimals = TestnetERC20(listing.underlyingAsset).decimals();
 
@@ -162,13 +173,8 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     );
   }
 
-  function test_default_revision() public {
-    VariableDebtTokenInstance varDebtToken = new VariableDebtTokenInstance(IPool(report.poolProxy));
-    assertEq(varDebtToken._getRevision(), varDebtToken.DEBT_TOKEN_REVISION());
-  }
-
-  function test_mint_variableDebt_caller_alice() public {
-    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken();
+  function test_mint_variableDebt_caller_alice(TestVars memory t) public {
+    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken(t);
     TestnetERC20 asset = TestnetERC20(debtToken.UNDERLYING_ASSET_ADDRESS());
     uint8 decimals = asset.decimals();
     uint256 amount = 1200 * 10 ** decimals;
@@ -182,8 +188,8 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     assertEq(debtToken.scaledBalanceOf(alice), amount);
   }
 
-  function test_mint_variableDebt_caller_bob_onBehalf_alice() public {
-    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken();
+  function test_mint_variableDebt_caller_bob_onBehalf_alice(TestVars memory t) public {
+    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken(t);
     TestnetERC20 asset = TestnetERC20(debtToken.UNDERLYING_ASSET_ADDRESS());
     uint8 decimals = asset.decimals();
     uint256 amount = 1200 * 10 ** decimals;
@@ -203,8 +209,8 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     assertEq(debtToken.scaledBalanceOf(alice), amount);
   }
 
-  function test_partial_burn_variableDebt() public {
-    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken();
+  function test_partial_burn_variableDebt(TestVars memory t) public {
+    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken(t);
     TestnetERC20 asset = TestnetERC20(debtToken.UNDERLYING_ASSET_ADDRESS());
     uint8 decimals = asset.decimals();
     uint256 amount = 1200 * 10 ** decimals;
@@ -229,8 +235,8 @@ contract VariableDebtTokenEventsTests is TestnetProcedures {
     assertEq(debtToken.scaledBalanceOf(alice), balanceScaled - repaymentScaled);
   }
 
-  function test_total_burn_variableDebt() public {
-    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken();
+  function test_total_burn_variableDebt(TestVars memory t) public {
+    VariableDebtTokenInstance debtToken = test_initialize_VariableDebtToken(t);
     TestnetERC20 asset = TestnetERC20(debtToken.UNDERLYING_ASSET_ADDRESS());
     uint8 decimals = asset.decimals();
     uint256 amount = 1200 * 10 ** decimals;
diff --git a/tests/periphery/EmissionsManager.t.sol b/tests/rewards/EmissionsManager.t.sol
similarity index 76%
rename from tests/periphery/EmissionsManager.t.sol
rename to tests/rewards/EmissionsManager.t.sol
index 2ebc7afd..9c157af1 100644
--- a/tests/periphery/EmissionsManager.t.sol
+++ b/tests/rewards/EmissionsManager.t.sol
@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import 'forge-std/Test.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
-import {RewardsController} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
-import {EmissionManager} from 'aave-v3-periphery/contracts/rewards/EmissionManager.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {ITransferStrategyBase} from 'aave-v3-periphery/contracts/rewards/interfaces/ITransferStrategyBase.sol';
-import {IEACAggregatorProxy} from 'aave-v3-periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol';
-import {RewardsDataTypes} from 'aave-v3-periphery/contracts/rewards/libraries/RewardsDataTypes.sol';
-import {PullRewardsTransferStrategy} from 'aave-v3-periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
+import {MockAggregator} from '../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {RewardsController} from '../../src/contracts/rewards/RewardsController.sol';
+import {EmissionManager} from '../../src/contracts/rewards/EmissionManager.sol';
+import {DataTypes} from '../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {IPool} from '../../src/contracts/interfaces/IPool.sol';
+import {ITransferStrategyBase} from '../../src/contracts/rewards/interfaces/ITransferStrategyBase.sol';
+import {IEACAggregatorProxy} from '../../src/contracts/helpers/interfaces/IEACAggregatorProxy.sol';
+import {RewardsDataTypes} from '../../src/contracts/rewards/libraries/RewardsDataTypes.sol';
+import {PullRewardsTransferStrategy} from '../../src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
 
 contract EmissionManagerTest is TestnetProcedures {
diff --git a/tests/periphery/RewardsController.t.sol b/tests/rewards/RewardsController.t.sol
similarity index 94%
rename from tests/periphery/RewardsController.t.sol
rename to tests/rewards/RewardsController.t.sol
index 38dae8cd..26d206ef 100644
--- a/tests/periphery/RewardsController.t.sol
+++ b/tests/rewards/RewardsController.t.sol
@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import 'forge-std/Test.sol';
-import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
-import {RewardsController, RewardsDistributor} from 'aave-v3-periphery/contracts/rewards/RewardsController.sol';
-import {EmissionManager} from 'aave-v3-periphery/contracts/rewards/EmissionManager.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {IAToken, IERC20} from 'aave-v3-core/contracts/protocol/tokenization/AToken.sol';
-import {ITransferStrategyBase} from 'aave-v3-periphery/contracts/rewards/interfaces/ITransferStrategyBase.sol';
-import {IEACAggregatorProxy} from 'aave-v3-periphery/contracts/misc/interfaces/IEACAggregatorProxy.sol';
-import {RewardsDataTypes} from 'aave-v3-periphery/contracts/rewards/libraries/RewardsDataTypes.sol';
-import {PullRewardsTransferStrategy} from 'aave-v3-periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
+import {MockAggregator} from '../../src/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
+import {RewardsController, RewardsDistributor} from '../../src/contracts/rewards/RewardsController.sol';
+import {EmissionManager} from '../../src/contracts/rewards/EmissionManager.sol';
+import {DataTypes} from '../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {IAToken, IERC20} from '../../src/contracts/protocol/tokenization/AToken.sol';
+import {ITransferStrategyBase} from '../../src/contracts/rewards/interfaces/ITransferStrategyBase.sol';
+import {IEACAggregatorProxy} from '../../src/contracts/helpers/interfaces/IEACAggregatorProxy.sol';
+import {RewardsDataTypes} from '../../src/contracts/rewards/libraries/RewardsDataTypes.sol';
+import {PullRewardsTransferStrategy} from '../../src/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
 
 contract RewardsControllerTest is TestnetProcedures {
diff --git a/tests/periphery/StakedTokenTransferStrategy.t.sol b/tests/rewards/StakedTokenTransferStrategy.t.sol
similarity index 94%
rename from tests/periphery/StakedTokenTransferStrategy.t.sol
rename to tests/rewards/StakedTokenTransferStrategy.t.sol
index cbb78767..1c3b2775 100644
--- a/tests/periphery/StakedTokenTransferStrategy.t.sol
+++ b/tests/rewards/StakedTokenTransferStrategy.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {StakedTokenTransferStrategy, IERC20, IStakedToken} from 'aave-v3-periphery/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol';
-import {StakeMock} from './mocks/StakeMock.sol';
+import {StakedTokenTransferStrategy, IERC20, IStakedToken} from '../../src/contracts/rewards/transfer-strategies/StakedTokenTransferStrategy.sol';
+import {StakeMock} from '../mocks/StakeMock.sol';
 import {TestnetProcedures} from '../utils/TestnetProcedures.sol';
 
 contract StakedTokenTransferStrategyTest is TestnetProcedures {
diff --git a/tests/utils/BatchTestProcedures.sol b/tests/utils/BatchTestProcedures.sol
index eb1f7d07..03a26043 100644
--- a/tests/utils/BatchTestProcedures.sol
+++ b/tests/utils/BatchTestProcedures.sol
@@ -11,14 +11,14 @@ import {AaveV3SetupBatch} from '../../src/deployments/projects/aave-v3-batched/b
 import {FfiUtils} from '../../src/deployments/contracts/utilities/FfiUtils.sol';
 import {DefaultMarketInput} from '../../src/deployments/inputs/DefaultMarketInput.sol';
 import {AaveV3BatchOrchestration} from '../../src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IRewardsController} from 'aave-v3-periphery/contracts/rewards/interfaces/IRewardsController.sol';
-import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {IRewardsController} from '../../src/contracts/rewards/interfaces/IRewardsController.sol';
+import '../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import '../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import '../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import '../../src/contracts/helpers/AaveProtocolDataProvider.sol';
 import {MarketReportUtils} from '../../src/deployments/contracts/utilities/MarketReportUtils.sol';
 
 struct TestVars {
@@ -213,8 +213,6 @@ contract BatchTestProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput
 
     assertTrue(r.aToken != address(0), 'report.aToken');
     assertTrue(r.variableDebtToken != address(0), 'report.variableDebtToken');
-    assertTrue(r.stableDebtToken != address(0), 'report.stableDebtToken');
-
     assertTrue(r.emissionManager != address(0), 'report.emissionManager');
     assertTrue(r.rewardsControllerProxy != address(0), 'report.rewardsControllerProxy');
 
@@ -317,8 +315,6 @@ contract BatchTestProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput
       t.aTokenName = _concatStr('a ', x);
       t.variableDebtName = _concatStr('Variable Debt Misc', x);
       t.variableDebtSymbol = _concatStr('varDebtMISC ', x);
-      t.stableDebtName = _concatStr('Stable Debt Misc ', x);
-      t.stableDebtSymbol = _concatStr('stableDebtMISC ', x);
       t.rateStrategy = r.defaultInterestRateStrategy;
       t.interestRateData = abi.encode(
         IDefaultInterestRateStrategyV2.InterestRateData({
@@ -331,7 +327,6 @@ contract BatchTestProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput
 
       input[x] = ConfiguratorInputTypes.InitReserveInput(
         r.aToken,
-        r.stableDebtToken,
         r.variableDebtToken,
         true,
         t.rateStrategy,
@@ -342,8 +337,6 @@ contract BatchTestProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput
         t.aTokenSymbol,
         t.variableDebtName,
         t.variableDebtSymbol,
-        t.stableDebtName,
-        t.stableDebtSymbol,
         t.emptyParams,
         t.interestRateData
       );
diff --git a/tests/utils/DiffUtils.sol b/tests/utils/DiffUtils.sol
index 23008fb5..c4fef55d 100644
--- a/tests/utils/DiffUtils.sol
+++ b/tests/utils/DiffUtils.sol
@@ -22,7 +22,7 @@ contract DiffUtils is Test {
 
     string[] memory inputs = new string[](7);
     inputs[0] = 'npx';
-    inputs[1] = '@bgd-labs/aave-cli@^0.16.4';
+    inputs[1] = '@bgd-labs/aave-cli@^1.0.0';
     inputs[2] = 'diff-snapshots';
     inputs[3] = beforePath;
     inputs[4] = afterPath;
diff --git a/tests/utils/ProtocolV3TestBase.sol b/tests/utils/ProtocolV3TestBase.sol
index 1572ad7e..dbfbea39 100644
--- a/tests/utils/ProtocolV3TestBase.sol
+++ b/tests/utils/ProtocolV3TestBase.sol
@@ -1,21 +1,20 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity >=0.7.5 <0.9.0;
 
-import {IERC20Detailed} from 'aave-v3-core/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
-import {IDefaultInterestRateStrategyV2} from 'aave-v3-core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
-import {IPoolDataProvider} from 'aave-v3-core/contracts/interfaces/IPoolDataProvider.sol';
-import {IPool} from 'aave-v3-core/contracts/interfaces/IPool.sol';
-import {IAaveOracle} from 'aave-v3-core/contracts/interfaces/IAaveOracle.sol';
-import {DataTypes} from 'aave-v3-core/contracts/protocol/libraries/types/DataTypes.sol';
-import {IPoolConfigurator} from 'aave-v3-core/contracts/interfaces/IPoolConfigurator.sol';
+import {IERC20Detailed} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IDefaultInterestRateStrategyV2} from '../../src/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
+import {ReserveConfiguration} from '../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPoolDataProvider} from '../../src/contracts/interfaces/IPoolDataProvider.sol';
+import {IPool} from '../../src/contracts/interfaces/IPool.sol';
+import {IAaveOracle} from '../../src/contracts/interfaces/IAaveOracle.sol';
+import {DataTypes} from '../../src/contracts/protocol/libraries/types/DataTypes.sol';
+import {IPoolConfigurator} from '../../src/contracts/interfaces/IPoolConfigurator.sol';
 import {ProxyHelpers} from './ProxyHelpers.sol';
 import {DiffUtils} from './DiffUtils.sol';
 
 struct ReserveTokens {
   address aToken;
-  address stableDebtToken;
   address variableDebtToken;
 }
 
@@ -81,7 +80,6 @@ struct ReserveConfig {
   string symbol;
   address underlying;
   address aToken;
-  address stableDebtToken;
   address variableDebtToken;
   uint256 decimals;
   uint256 ltv;
@@ -92,7 +90,6 @@ struct ReserveConfig {
   bool usageAsCollateralEnabled;
   bool borrowingEnabled;
   address interestRateStrategy;
-  bool stableBorrowRateEnabled;
   bool isPaused;
   bool isActive;
   bool isFrozen;
@@ -102,7 +99,6 @@ struct ReserveConfig {
   uint256 supplyCap;
   uint256 borrowCap;
   uint256 debtCeiling;
-  uint256 eModeCategory;
   bool virtualAccActive;
   uint256 virtualBalance;
   uint256 aTokenUnderlyingBalance;
@@ -150,36 +146,42 @@ contract ProtocolV3TestBase is DiffUtils {
     ReserveConfig[] memory configs = _getReservesConfigs(pool);
     if (reserveConfigs) _writeReserveConfigs(path, configs, pool);
     if (strategyConfigs) _writeStrategyConfigs(path, configs);
-    if (eModeConigs) _writeEModeConfigs(path, configs, pool);
+    if (eModeConigs) _writeEModeConfigs(path, pool);
     if (poolConfigs) _writePoolConfiguration(path, pool);
 
     return configs;
   }
 
-  function _writeEModeConfigs(
-    string memory path,
-    ReserveConfig[] memory configs,
-    IPool pool
-  ) internal virtual {
+  function _writeEModeConfigs(string memory path, IPool pool) internal virtual {
     // keys for json stringification
     string memory eModesKey = 'emodes';
     string memory content = '{}';
-
-    uint256[] memory usedCategories = new uint256[](configs.length);
-    for (uint256 i = 0; i < configs.length; i++) {
-      if (!_isInUint256Array(usedCategories, configs[i].eModeCategory)) {
-        usedCategories[i] = configs[i].eModeCategory;
-        DataTypes.EModeCategory memory category = pool.getEModeCategoryData(
-          uint8(configs[i].eModeCategory)
+    vm.serializeJson(eModesKey, '{}');
+    uint8 emptyCounter = 0;
+    for (uint8 i = 0; i < 256; i++) {
+      DataTypes.CollateralConfig memory cfg = pool.getEModeCategoryCollateralConfig(i);
+      if (cfg.liquidationThreshold == 0) {
+        if (++emptyCounter > 2) break;
+      } else {
+        string memory key = vm.toString(i);
+        vm.serializeJson(key, '{}');
+        vm.serializeUint(key, 'eModeCategory', i);
+        vm.serializeString(key, 'label', pool.getEModeCategoryLabel(i));
+        vm.serializeUint(key, 'ltv', cfg.ltv);
+        vm.serializeString(
+          key,
+          'collateralBitmap',
+          vm.toString(pool.getEModeCategoryCollateralBitmap(i))
         );
-        string memory key = vm.toString(configs[i].eModeCategory);
-        vm.serializeUint(key, 'eModeCategory', configs[i].eModeCategory);
-        vm.serializeString(key, 'label', category.label);
-        vm.serializeUint(key, 'ltv', category.ltv);
-        vm.serializeUint(key, 'liquidationThreshold', category.liquidationThreshold);
-        vm.serializeUint(key, 'liquidationBonus', category.liquidationBonus);
-        string memory object = vm.serializeAddress(key, 'priceSource', category.priceSource);
+        vm.serializeString(
+          key,
+          'borrowableBitmap',
+          vm.toString(pool.getEModeCategoryBorrowableBitmap(i))
+        );
+        vm.serializeUint(key, 'liquidationThreshold', cfg.liquidationThreshold);
+        string memory object = vm.serializeUint(key, 'liquidationBonus', cfg.liquidationBonus);
         content = vm.serializeString(eModesKey, key, object);
+        emptyCounter = 0;
       }
     }
     string memory output = vm.serializeString('root', 'eModes', content);
@@ -256,6 +258,7 @@ contract ProtocolV3TestBase is DiffUtils {
       string memory key = vm.toString(config.underlying);
       vm.serializeJson(key, '{}');
       vm.serializeString(key, 'symbol', config.symbol);
+      vm.serializeUint(key, 'id', i);
       vm.serializeUint(key, 'ltv', config.ltv);
       vm.serializeUint(key, 'liquidationThreshold', config.liquidationThreshold);
       vm.serializeUint(key, 'liquidationBonus', config.liquidationBonus);
@@ -265,10 +268,8 @@ contract ProtocolV3TestBase is DiffUtils {
       vm.serializeUint(key, 'borrowCap', config.borrowCap);
       vm.serializeUint(key, 'supplyCap', config.supplyCap);
       vm.serializeUint(key, 'debtCeiling', config.debtCeiling);
-      vm.serializeUint(key, 'eModeCategory', config.eModeCategory);
       vm.serializeBool(key, 'usageAsCollateralEnabled', config.usageAsCollateralEnabled);
       vm.serializeBool(key, 'borrowingEnabled', config.borrowingEnabled);
-      vm.serializeBool(key, 'stableBorrowRateEnabled', config.stableBorrowRateEnabled);
       vm.serializeBool(key, 'isPaused', config.isPaused);
       vm.serializeBool(key, 'isActive', config.isActive);
       vm.serializeBool(key, 'isFrozen', config.isFrozen);
@@ -278,7 +279,6 @@ contract ProtocolV3TestBase is DiffUtils {
       vm.serializeAddress(key, 'interestRateStrategy', config.interestRateStrategy);
       vm.serializeAddress(key, 'underlying', config.underlying);
       vm.serializeAddress(key, 'aToken', config.aToken);
-      vm.serializeAddress(key, 'stableDebtToken', config.stableDebtToken);
       vm.serializeAddress(key, 'variableDebtToken', config.variableDebtToken);
       vm.serializeAddress(
         key,
@@ -287,20 +287,6 @@ contract ProtocolV3TestBase is DiffUtils {
       );
       vm.serializeString(key, 'aTokenSymbol', IERC20Detailed(config.aToken).symbol());
       vm.serializeString(key, 'aTokenName', IERC20Detailed(config.aToken).name());
-      vm.serializeAddress(
-        key,
-        'stableDebtTokenImpl',
-        ProxyHelpers.getInitializableAdminUpgradeabilityProxyImplementation(
-          vm,
-          config.stableDebtToken
-        )
-      );
-      vm.serializeString(
-        key,
-        'stableDebtTokenSymbol',
-        IERC20Detailed(config.stableDebtToken).symbol()
-      );
-      vm.serializeString(key, 'stableDebtTokenName', IERC20Detailed(config.stableDebtToken).name());
       vm.serializeAddress(
         key,
         'variableDebtTokenImpl',
@@ -338,13 +324,17 @@ contract ProtocolV3TestBase is DiffUtils {
       }
 
       vm.serializeBool(key, 'virtualAccountingActive', config.virtualAccActive);
-      vm.serializeUint(key, 'virtualBalance', config.virtualBalance);
-      vm.serializeUint(key, 'aTokenUnderlyingBalance', config.aTokenUnderlyingBalance);
+      vm.serializeString(key, 'virtualBalance', vm.toString(config.virtualBalance));
+      vm.serializeString(
+        key,
+        'aTokenUnderlyingBalance',
+        vm.toString(config.aTokenUnderlyingBalance)
+      );
 
-      string memory out = vm.serializeUint(
+      string memory out = vm.serializeString(
         key,
         'oracleLatestAnswer',
-        uint256(oracle.getAssetPrice(config.underlying))
+        vm.toString(uint256(oracle.getAssetPrice(config.underlying)))
       );
       content = vm.serializeString(reservesKey, key, out);
     }
@@ -414,8 +404,9 @@ contract ProtocolV3TestBase is DiffUtils {
     address underlyingAddress
   ) internal view virtual returns (ReserveTokens memory) {
     ReserveTokens memory reserveTokens;
-    (reserveTokens.aToken, reserveTokens.stableDebtToken, reserveTokens.variableDebtToken) = pdp
-      .getReserveTokensAddresses(underlyingAddress);
+    (reserveTokens.aToken, , reserveTokens.variableDebtToken) = pdp.getReserveTokensAddresses(
+      underlyingAddress
+    );
 
     return reserveTokens;
   }
@@ -437,7 +428,6 @@ contract ProtocolV3TestBase is DiffUtils {
     );
     localConfig.aToken = reserveTokens.aToken;
     localConfig.variableDebtToken = reserveTokens.variableDebtToken;
-    localConfig.stableDebtToken = reserveTokens.stableDebtToken;
     localConfig.interestRateStrategy = pool
       .getReserveData(reserve.tokenAddress)
       .interestRateStrategyAddress;
@@ -446,14 +436,12 @@ contract ProtocolV3TestBase is DiffUtils {
       localConfig.liquidationThreshold,
       localConfig.liquidationBonus,
       localConfig.decimals,
-      localConfig.reserveFactor,
-      localConfig.eModeCategory
+      localConfig.reserveFactor
     ) = configuration.getParams();
     (
       localConfig.isActive,
       localConfig.isFrozen,
       localConfig.borrowingEnabled,
-      localConfig.stableBorrowRateEnabled,
       localConfig.isPaused
     ) = configuration.getFlags();
     localConfig.symbol = reserve.symbol;
@@ -488,7 +476,6 @@ contract ProtocolV3TestBase is DiffUtils {
         symbol: config.symbol,
         underlying: config.underlying,
         aToken: config.aToken,
-        stableDebtToken: config.stableDebtToken,
         variableDebtToken: config.variableDebtToken,
         decimals: config.decimals,
         ltv: config.ltv,
@@ -499,7 +486,6 @@ contract ProtocolV3TestBase is DiffUtils {
         usageAsCollateralEnabled: config.usageAsCollateralEnabled,
         borrowingEnabled: config.borrowingEnabled,
         interestRateStrategy: config.interestRateStrategy,
-        stableBorrowRateEnabled: config.stableBorrowRateEnabled,
         isPaused: config.isPaused,
         isActive: config.isActive,
         isFrozen: config.isFrozen,
@@ -509,7 +495,6 @@ contract ProtocolV3TestBase is DiffUtils {
         supplyCap: config.supplyCap,
         borrowCap: config.borrowCap,
         debtCeiling: config.debtCeiling,
-        eModeCategory: config.eModeCategory,
         virtualAccActive: config.virtualAccActive,
         virtualBalance: config.virtualBalance,
         aTokenUnderlyingBalance: config.aTokenUnderlyingBalance
@@ -584,10 +569,6 @@ contract ProtocolV3TestBase is DiffUtils {
       config.borrowingEnabled == expectedConfig.borrowingEnabled,
       '_validateReserveConfig: INVALID_BORROWING_ENABLED'
     );
-    require(
-      config.stableBorrowRateEnabled == expectedConfig.stableBorrowRateEnabled,
-      '_validateReserveConfig: INVALID_STABLE_BORROW_ENABLED'
-    );
     require(
       config.isActive == expectedConfig.isActive,
       '_validateReserveConfig: INVALID_IS_ACTIVE'
@@ -620,10 +601,6 @@ contract ProtocolV3TestBase is DiffUtils {
       config.debtCeiling == expectedConfig.debtCeiling,
       '_validateReserveConfig: INVALID_DEBT_CEILING'
     );
-    require(
-      config.eModeCategory == expectedConfig.eModeCategory,
-      '_validateReserveConfig: INVALID_EMODE_CATEGORY'
-    );
     require(
       config.interestRateStrategy == expectedConfig.interestRateStrategy,
       '_validateReserveConfig: INVALID_INTEREST_RATE_STRATEGY'
@@ -724,10 +701,6 @@ contract ProtocolV3TestBase is DiffUtils {
       config1.aToken == config2.aToken,
       '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_A_TOKEN_CHANGED'
     );
-    require(
-      config1.stableDebtToken == config2.stableDebtToken,
-      '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_STABLE_DEBT_TOKEN_CHANGED'
-    );
     require(
       config1.variableDebtToken == config2.variableDebtToken,
       '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_VARIABLE_DEBT_TOKEN_CHANGED'
@@ -768,10 +741,6 @@ contract ProtocolV3TestBase is DiffUtils {
       config1.interestRateStrategy == config2.interestRateStrategy,
       '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_INTEREST_RATE_STRATEGY_CHANGED'
     );
-    require(
-      config1.stableBorrowRateEnabled == config2.stableBorrowRateEnabled,
-      '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_STABLE_BORROWING_CHANGED'
-    );
     require(
       config1.isActive == config2.isActive,
       '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_IS_ACTIVE_CHANGED'
@@ -804,10 +773,6 @@ contract ProtocolV3TestBase is DiffUtils {
       config1.debtCeiling == config2.debtCeiling,
       '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_DEBT_CEILING_CHANGED'
     );
-    require(
-      config1.eModeCategory == config2.eModeCategory,
-      '_noReservesConfigsChangesApartNewListings() : UNEXPECTED_E_MODE_CATEGORY_CHANGED'
-    );
   }
 
   function _validateCountOfListings(
@@ -837,13 +802,6 @@ contract ProtocolV3TestBase is DiffUtils {
       ) == expectedImpls.variableDebtToken,
       '_validateReserveTokensImpls() : INVALID_ATOKEN_IMPL'
     );
-    require(
-      ProxyHelpers.getInitializableAdminUpgradeabilityProxyImplementation(
-        vm,
-        config.stableDebtToken
-      ) == expectedImpls.stableDebtToken,
-      '_validateReserveTokensImpls() : INVALID_STABLE_DEBT_IMPL'
-    );
     vm.stopPrank();
   }
 
@@ -860,61 +818,38 @@ contract ProtocolV3TestBase is DiffUtils {
     );
   }
 
-  function _validateAssetsOnEmodeCategory(
-    uint256 category,
-    ReserveConfig[] memory assetsConfigs,
-    string[] memory expectedAssets
-  ) internal pure {
-    string[] memory assetsInCategory = new string[](assetsConfigs.length);
-
-    uint256 countCategory;
-    for (uint256 i = 0; i < assetsConfigs.length; i++) {
-      if (assetsConfigs[i].eModeCategory == category) {
-        assetsInCategory[countCategory] = assetsConfigs[i].symbol;
-        require(
-          keccak256(bytes(assetsInCategory[countCategory])) ==
-            keccak256(bytes(expectedAssets[countCategory])),
-          '_getAssetOnEmodeCategory(): INCONSISTENT_ASSETS'
-        );
-        countCategory++;
-        if (countCategory > expectedAssets.length) {
-          revert('_getAssetOnEmodeCategory(): MORE_ASSETS_IN_CATEGORY_THAN_EXPECTED');
-        }
-      }
-    }
-    if (countCategory < expectedAssets.length) {
-      revert('_getAssetOnEmodeCategory(): LESS_ASSETS_IN_CATEGORY_THAN_EXPECTED');
-    }
-  }
-
   function _validateEmodeCategory(
     IPoolAddressesProvider addressesProvider,
     uint256 category,
     DataTypes.EModeCategory memory expectedCategoryData
   ) internal view {
     address poolAddress = addressesProvider.getPool();
-    DataTypes.EModeCategory memory currentCategoryData = IPool(poolAddress).getEModeCategoryData(
+    DataTypes.CollateralConfig memory cfg = IPool(poolAddress).getEModeCategoryCollateralConfig(
       uint8(category)
     );
     require(
-      keccak256(bytes(currentCategoryData.label)) == keccak256(bytes(expectedCategoryData.label)),
+      keccak256(bytes(IPool(poolAddress).getEModeCategoryLabel(uint8(category)))) ==
+        keccak256(bytes(expectedCategoryData.label)),
       '_validateEmodeCategory(): INVALID_LABEL'
     );
+    require(cfg.ltv == expectedCategoryData.ltv, '_validateEmodeCategory(): INVALID_LTV');
     require(
-      currentCategoryData.ltv == expectedCategoryData.ltv,
-      '_validateEmodeCategory(): INVALID_LTV'
+      cfg.liquidationThreshold == expectedCategoryData.liquidationThreshold,
+      '_validateEmodeCategory(): INVALID_LT'
     );
     require(
-      currentCategoryData.liquidationThreshold == expectedCategoryData.liquidationThreshold,
-      '_validateEmodeCategory(): INVALID_LT'
+      cfg.liquidationBonus == expectedCategoryData.liquidationBonus,
+      '_validateEmodeCategory(): INVALID_LB'
     );
     require(
-      currentCategoryData.liquidationBonus == expectedCategoryData.liquidationBonus,
+      IPool(poolAddress).getEModeCategoryCollateralBitmap(uint8(category)) ==
+        expectedCategoryData.collateralBitmap,
       '_validateEmodeCategory(): INVALID_LB'
     );
     require(
-      currentCategoryData.priceSource == expectedCategoryData.priceSource,
-      '_validateEmodeCategory(): INVALID_PRICE_SOURCE'
+      IPool(poolAddress).getEModeCategoryBorrowableBitmap(uint8(category)) ==
+        expectedCategoryData.borrowableBitmap,
+      '_validateEmodeCategory(): INVALID_LB'
     );
   }
 
diff --git a/tests/utils/SigUtils.sol b/tests/utils/SigUtils.sol
index a41339fd..7f6ecb65 100644
--- a/tests/utils/SigUtils.sol
+++ b/tests/utils/SigUtils.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.10;
 
-import {IERC20AaveLM} from '../../src/periphery/contracts/static-a-token/interfaces/IERC20AaveLM.sol';
+import {IERC20AaveLM} from '../../src/contracts/extensions/static-a-token/interfaces/IERC20AaveLM.sol';
 
 library SigUtils {
   bytes32 internal constant PERMIT_TYPEHASH =
diff --git a/tests/utils/TestnetProcedures.sol b/tests/utils/TestnetProcedures.sol
index cbf778e3..7f12bc76 100644
--- a/tests/utils/TestnetProcedures.sol
+++ b/tests/utils/TestnetProcedures.sol
@@ -8,31 +8,31 @@ import {DeployUtils} from '../../src/deployments/contracts/utilities/DeployUtils
 import {FfiUtils} from '../../src/deployments/contracts/utilities/FfiUtils.sol';
 import {DefaultMarketInput} from '../../src/deployments/inputs/DefaultMarketInput.sol';
 import {AaveV3BatchOrchestration} from '../../src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol';
-import {IPoolAddressesProvider} from 'aave-v3-core/contracts/interfaces/IPoolAddressesProvider.sol';
+import {IPoolAddressesProvider} from '../../src/contracts/interfaces/IPoolAddressesProvider.sol';
 import {AaveV3TestListing} from '../mocks/AaveV3TestListing.sol';
-import {ACLManager, Errors} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {WETH9} from 'aave-v3-core/contracts/dependencies/weth/WETH9.sol';
-import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
-import {PoolConfigurator} from 'aave-v3-core/contracts/protocol/pool/PoolConfigurator.sol';
-import {DefaultReserveInterestRateStrategyV2} from 'aave-v3-core/contracts/protocol/pool/DefaultReserveInterestRateStrategyV2.sol';
-import {ReserveConfiguration} from 'aave-v3-core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {PercentageMath} from 'aave-v3-core/contracts/protocol/libraries/math/PercentageMath.sol';
-import {AaveProtocolDataProvider} from 'aave-v3-core/contracts/misc/AaveProtocolDataProvider.sol';
+import {ACLManager, Errors} from '../../src/contracts/protocol/configuration/ACLManager.sol';
+import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
+import {TestnetERC20} from '../../src/contracts/mocks/testnet-helpers/TestnetERC20.sol';
+import {PoolConfigurator} from '../../src/contracts/protocol/pool/PoolConfigurator.sol';
+import {DefaultReserveInterestRateStrategyV2} from '../../src/contracts/misc/DefaultReserveInterestRateStrategyV2.sol';
+import {ReserveConfiguration} from '../../src/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {PercentageMath} from '../../src/contracts/protocol/libraries/math/PercentageMath.sol';
+import {AaveProtocolDataProvider} from '../../src/contracts/helpers/AaveProtocolDataProvider.sol';
 import {MarketReportUtils} from '../../src/deployments/contracts/utilities/MarketReportUtils.sol';
-import {AaveV3ConfigEngine, IAaveV3ConfigEngine} from 'aave-v3-periphery/contracts/v3-config-engine/AaveV3ConfigEngine.sol';
+import {AaveV3ConfigEngine, IAaveV3ConfigEngine} from '../../src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol';
 
 struct TestVars {
+  uint8 underlyingDecimals;
   string aTokenName;
   string aTokenSymbol;
   string variableDebtName;
   string variableDebtSymbol;
-  string stableDebtName;
-  string stableDebtSymbol;
   address rateStrategy;
-  bytes interestRateData;
-  bytes emptyParams;
-  uint256 previousReservesLength;
+  address incentivesController;
+  address treasury;
+  bool useVirtualBalance;
 }
+
 struct TestReserveConfig {
   uint256 decimals;
   uint256 ltv;
@@ -41,7 +41,6 @@ struct TestReserveConfig {
   uint256 reserveFactor;
   bool usageAsCollateralEnabled;
   bool borrowingEnabled;
-  bool stableBorrowRateEnabled;
   bool isActive;
   bool isFrozen;
   bool isPaused;
@@ -84,7 +83,6 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
     uint16 ltv;
     uint16 lt;
     uint16 lb;
-    address oracle;
     string label;
   }
 
@@ -254,7 +252,7 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
       uint256 reserveFactor,
       bool usageAsCollateralEnabled,
       bool borrowingEnabled,
-      bool stableBorrowRateEnabled,
+      ,
       bool isActive,
       bool isFrozen
     ) = IPoolDataProvider(dataProvider).getReserveConfigurationData(reserve);
@@ -265,7 +263,6 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
     c.reserveFactor = reserveFactor;
     c.usageAsCollateralEnabled = usageAsCollateralEnabled;
     c.borrowingEnabled = borrowingEnabled;
-    c.stableBorrowRateEnabled = stableBorrowRateEnabled;
     c.isActive = isActive;
     c.isFrozen = isFrozen;
     c.isPaused = IPoolDataProvider(dataProvider).getPaused(reserve);
@@ -278,58 +275,67 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
     return string(abi.encodePacked(a, vm.toString(b)));
   }
 
-  function _generateListingInput(
-    uint256 listings,
+  function _generateInitConfig(
+    TestVars memory t,
+    MarketReport memory r,
+    address poolAdminUser,
+    bool isValidDecimals
+  ) internal returns (ConfiguratorInputTypes.InitReserveInput[] memory) {
+    TestVars[] memory tArray = new TestVars[](1);
+    tArray[0] = t;
+    return _generateInitConfig(tArray, r, poolAdminUser, isValidDecimals);
+  }
+
+  function _generateInitConfig(
+    TestVars[] memory t,
     MarketReport memory r,
-    address poolAdminUser
+    address poolAdminUser,
+    bool isValidDecimals
   ) internal returns (ConfiguratorInputTypes.InitReserveInput[] memory) {
     ConfiguratorInputTypes.InitReserveInput[]
-      memory input = new ConfiguratorInputTypes.InitReserveInput[](listings);
-
-    for (uint256 x; x < listings; ++x) {
-      TestnetERC20 listingToken = new TestnetERC20(
-        _concatStr('Token', x),
-        _concatStr('T', x),
-        uint8(10 + x),
-        poolAdminUser
-      );
-      TestVars memory t;
-      t.aTokenName = _concatStr('AToken ', x);
-      t.aTokenName = _concatStr('a ', x);
-      t.variableDebtName = _concatStr('Variable Debt Misc', x);
-      t.variableDebtSymbol = _concatStr('varDebtMISC ', x);
-      t.stableDebtName = _concatStr('Stable Debt Misc ', x);
-      t.stableDebtSymbol = _concatStr('stableDebtMISC ', x);
-      t.rateStrategy = r.defaultInterestRateStrategy;
-      t.interestRateData = abi.encode(
-        IDefaultInterestRateStrategyV2.InterestRateData({
-          optimalUsageRatio: 80_00,
-          baseVariableBorrowRate: 1_00,
-          variableRateSlope1: 4_00,
-          variableRateSlope2: 60_00
-        })
-      );
+      memory configurations = new ConfiguratorInputTypes.InitReserveInput[](t.length);
+    for (uint256 i = 0; i < t.length; i++) {
+      configurations[i] = _generateInitReserveInput(t[i], r, poolAdminUser, isValidDecimals);
+    }
+    return configurations;
+  }
 
-      input[x] = ConfiguratorInputTypes.InitReserveInput(
-        r.aToken,
-        r.stableDebtToken,
-        r.variableDebtToken,
-        true,
-        t.rateStrategy,
-        address(listingToken),
-        r.treasury,
-        r.rewardsControllerProxy,
-        t.aTokenName,
-        t.aTokenSymbol,
-        t.variableDebtName,
-        t.variableDebtSymbol,
-        t.stableDebtName,
-        t.stableDebtSymbol,
-        t.emptyParams,
-        t.interestRateData
-      );
+  function _generateInitReserveInput(
+    TestVars memory t,
+    MarketReport memory r,
+    address poolAdminUser,
+    bool isValidDecimals
+  ) internal returns (ConfiguratorInputTypes.InitReserveInput memory) {
+    if (isValidDecimals) {
+      t.underlyingDecimals = uint8(bound(t.underlyingDecimals, 6, 25));
+    } else {
+      t.underlyingDecimals = uint8(bound(t.underlyingDecimals, 0, 5));
     }
 
+    ConfiguratorInputTypes.InitReserveInput memory input;
+    input.aTokenImpl = r.aToken;
+    input.underlyingAsset = address(
+      new TestnetERC20('Misc Token', 'MISC', t.underlyingDecimals, poolAdminUser)
+    );
+    input.variableDebtTokenImpl = r.variableDebtToken;
+    input.useVirtualBalance = t.useVirtualBalance;
+    input.interestRateStrategyAddress = r.defaultInterestRateStrategy;
+    input.treasury = t.treasury;
+    input.incentivesController = r.rewardsControllerProxy;
+    input.aTokenName = t.aTokenName;
+    input.aTokenSymbol = t.aTokenSymbol;
+    input.variableDebtTokenName = t.variableDebtName;
+    input.variableDebtTokenSymbol = t.variableDebtSymbol;
+    input.params = bytes('');
+    input.interestRateData = abi.encode(
+      IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: 80_00,
+        baseVariableBorrowRate: 1_00,
+        variableRateSlope1: 4_00,
+        variableRateSlope2: 60_00
+      })
+    );
+
     return input;
   }
 
@@ -338,11 +344,11 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
   }
 
   function _genCategoryOne() internal pure returns (EModeCategoryInput memory) {
-    return EModeCategoryInput(1, 95_00, 96_00, 101_00, address(0x0), 'GROUP_A');
+    return EModeCategoryInput(1, 95_00, 96_00, 101_00, 'GROUP_A');
   }
 
   function _genCategoryTwo() internal pure returns (EModeCategoryInput memory) {
-    return EModeCategoryInput(2, 96_00, 97_00, 101_50, address(0x0), 'GROUP_B');
+    return EModeCategoryInput(2, 96_00, 97_00, 101_50, 'GROUP_B');
   }
 
   function _calcPrice(uint256 price, uint256 percent) public pure returns (uint256) {
@@ -353,7 +359,6 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
 
   function _calculateInterestRates(
     uint256 borrowAmount,
-    uint256 borrowMode,
     address token
   ) internal view returns (uint256) {
     DataTypes.ReserveDataLegacy memory reserveData = IPool(report.poolProxy).getReserveData(token);
@@ -366,22 +371,15 @@ contract TestnetProcedures is Test, DeployUtils, FfiUtils, DefaultMarketInput {
       unbacked: 0,
       liquidityAdded: 0,
       liquidityTaken: borrowAmount,
-      totalStableDebt: borrowMode == 1 ? borrowAmount : 0,
-      totalVariableDebt: borrowMode == 2 ? borrowAmount : 0,
-      averageStableBorrowRate: 0,
+      totalDebt: borrowAmount,
       reserveFactor: reserveConfig.reserveFactor,
       reserve: token,
       usingVirtualBalance: IPool(report.poolProxy).getConfiguration(token).getIsVirtualAccActive(),
       virtualUnderlyingBalance: IPool(report.poolProxy).getVirtualUnderlyingBalance(token)
     });
 
-    if (borrowMode == 2) {
-      (, , uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
-      return expectedVariableBorrowRate;
-    } else {
-      (, uint256 stableRate, ) = rateStrategy.calculateInterestRates(input);
-      return stableRate;
-    }
+    (, uint256 expectedVariableBorrowRate) = rateStrategy.calculateInterestRates(input);
+    return expectedVariableBorrowRate;
   }
 
   function _deployInterestRateStrategy() internal returns (address) {
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000..ef5133db
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,1048 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@adraffy/ens-normalize@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7"
+  integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==
+
+"@assemblyscript/loader@^0.9.4":
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.9.4.tgz#a483c54c1253656bb33babd464e3154a173e1577"
+  integrity sha512-HazVq9zwTVwGmqdwYzu7WyQ6FQVZ7SwET0KKQuKm55jD0IfUpZgN0OPIiZG3zV1iSrVYcN0bdwLRXI/VNCYsUA==
+
+"@bgd-labs/aave-address-book@^3.0.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-3.4.0.tgz#e139ffbb01eea7b51ea5b162e45a9b28e41d74bc"
+  integrity sha512-0msSmy6tF///f062FheaafONO2niOeWvD0nychrxMVXojcX+obM7g8Ad0+JjSfxmKoGxAYKGER7zF7WbBEz6nw==
+
+"@bgd-labs/aave-cli@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-cli/-/aave-cli-1.0.0.tgz#023cd576a73c229476afb984ba69a3179f80a5d7"
+  integrity sha512-Xs30iS10iagkLjRgQ1zPlZmJD9SkQMZsrimgzLUTlHan0uAiK45wYwvsX4XTFtvlQ+BCqzbzw/vZb8jMWE2kbw==
+  dependencies:
+    "@bgd-labs/aave-address-book" "^3.0.0"
+    "@bgd-labs/aave-v3-governance-cache" "^1.0.6"
+    "@bgd-labs/js-utils" "^1.4.2"
+    "@commander-js/extra-typings" "^11.1.0"
+    "@inquirer/prompts" "^3.3.2"
+    chalk "^4.1.2"
+    commander "^11.1.0"
+    deepmerge "^4.3.1"
+    dotenv "^16.4.1"
+    find-object-paths "^1.1.0"
+    gray-matter "^4.0.3"
+    ipfs-unixfs-importer "^15.3.1"
+    json-bigint "^1.0.0"
+    object-hash "^3.0.0"
+    viem "^2.17.11"
+    zod "^3.23.8"
+
+"@bgd-labs/aave-v3-governance-cache@^1.0.6":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-v3-governance-cache/-/aave-v3-governance-cache-1.0.7.tgz#14c7cf32e8d9502c3e8ccf28a980ba662a80ad84"
+  integrity sha512-0viMU8RdJJZ9+pp+YY5LbQJBekgTzxU45+mFLZt6pwqqzhoX3UzBQtq8RmpOQMyoSq+d+axPBQV1K2Hx6gOybg==
+
+"@bgd-labs/js-utils@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/js-utils/-/js-utils-1.4.2.tgz#dd6d954fdda153d76cbcabaeff9b7e8adcf528b1"
+  integrity sha512-hKiorNIyEApdH1w7laYQ+sGkrCGZTem9kD5Ud7YP/ZKtkoPx12FcTAp+P+JZ42BerPEqzGLZMDRJDB2ZGKeAJw==
+  dependencies:
+    "@supercharge/promise-pool" "^3.1.1"
+    bs58 "^5.0.0"
+    gray-matter "^4.0.3"
+    tsx "^4.7.1"
+
+"@commander-js/extra-typings@^11.1.0":
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/@commander-js/extra-typings/-/extra-typings-11.1.0.tgz#dd19fcb8cc6e33ede237fc1b7af96c70833d8f93"
+  integrity sha512-GuvZ38d23H+7Tz2C9DhzCepivsOsky03s5NI+KCy7ke1FNUvsJ2oO47scQ9YaGGhgjgNW5OYYNSADmbjcSoIhw==
+
+"@esbuild/aix-ppc64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz#51299374de171dbd80bb7d838e1cfce9af36f353"
+  integrity sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==
+
+"@esbuild/android-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz#58565291a1fe548638adb9c584237449e5e14018"
+  integrity sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==
+
+"@esbuild/android-arm@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.1.tgz#5eb8c652d4c82a2421e3395b808e6d9c42c862ee"
+  integrity sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==
+
+"@esbuild/android-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.1.tgz#ae19d665d2f06f0f48a6ac9a224b3f672e65d517"
+  integrity sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==
+
+"@esbuild/darwin-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz#05b17f91a87e557b468a9c75e9d85ab10c121b16"
+  integrity sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==
+
+"@esbuild/darwin-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz#c58353b982f4e04f0d022284b8ba2733f5ff0931"
+  integrity sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==
+
+"@esbuild/freebsd-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz#f9220dc65f80f03635e1ef96cfad5da1f446f3bc"
+  integrity sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==
+
+"@esbuild/freebsd-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz#69bd8511fa013b59f0226d1609ac43f7ce489730"
+  integrity sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==
+
+"@esbuild/linux-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz#8050af6d51ddb388c75653ef9871f5ccd8f12383"
+  integrity sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==
+
+"@esbuild/linux-arm@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz#ecaabd1c23b701070484990db9a82f382f99e771"
+  integrity sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==
+
+"@esbuild/linux-ia32@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz#3ed2273214178109741c09bd0687098a0243b333"
+  integrity sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==
+
+"@esbuild/linux-loong64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz#a0fdf440b5485c81b0fbb316b08933d217f5d3ac"
+  integrity sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==
+
+"@esbuild/linux-mips64el@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz#e11a2806346db8375b18f5e104c5a9d4e81807f6"
+  integrity sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==
+
+"@esbuild/linux-ppc64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz#06a2744c5eaf562b1a90937855b4d6cf7c75ec96"
+  integrity sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==
+
+"@esbuild/linux-riscv64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz#65b46a2892fc0d1af4ba342af3fe0fa4a8fe08e7"
+  integrity sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==
+
+"@esbuild/linux-s390x@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz#e71ea18c70c3f604e241d16e4e5ab193a9785d6f"
+  integrity sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==
+
+"@esbuild/linux-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz#d47f97391e80690d4dfe811a2e7d6927ad9eed24"
+  integrity sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==
+
+"@esbuild/netbsd-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz#44e743c9778d57a8ace4b72f3c6b839a3b74a653"
+  integrity sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==
+
+"@esbuild/openbsd-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz#05c5a1faf67b9881834758c69f3e51b7dee015d7"
+  integrity sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==
+
+"@esbuild/openbsd-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz#2e58ae511bacf67d19f9f2dcd9e8c5a93f00c273"
+  integrity sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==
+
+"@esbuild/sunos-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz#adb022b959d18d3389ac70769cef5a03d3abd403"
+  integrity sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==
+
+"@esbuild/win32-arm64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz#84906f50c212b72ec360f48461d43202f4c8b9a2"
+  integrity sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==
+
+"@esbuild/win32-ia32@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz#5e3eacc515820ff729e90d0cb463183128e82fac"
+  integrity sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==
+
+"@esbuild/win32-x64@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699"
+  integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==
+
+"@inquirer/checkbox@^1.5.2":
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-1.5.2.tgz#043ca370ebbc0b92691c2309bc12e8716ed701c4"
+  integrity sha512-CifrkgQjDkUkWexmgYYNyB5603HhTHI91vLFeQXh6qrTKiCMVASol01Rs1cv6LP/A2WccZSRlJKZhbaBIs/9ZA==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/confirm@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-2.0.17.tgz#a45eb1b973c51c993a3c093a0114e960b1cf09a4"
+  integrity sha512-EqzhGryzmGpy2aJf6LxJVhndxYmFs+m8cxXzf8nejb1DE3sabf6mUgBcp4J0jAUEiAcYzqmkqRr7LPFh/WdnXA==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    chalk "^4.1.2"
+
+"@inquirer/core@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-6.0.0.tgz#d44ccd8ae09a4879a78f09cca35bf1ab894b95f4"
+  integrity sha512-fKi63Khkisgda3ohnskNf5uZJj+zXOaBvOllHsOkdsXRA/ubQLJQrZchFFi57NKbZzkTunXiBMdvWOv71alonw==
+  dependencies:
+    "@inquirer/type" "^1.1.6"
+    "@types/mute-stream" "^0.0.4"
+    "@types/node" "^20.10.7"
+    "@types/wrap-ansi" "^3.0.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    cli-spinners "^2.9.2"
+    cli-width "^4.1.0"
+    figures "^3.2.0"
+    mute-stream "^1.0.0"
+    run-async "^3.0.0"
+    signal-exit "^4.1.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^6.2.0"
+
+"@inquirer/editor@^1.2.15":
+  version "1.2.15"
+  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-1.2.15.tgz#28de2dabbcf1e07a37149320093798e3f4856f91"
+  integrity sha512-gQ77Ls09x5vKLVNMH9q/7xvYPT6sIs5f7URksw+a2iJZ0j48tVS6crLqm2ugG33tgXHIwiEqkytY60Zyh5GkJQ==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    chalk "^4.1.2"
+    external-editor "^3.1.0"
+
+"@inquirer/expand@^1.1.16":
+  version "1.1.16"
+  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-1.1.16.tgz#63dce81240e5f7b2b1d7942b3e3cae18f4f03d07"
+  integrity sha512-TGLU9egcuo+s7PxphKUCnJnpCIVY32/EwPCLLuu+gTvYiD8hZgx8Z2niNQD36sa6xcfpdLY6xXDBiL/+g1r2XQ==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/input@^1.2.16":
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-1.2.16.tgz#94d8765a47689e799fd55ed0361dedc8f554341b"
+  integrity sha512-Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    chalk "^4.1.2"
+
+"@inquirer/password@^1.1.16":
+  version "1.1.16"
+  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-1.1.16.tgz#37ddebbe37c6e76f8ad27d1f726aacdd7c423558"
+  integrity sha512-aZYZVHLUXZ2gbBot+i+zOJrks1WaiI95lvZCn1sKfcw6MtSSlYC8uDX8sTzQvAsQ8epHoP84UNvAIT0KVGOGqw==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+
+"@inquirer/prompts@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-3.3.2.tgz#0c3a44bbf7e560439590f2fcb769cd8392b0f555"
+  integrity sha512-k52mOMRvTUejrqyF1h8Z07chC+sbaoaUYzzr1KrJXyj7yaX7Nrh0a9vktv8TuocRwIJOQMaj5oZEmkspEcJFYQ==
+  dependencies:
+    "@inquirer/checkbox" "^1.5.2"
+    "@inquirer/confirm" "^2.0.17"
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/editor" "^1.2.15"
+    "@inquirer/expand" "^1.1.16"
+    "@inquirer/input" "^1.2.16"
+    "@inquirer/password" "^1.1.16"
+    "@inquirer/rawlist" "^1.2.16"
+    "@inquirer/select" "^1.3.3"
+
+"@inquirer/rawlist@^1.2.16":
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-1.2.16.tgz#ac6cc0bb2a60d51dccdfe2c3ea624185f1fbd5bc"
+  integrity sha512-pZ6TRg2qMwZAOZAV6TvghCtkr53dGnK29GMNQ3vMZXSNguvGqtOVc4j/h1T8kqGJFagjyfBZhUPGwNS55O5qPQ==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    chalk "^4.1.2"
+
+"@inquirer/select@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-1.3.3.tgz#7d832ee603c15b706148e47cda29cdf6634cd94b"
+  integrity sha512-RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg==
+  dependencies:
+    "@inquirer/core" "^6.0.0"
+    "@inquirer/type" "^1.1.6"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    figures "^3.2.0"
+
+"@inquirer/type@^1.1.6":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.5.5.tgz#303ea04ce7ad2e585b921b662b3be36ef7b4f09b"
+  integrity sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==
+  dependencies:
+    mute-stream "^1.0.0"
+
+"@ipld/dag-pb@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-4.1.2.tgz#39db25311aeb2745ec20bfc745d91a577832b6ac"
+  integrity sha512-BSztO4l3C+ya9HjCaQot26Y4AVsqIKtnn6+23ubc1usucnf6yoTBme18oCCdM6gKBMxuPqju5ye3lh9WEJsdeQ==
+  dependencies:
+    multiformats "^13.1.0"
+
+"@multiformats/murmur3@^2.1.8":
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/@multiformats/murmur3/-/murmur3-2.1.8.tgz#81c1c15b6391109f3febfca4b3205196615a04e9"
+  integrity sha512-6vId1C46ra3R1sbJUOFCZnsUIveR9oF20yhPmAFxPm0JfrX3/ZRCgP3YDrBzlGoEppOXnA9czHeYc0T9mB6hbA==
+  dependencies:
+    multiformats "^13.0.0"
+    murmurhash3js-revisited "^3.0.0"
+
+"@noble/curves@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.4.0.tgz#f05771ef64da724997f69ee1261b2417a49522d6"
+  integrity sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==
+  dependencies:
+    "@noble/hashes" "1.4.0"
+
+"@noble/curves@^1.4.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.6.0.tgz#be5296ebcd5a1730fccea4786d420f87abfeb40b"
+  integrity sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==
+  dependencies:
+    "@noble/hashes" "1.5.0"
+
+"@noble/curves@~1.4.0":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.4.2.tgz#40309198c76ed71bc6dbf7ba24e81ceb4d0d1fe9"
+  integrity sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==
+  dependencies:
+    "@noble/hashes" "1.4.0"
+
+"@noble/hashes@1.4.0", "@noble/hashes@~1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
+  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
+
+"@noble/hashes@1.5.0", "@noble/hashes@^1.4.0", "@noble/hashes@~1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.5.0.tgz#abadc5ca20332db2b1b2aa3e496e9af1213570b0"
+  integrity sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==
+
+"@scure/base@~1.1.6", "@scure/base@~1.1.8":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.9.tgz#e5e142fbbfe251091f9c5f1dd4c834ac04c3dbd1"
+  integrity sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==
+
+"@scure/bip32@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.4.0.tgz#4e1f1e196abedcef395b33b9674a042524e20d67"
+  integrity sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==
+  dependencies:
+    "@noble/curves" "~1.4.0"
+    "@noble/hashes" "~1.4.0"
+    "@scure/base" "~1.1.6"
+
+"@scure/bip39@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.4.0.tgz#664d4f851564e2e1d4bffa0339f9546ea55960a6"
+  integrity sha512-BEEm6p8IueV/ZTfQLp/0vhw4NPnT9oWf5+28nvmeUICjP99f4vr2d+qc7AVGDDtwRep6ifR43Yed9ERVmiITzw==
+  dependencies:
+    "@noble/hashes" "~1.5.0"
+    "@scure/base" "~1.1.8"
+
+"@solidity-parser/parser@^0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.18.0.tgz#8e77a02a09ecce957255a2f48c9a7178ec191908"
+  integrity sha512-yfORGUIPgLck41qyN7nbwJRAx17/jAIXCTanHOJZhB6PJ1iAk/84b/xlsVKFSyNyLXIj0dhppoE0+CRws7wlzA==
+
+"@supercharge/promise-pool@^3.1.1":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@supercharge/promise-pool/-/promise-pool-3.2.0.tgz#a6ab4afdf798e453a6bb51c4ae340852e1266af8"
+  integrity sha512-pj0cAALblTZBPtMltWOlZTQSLT07jIaFNeM8TWoJD1cQMgDB9mcMlVMoetiB35OzNJpqQ2b+QEtwiR9f20mADg==
+
+"@types/mute-stream@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mute-stream/-/mute-stream-0.0.4.tgz#77208e56a08767af6c5e1237be8888e2f255c478"
+  integrity sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*":
+  version "22.5.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.5.tgz#52f939dd0f65fc552a4ad0b392f3c466cc5d7a44"
+  integrity sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==
+  dependencies:
+    undici-types "~6.19.2"
+
+"@types/node@^20.10.7":
+  version "20.16.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.5.tgz#d43c7f973b32ffdf9aa7bd4f80e1072310fd7a53"
+  integrity sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==
+  dependencies:
+    undici-types "~6.19.2"
+
+"@types/wrap-ansi@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"
+  integrity sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==
+
+abitype@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.0.5.tgz#29d0daa3eea867ca90f7e4123144c1d1270774b6"
+  integrity sha512-YzDhti7cjlfaBhHutMaboYB21Ha3rXR9QTkNJFzYC4kC8YclaiwPBBBJY8ejFdu2wnJeZCVZSMlQJ7fi8S6hsw==
+
+ansi-escapes@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+base-x@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
+  integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+bignumber.js@^9.0.0:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
+  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
+
+bl@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
+  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
+  dependencies:
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+bs58@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
+  integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
+  dependencies:
+    base-x "^4.0.0"
+
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
+catapulta-verify@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/catapulta-verify/-/catapulta-verify-1.1.1.tgz#46ac6c9ed50480ef982060147f4ff4a34609efd0"
+  integrity sha512-VZ9pQpno1bjjZ/+7d1AbPWkOhYcZdNSova5Y1L9jj8ftdimv3JrwDTg9i0fs4I8/A/sRXK7AUb1pmL3016Cykw==
+
+chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+cli-spinners@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
+
+cli-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
+  integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+commander@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
+
+debug@^4.3.1:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
+deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+dotenv@^16.4.1:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+esbuild@~0.23.0:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.1.tgz#40fdc3f9265ec0beae6f59824ade1bd3d3d2dab8"
+  integrity sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.23.1"
+    "@esbuild/android-arm" "0.23.1"
+    "@esbuild/android-arm64" "0.23.1"
+    "@esbuild/android-x64" "0.23.1"
+    "@esbuild/darwin-arm64" "0.23.1"
+    "@esbuild/darwin-x64" "0.23.1"
+    "@esbuild/freebsd-arm64" "0.23.1"
+    "@esbuild/freebsd-x64" "0.23.1"
+    "@esbuild/linux-arm" "0.23.1"
+    "@esbuild/linux-arm64" "0.23.1"
+    "@esbuild/linux-ia32" "0.23.1"
+    "@esbuild/linux-loong64" "0.23.1"
+    "@esbuild/linux-mips64el" "0.23.1"
+    "@esbuild/linux-ppc64" "0.23.1"
+    "@esbuild/linux-riscv64" "0.23.1"
+    "@esbuild/linux-s390x" "0.23.1"
+    "@esbuild/linux-x64" "0.23.1"
+    "@esbuild/netbsd-x64" "0.23.1"
+    "@esbuild/openbsd-arm64" "0.23.1"
+    "@esbuild/openbsd-x64" "0.23.1"
+    "@esbuild/sunos-x64" "0.23.1"
+    "@esbuild/win32-arm64" "0.23.1"
+    "@esbuild/win32-ia32" "0.23.1"
+    "@esbuild/win32-x64" "0.23.1"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  dependencies:
+    is-extendable "^0.1.0"
+
+external-editor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+find-object-paths@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-object-paths/-/find-object-paths-1.1.0.tgz#2d2fe99f24c95e63af4b51377a1ba0510490376c"
+  integrity sha512-UJvfPQibLUOrXl76PJ49cYbXJPsU1lYX6Pw7mHVW+ahaGx6kVHiozNIQriDc/EOlSvkDa6L9GyTFXPYQsa6sGA==
+
+fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+get-tsconfig@^4.7.5:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471"
+  integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
+gray-matter@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
+  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
+  dependencies:
+    js-yaml "^3.13.1"
+    kind-of "^6.0.2"
+    section-matter "^1.0.0"
+    strip-bom-string "^1.0.0"
+
+hamt-sharding@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/hamt-sharding/-/hamt-sharding-3.0.6.tgz#3643107a3021af66ac95684aec87b196add5ba57"
+  integrity sha512-nZeamxfymIWLpVcAN0CRrb7uVq3hCOGj9IcL6NMA6VVCVWqj+h9Jo/SmaWuS92AEDf1thmHsM5D5c70hM3j2Tg==
+  dependencies:
+    sparse-array "^1.3.1"
+    uint8arrays "^5.0.1"
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+inherits@^2.0.3, inherits@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+interface-blockstore@^5.3.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/interface-blockstore/-/interface-blockstore-5.3.1.tgz#03f511431be2b8b04a536eaae8effe4565ea6536"
+  integrity sha512-nhgrQnz6yUQEqxTFLhlOBurQOy5lWlwCpgFmZ3GTObTVTQS9RZjK/JTozY6ty9uz2lZs7VFJSqwjWAltorJ4Vw==
+  dependencies:
+    interface-store "^6.0.0"
+    multiformats "^13.2.3"
+
+interface-store@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-6.0.2.tgz#1746a1ee07634f7678b3aa778738b79e3f75c909"
+  integrity sha512-KSFCXtBlNoG0hzwNa0RmhHtrdhzexp+S+UY2s0rWTBJyfdEIgn6i6Zl9otVqrcFYbYrneBT7hbmHQ8gE0C3umA==
+
+ipfs-unixfs-importer@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/ipfs-unixfs-importer/-/ipfs-unixfs-importer-15.3.1.tgz#93cf3bad77e3fff7ee25b4ba822c1a0d2fd56b6e"
+  integrity sha512-wHCTBqNsZXLJZ9/GSr7Msb3FDXD5yXF20Y9sKyUbbqNjbvaXs3n3h1+NM/5+WrgESHfwRcJIlJtaOKafL8Ymdg==
+  dependencies:
+    "@ipld/dag-pb" "^4.1.2"
+    "@multiformats/murmur3" "^2.1.8"
+    hamt-sharding "^3.0.6"
+    interface-blockstore "^5.3.0"
+    interface-store "^6.0.0"
+    ipfs-unixfs "^11.0.0"
+    it-all "^3.0.6"
+    it-batch "^3.0.6"
+    it-first "^3.0.6"
+    it-parallel-batch "^3.0.6"
+    multiformats "^13.2.3"
+    progress-events "^1.0.1"
+    rabin-wasm "^0.1.5"
+    uint8arraylist "^2.4.8"
+    uint8arrays "^5.1.0"
+
+ipfs-unixfs@^11.0.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-11.2.0.tgz#a7f3d1f9bce29033f273bda124a0eb8bc0c752f6"
+  integrity sha512-J8FN1qM5nfrDo8sQKQwfj0+brTg1uBfZK2vY9hxci33lcl3BFrsELS9+1+4q/8tO1ASKfxZO8W3Pi2O4sVX2Lg==
+  dependencies:
+    protons-runtime "^5.5.0"
+    uint8arraylist "^2.4.8"
+
+is-extendable@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+isows@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.4.tgz#810cd0d90cc4995c26395d2aa4cfa4037ebdf061"
+  integrity sha512-hEzjY+x9u9hPmBom9IIAqdJCwNLax+xrPb51vEPpERoFlIxgmZcHzsT5jKG06nvInKOBGvReAVz80Umed5CczQ==
+
+it-all@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/it-all/-/it-all-3.0.6.tgz#30a4f922ae9ca0945b0f720d3478ae6f5b6707ab"
+  integrity sha512-HXZWbxCgQZJfrv5rXvaVeaayXED8nTKx9tj9fpBhmcUJcedVZshMMMqTj0RG2+scGypb9Ut1zd1ifbf3lA8L+Q==
+
+it-batch@^3.0.0, it-batch@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/it-batch/-/it-batch-3.0.6.tgz#0bcda35bf1c600e821c6d5f4d2446fe85a26ab1d"
+  integrity sha512-pQAAlSvJ4aV6xM/6LRvkPdKSKXxS4my2fGzNUxJyAQ8ccFdxPmK1bUuF5OoeUDkcdrbs8jtsmc4DypCMrGY6sg==
+
+it-first@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/it-first/-/it-first-3.0.6.tgz#f532f0f36fe9bf0c291e0162b9d3375d59fe8f05"
+  integrity sha512-ExIewyK9kXKNAplg2GMeWfgjUcfC1FnUXz/RPfAvIXby+w7U4b3//5Lic0NV03gXT8O/isj5Nmp6KiY0d45pIQ==
+
+it-parallel-batch@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/it-parallel-batch/-/it-parallel-batch-3.0.6.tgz#61487fdaca03cc34c648b3432f59e82e0c805172"
+  integrity sha512-3wgiQGvMMHy65OXScrtrtmY+bJSF7P6St1AP+BU+SK83fEr8NNk/MrmJKrtB1+MahYX2a8I+pOGKDj8qVtuV0Q==
+  dependencies:
+    it-batch "^3.0.0"
+
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+json-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
+  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
+  dependencies:
+    bignumber.js "^9.0.0"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+minimist@^1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+multiformats@^13.0.0, multiformats@^13.1.0, multiformats@^13.2.3:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-13.3.0.tgz#1f5188bc7c4fe08ff829ae1c18dc33409042fb71"
+  integrity sha512-CBiqvsufgmpo01VT5ze94O+uc+Pbf6f/sThlvWss0sBZmAOu6GQn5usrYV2sf2mr17FWYc0rO8c/CNe2T90QAA==
+
+murmurhash3js-revisited@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz#6bd36e25de8f73394222adc6e41fa3fac08a5869"
+  integrity sha512-/sF3ee6zvScXMb1XFJ8gDsSnY+X8PbOyjIuBhtgis10W2Jx4ZjIhikUCIF9c4gpJxVnQIsPAFrSwTCuAjicP6g==
+
+mute-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
+  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
+
+node-fetch@^2.6.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+object-hash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
+  integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
+prettier-plugin-solidity@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.4.1.tgz#8060baf18853a9e34d2e09e47e87b4f19e15afe9"
+  integrity sha512-Mq8EtfacVZ/0+uDKTtHZGW3Aa7vEbX/BNx63hmVg6YTiTXSiuKP0amj0G6pGwjmLaOfymWh3QgXEZkjQbU8QRg==
+  dependencies:
+    "@solidity-parser/parser" "^0.18.0"
+    semver "^7.5.4"
+
+prettier@^2.8.3:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
+progress-events@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/progress-events/-/progress-events-1.0.1.tgz#693b6d4153f08c1418ae3cd5fcad8596c91db7e8"
+  integrity sha512-MOzLIwhpt64KIVN64h1MwdKWiyKFNc/S6BoYKPIVUHFg0/eIEyBulhWCgn678v/4c0ri3FdGuzXymNCv02MUIw==
+
+protons-runtime@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/protons-runtime/-/protons-runtime-5.5.0.tgz#ea06d9ef843aad77ea5de3e1ebafa81b58c24570"
+  integrity sha512-EsALjF9QsrEk6gbCx3lmfHxVN0ah7nG3cY7GySD4xf4g8cr7g543zB88Foh897Sr1RQJ9yDCUsoT1i1H/cVUFA==
+  dependencies:
+    uint8-varint "^2.0.2"
+    uint8arraylist "^2.4.3"
+    uint8arrays "^5.0.1"
+
+rabin-wasm@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/rabin-wasm/-/rabin-wasm-0.1.5.tgz#5b625ca007d6a2cbc1456c78ae71d550addbc9c9"
+  integrity sha512-uWgQTo7pim1Rnj5TuWcCewRDTf0PEFTSlaUjWP4eY9EbLV9em08v89oCz/WO+wRxpYuO36XEHp4wgYQnAgOHzA==
+  dependencies:
+    "@assemblyscript/loader" "^0.9.4"
+    bl "^5.0.0"
+    debug "^4.3.1"
+    minimist "^1.2.5"
+    node-fetch "^2.6.1"
+    readable-stream "^3.6.0"
+
+readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
+run-async@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad"
+  integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==
+
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+section-matter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
+  integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==
+  dependencies:
+    extend-shallow "^2.0.1"
+    kind-of "^6.0.0"
+
+semver@^7.5.4:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
+signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sparse-array@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/sparse-array/-/sparse-array-1.3.2.tgz#0e1a8b71706d356bc916fe754ff496d450ec20b0"
+  integrity sha512-ZT711fePGn3+kQyLuv1fpd3rNSkNF8vd5Kv2D+qnOANeyKs3fx6bUMGWRPvgTTcYV64QMqZKZwcuaQSP3AZ0tg==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+string-width@^4.1.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+tsx@^4.7.1:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.19.1.tgz#b7bffdf4b565813e4dea14b90872af279cd0090b"
+  integrity sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==
+  dependencies:
+    esbuild "~0.23.0"
+    get-tsconfig "^4.7.5"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+uint8-varint@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/uint8-varint/-/uint8-varint-2.0.4.tgz#85be52b3849eb30f2c3640a2df8a14364180affb"
+  integrity sha512-FwpTa7ZGA/f/EssWAb5/YV6pHgVF1fViKdW8cWaEarjB8t7NyofSWBdOTyFPaGuUG4gx3v1O3PQ8etsiOs3lcw==
+  dependencies:
+    uint8arraylist "^2.0.0"
+    uint8arrays "^5.0.0"
+
+uint8arraylist@^2.0.0, uint8arraylist@^2.4.3, uint8arraylist@^2.4.8:
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/uint8arraylist/-/uint8arraylist-2.4.8.tgz#5a4d17f4defd77799cb38e93fd5db0f0dceddc12"
+  integrity sha512-vc1PlGOzglLF0eae1M8mLRTBivsvrGsdmJ5RbK3e+QRvRLOZfZhQROTwH/OfyF3+ZVUg9/8hE8bmKP2CvP9quQ==
+  dependencies:
+    uint8arrays "^5.0.1"
+
+uint8arrays@^5.0.0, uint8arrays@^5.0.1, uint8arrays@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-5.1.0.tgz#14047c9bdf825d025b7391299436e5e50e7270f1"
+  integrity sha512-vA6nFepEmlSKkMBnLBaUMVvAC4G3CTmO58C12y4sq6WPDOR7mOFYOi7GlrQ4djeSbP6JG9Pv9tJDM97PedRSww==
+  dependencies:
+    multiformats "^13.0.0"
+
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+
+util-deprecate@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+
+viem@^2.17.11:
+  version "2.21.12"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.21.12.tgz#10c668668b62d276e806fc3261145a9285ae663c"
+  integrity sha512-yPZulbPdoDnuB8Gm2m+Qc9Mjgl6gC1YgNU6zcO+C8XZNYwaCNE6mokPiy30m8o5I1XkfvMc35jMmtT1zCb8yxA==
+  dependencies:
+    "@adraffy/ens-normalize" "1.10.0"
+    "@noble/curves" "1.4.0"
+    "@noble/hashes" "1.4.0"
+    "@scure/bip32" "1.4.0"
+    "@scure/bip39" "1.4.0"
+    abitype "1.0.5"
+    isows "1.0.4"
+    webauthn-p256 "0.0.5"
+    ws "8.17.1"
+
+webauthn-p256@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/webauthn-p256/-/webauthn-p256-0.0.5.tgz#0baebd2ba8a414b21cc09c0d40f9dd0be96a06bd"
+  integrity sha512-drMGNWKdaixZNobeORVIqq7k5DsRC9FnG201K2QjeOoQLmtSDaSsVZdkg6n5jUALJKcAG++zBPJXmv6hy0nWFg==
+  dependencies:
+    "@noble/curves" "^1.4.0"
+    "@noble/hashes" "^1.4.0"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+ws@8.17.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
+
+zod@^3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==