diff --git a/models/streamline/silver/_24_hour_lookback.sql b/models/streamline/silver/_24_hour_lookback.sql
index dadf7cb..ce1f037 100644
--- a/models/streamline/silver/_24_hour_lookback.sql
+++ b/models/streamline/silver/_24_hour_lookback.sql
@@ -1,17 +1,18 @@
-{{ config(
-    materialized = 'ephemeral'
+{{ config (
+    materialized = "ephemeral"
 ) }}
 
-    WITH max_time AS (
-        SELECT
-            MAX(block_timestamp) AS max_timestamp
-        FROM
-            {{ ref("core__fact_blocks") }}
-    )
+WITH max_time AS (
+
+    SELECT
+        MAX(block_timestamp) AS max_timestamp
+    FROM
+        {{ ref("silver__blocks") }}
+)
 SELECT
-    COALESCE(MIN(block_number), 0) AS block_number
+    MIN(block_number) AS block_number
 FROM
-    {{ ref("core__fact_blocks") }}
+    {{ ref("silver__blocks") }}
     JOIN max_time
     ON block_timestamp BETWEEN DATEADD(
         'hour',
@@ -22,4 +23,4 @@ FROM
         'hour',
         -24,
         max_timestamp
-        )
\ No newline at end of file
+    )
\ No newline at end of file
diff --git a/models/streamline/silver/_block_lookback.sql b/models/streamline/silver/_block_lookback.sql
index dc8f67c..0260e19 100644
--- a/models/streamline/silver/_block_lookback.sql
+++ b/models/streamline/silver/_block_lookback.sql
@@ -1,20 +1,11 @@
-{{ config(
-    materialized = 'ephemeral'
+{{ config (
+    materialized = "ephemeral"
 ) }}
 
-{% set uses_lookback = var('GLOBAL_USES_LOOKBACK', True) %}
-
-{% if not uses_lookback %}
-
-SELECT  
-    0 AS block_number
-{% else %}
 SELECT
-    COALESCE(MIN(block_number), 0) AS block_number
+    MIN(block_number) AS block_number
 FROM
-    {{ ref("core__fact_blocks") }}
+    {{ ref("silver__blocks") }}
 WHERE
     block_timestamp >= DATEADD('hour', -72, TRUNCATE(SYSDATE(), 'HOUR'))
-    AND block_timestamp < DATEADD('hour', -71, TRUNCATE(SYSDATE(), 'HOUR'))
-
-{% endif %}
\ No newline at end of file
+    AND block_timestamp < DATEADD('hour', -71, TRUNCATE(SYSDATE(), 'HOUR'))
\ No newline at end of file
diff --git a/models/streamline/silver/_max_block_by_date.sql b/models/streamline/silver/_max_block_by_date.sql
index 6af17b1..a56cf82 100644
--- a/models/streamline/silver/_max_block_by_date.sql
+++ b/models/streamline/silver/_max_block_by_date.sql
@@ -1,14 +1,15 @@
-{{ config(
-    materialized = 'ephemeral',
-    unique_key = 'block_number'
+{{ config (
+    materialized = "ephemeral",
+    unique_key = "block_number",
 ) }}
 
 WITH base AS (
+
     SELECT
         block_timestamp :: DATE AS block_date,
-        MAX(block_number) AS block_number
+        MAX(block_number) block_number
     FROM
-        {{ ref("core__fact_blocks") }}
+        {{ ref("silver__blocks") }}
     GROUP BY
         block_timestamp :: DATE
 )
diff --git a/models/streamline/silver/_max_block_by_hour.sql b/models/streamline/silver/_max_block_by_hour.sql
index f861ffd..7402435 100644
--- a/models/streamline/silver/_max_block_by_hour.sql
+++ b/models/streamline/silver/_max_block_by_hour.sql
@@ -1,16 +1,17 @@
-{{ config(
-    materialized = 'ephemeral'
+{{ config (
+    materialized = "ephemeral"
 ) }}
 
 WITH base AS (
+
     SELECT
         DATE_TRUNC(
             'hour',
             block_timestamp
         ) AS block_hour,
-        MAX(block_number) AS block_number
+        MAX(block_number) block_number
     FROM
-        {{ ref("core__fact_blocks") }}
+        {{ ref("silver__blocks") }}
     WHERE
         block_timestamp > DATEADD(
             'day',