diff --git a/models/gold/defi/lending/defi__ez_lending_borrows.sql b/models/gold/defi/lending/defi__ez_lending_borrows.sql
index d8041f4..89400c6 100644
--- a/models/gold/defi/lending/defi__ez_lending_borrows.sql
+++ b/models/gold/defi/lending/defi__ez_lending_borrows.sql
@@ -5,7 +5,7 @@
     incremental_predicates = ["dynamic_range_predicate", "block_timestamp::DATE"],
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,platform,borrower,token_address);",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash);",
     tags = ['noncore']
 ) }}
 
diff --git a/models/gold/defi/lending/defi__ez_lending_deposits.sql b/models/gold/defi/lending/defi__ez_lending_deposits.sql
index 163d488..76d105c 100644
--- a/models/gold/defi/lending/defi__ez_lending_deposits.sql
+++ b/models/gold/defi/lending/defi__ez_lending_deposits.sql
@@ -5,7 +5,7 @@
     incremental_predicates = ["dynamic_range_predicate", "block_timestamp::DATE"],
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,platform,depositor,token_address);",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash);",
     tags = ['noncore']
 ) }}
 
diff --git a/models/gold/defi/lending/defi__ez_lending_liquidations.sql b/models/gold/defi/lending/defi__ez_lending_liquidations.sql
index 58f67f5..c66c048 100644
--- a/models/gold/defi/lending/defi__ez_lending_liquidations.sql
+++ b/models/gold/defi/lending/defi__ez_lending_liquidations.sql
@@ -5,7 +5,7 @@
     incremental_predicates = ["dynamic_range_predicate", "block_timestamp::DATE"],
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,platform,liquidator,borrower);",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash);",
     tags = ['noncore']
 ) }}
 
diff --git a/models/gold/defi/lending/defi__ez_lending_repayments.sql b/models/gold/defi/lending/defi__ez_lending_repayments.sql
index 5f27f21..fcfde1e 100644
--- a/models/gold/defi/lending/defi__ez_lending_repayments.sql
+++ b/models/gold/defi/lending/defi__ez_lending_repayments.sql
@@ -5,7 +5,7 @@
     incremental_predicates = ["dynamic_range_predicate", "block_timestamp::DATE"],
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,platform,payer,borrower);",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash);",
     tags = ['noncore']
 ) }}
 
diff --git a/models/gold/defi/lending/defi__ez_lending_withdraws.sql b/models/gold/defi/lending/defi__ez_lending_withdraws.sql
index 06b817b..8308739 100644
--- a/models/gold/defi/lending/defi__ez_lending_withdraws.sql
+++ b/models/gold/defi/lending/defi__ez_lending_withdraws.sql
@@ -5,7 +5,7 @@
     incremental_predicates = ["dynamic_range_predicate", "block_timestamp::DATE"],
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash,platform,depositor,token_address);",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash);",
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echelon/silver__lending_echelon_borrows.sql b/models/silver/defi/lending/echelon/silver__lending_echelon_borrows.sql
index f897466..8abffa1 100644
--- a/models/silver/defi/lending/echelon/silver__lending_echelon_borrows.sql
+++ b/models/silver/defi/lending/echelon/silver__lending_echelon_borrows.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echelon_borrows_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echelon/silver__lending_echelon_deposits.sql b/models/silver/defi/lending/echelon/silver__lending_echelon_deposits.sql
index 9f8d80c..c3241b8 100644
--- a/models/silver/defi/lending/echelon/silver__lending_echelon_deposits.sql
+++ b/models/silver/defi/lending/echelon/silver__lending_echelon_deposits.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echelon_deposits_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echelon/silver__lending_echelon_liquidations.sql b/models/silver/defi/lending/echelon/silver__lending_echelon_liquidations.sql
index 67103d9..64cdf74 100644
--- a/models/silver/defi/lending/echelon/silver__lending_echelon_liquidations.sql
+++ b/models/silver/defi/lending/echelon/silver__lending_echelon_liquidations.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echelon_liquidations_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echelon/silver__lending_echelon_repayments.sql b/models/silver/defi/lending/echelon/silver__lending_echelon_repayments.sql
index 8b8b5e4..99852e0 100644
--- a/models/silver/defi/lending/echelon/silver__lending_echelon_repayments.sql
+++ b/models/silver/defi/lending/echelon/silver__lending_echelon_repayments.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echelon_repayments_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echelon/silver__lending_echelon_withdraws.sql b/models/silver/defi/lending/echelon/silver__lending_echelon_withdraws.sql
index 014aec4..33b7f6f 100644
--- a/models/silver/defi/lending/echelon/silver__lending_echelon_withdraws.sql
+++ b/models/silver/defi/lending/echelon/silver__lending_echelon_withdraws.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echelon_withdraws_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
diff --git a/models/silver/defi/lending/echo/silver__lending_echo_borrows.sql b/models/silver/defi/lending/echo/silver__lending_echo_borrows.sql
index 80abb43..55be051 100644
--- a/models/silver/defi/lending/echo/silver__lending_echo_borrows.sql
+++ b/models/silver/defi/lending/echo/silver__lending_echo_borrows.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echo_borrows_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
@@ -25,7 +25,7 @@ WITH events AS (
         event_data:amount::number AS amount,
         event_data:reserve::string AS lending_market,  -- reserve is the market
         _inserted_timestamp
-    FROM aptos.silver.events
+    FROM {{ ref('silver__events') }}
     WHERE event_address = '0xeab7ea4d635b6b6add79d5045c4a45d8148d88287b1cfa1c3b6a4b56f46839ed'
         AND event_module = 'borrow_logic' 
         AND event_resource = 'Borrow'
diff --git a/models/silver/defi/lending/echo/silver__lending_echo_deposits.sql b/models/silver/defi/lending/echo/silver__lending_echo_deposits.sql
index 1f770e5..171eaec 100644
--- a/models/silver/defi/lending/echo/silver__lending_echo_deposits.sql
+++ b/models/silver/defi/lending/echo/silver__lending_echo_deposits.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echo_deposits_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
@@ -25,7 +25,7 @@ WITH events AS (
         event_data:amount::number AS amount,
         event_data:reserve::string AS lending_market,  -- reserve is the market
         _inserted_timestamp
-    FROM aptos.silver.events
+    FROM {{ ref('silver__events') }}
     WHERE event_address = '0xeab7ea4d635b6b6add79d5045c4a45d8148d88287b1cfa1c3b6a4b56f46839ed'
         AND event_module = 'supply_logic' 
         AND event_resource = 'Supply'
diff --git a/models/silver/defi/lending/echo/silver__lending_echo_liquidations.sql b/models/silver/defi/lending/echo/silver__lending_echo_liquidations.sql
index e800a5a..16e26be 100644
--- a/models/silver/defi/lending/echo/silver__lending_echo_liquidations.sql
+++ b/models/silver/defi/lending/echo/silver__lending_echo_liquidations.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echo_liquidations_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
@@ -27,7 +27,7 @@ WITH events AS (
         event_data:collateral_asset::string AS collateral_token_market,
         event_data:debt_asset::string AS debt_token_market,
         _inserted_timestamp
-    FROM aptos.silver.events
+    FROM {{ ref('silver__events') }}
     WHERE event_address = '0xeab7ea4d635b6b6add79d5045c4a45d8148d88287b1cfa1c3b6a4b56f46839ed'
         AND event_module = 'liquidation_logic' 
         AND event_resource = 'LiquidationCall'
diff --git a/models/silver/defi/lending/echo/silver__lending_echo_repayments.sql b/models/silver/defi/lending/echo/silver__lending_echo_repayments.sql
index 704a602..7ad14b6 100644
--- a/models/silver/defi/lending/echo/silver__lending_echo_repayments.sql
+++ b/models/silver/defi/lending/echo/silver__lending_echo_repayments.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echo_repayments_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
@@ -26,7 +26,7 @@ WITH events AS (
         event_data:amount::number AS amount,
         event_data:reserve::string AS lending_market,  -- reserve is the market
         _inserted_timestamp
-    FROM aptos.silver.events
+    FROM {{ ref('silver__events') }}
     WHERE event_address = '0xeab7ea4d635b6b6add79d5045c4a45d8148d88287b1cfa1c3b6a4b56f46839ed'
         AND event_module = 'borrow_logic' 
         AND event_resource = 'Repay'
diff --git a/models/silver/defi/lending/echo/silver__lending_echo_withdraws.sql b/models/silver/defi/lending/echo/silver__lending_echo_withdraws.sql
index 5f1f439..a6ecbf4 100644
--- a/models/silver/defi/lending/echo/silver__lending_echo_withdraws.sql
+++ b/models/silver/defi/lending/echo/silver__lending_echo_withdraws.sql
@@ -3,7 +3,7 @@
     unique_key = "lending_echo_withdraws_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    cluster_by = ['modified_timestamp::DATE'],
     tags = ['noncore']
 ) }}
 
@@ -25,7 +25,7 @@ WITH events AS (
         event_data:amount::number AS amount,
         event_data:reserve::string AS lending_market,  -- reserve is the market
         _inserted_timestamp
-    FROM aptos.silver.events
+    FROM {{ ref('silver__events') }}
     WHERE event_address = '0xeab7ea4d635b6b6add79d5045c4a45d8148d88287b1cfa1c3b6a4b56f46839ed'
         AND event_module = 'supply_logic' 
         AND event_resource = 'Withdraw'