diff --git a/.github/workflows/dbt_run_temp_traces2.yml b/.github/workflows/dbt_run_temp_traces2.yml
new file mode 100644
index 0000000..2505413
--- /dev/null
+++ b/.github/workflows/dbt_run_temp_traces2.yml
@@ -0,0 +1,50 @@
+name: dbt_run_temp_traces2
+run-name: dbt_run_temp_traces2
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Runs “At minute 12 past every hour.” (see https://crontab.guru)
+    - cron: '12 * * * *'
+    
+env:
+  DBT_PROFILES_DIR: ./
+
+  ACCOUNT: "${{ vars.ACCOUNT }}"
+  ROLE: "${{ vars.ROLE }}"
+  USER: "${{ vars.USER }}"
+  PASSWORD: "${{ secrets.PASSWORD }}"
+  REGION: "${{ vars.REGION }}"
+  DATABASE: "${{ vars.DATABASE }}"
+  WAREHOUSE: "${{ vars.WAREHOUSE }}"
+  SCHEMA: "${{ vars.SCHEMA }}"
+
+concurrency:
+  group: ${{ github.workflow }}
+
+
+
+jobs:
+  run_dbt_jobs:
+    runs-on: ubuntu-latest
+    environment: 
+      name: workflow_prod_2xl
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+          cache: "pip"
+
+      - name: install dependencies
+        run: |
+          pip install -r requirements.txt
+          dbt deps
+      - name: Run DBT Jobs
+        run: |
+          dbt run -m "bsc_models,tag:traces_reload"
+  
+
+
diff --git a/macros/streamline/models.sql b/macros/streamline/models.sql
index 70d0bec..be6601c 100644
--- a/macros/streamline/models.sql
+++ b/macros/streamline/models.sql
@@ -35,7 +35,7 @@
             ) }}
             s
             JOIN meta b
-            ON b.file_name = metadata$filename
+            ON b.file_name = metadata $ filename
             AND b.{{ partition_name }} = s.{{ partition_name }}
         WHERE
             b.{{ partition_name }} = s.{{ partition_name }}
@@ -58,7 +58,7 @@
             )
 {% endmacro %}
 
-{% macro streamline_external_table_FR_query(
+{% macro streamline_external_table_fr_query(
         model,
         partition_function,
         partition_name,
@@ -95,7 +95,7 @@ FROM
     ) }}
     s
     JOIN meta b
-    ON b.file_name = metadata$filename
+    ON b.file_name = metadata $ filename
     AND b.{{ partition_name }} = s.{{ partition_name }}
 WHERE
     b.{{ partition_name }} = s.{{ partition_name }}
diff --git a/models/silver/core/silver__blocks.sql b/models/silver/core/silver__blocks.sql
index 7b8c826..71747a2 100644
--- a/models/silver/core/silver__blocks.sql
+++ b/models/silver/core/silver__blocks.sql
@@ -73,7 +73,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_blocks') }}
+    {{ ref('bronze__streamline_fr_blocks') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY block_number
diff --git a/models/silver/core/silver__confirmed_blocks.sql b/models/silver/core/silver__confirmed_blocks.sql
index e81d27a..f7ae66a 100644
--- a/models/silver/core/silver__confirmed_blocks.sql
+++ b/models/silver/core/silver__confirmed_blocks.sql
@@ -31,7 +31,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_confirm_blocks') }}
+    {{ ref('bronze__streamline_fr_confirm_blocks') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY block_number
diff --git a/models/silver/core/silver__fact_traces2.sql b/models/silver/core/silver__fact_traces2.sql
index 48b72ce..2b9ba2c 100644
--- a/models/silver/core/silver__fact_traces2.sql
+++ b/models/silver/core/silver__fact_traces2.sql
@@ -4,494 +4,11 @@
     unique_key = ['block_number'],
     cluster_by = "block_timestamp::date",
     post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION",
-    tags = ['core','non_realtime'],
-    full_refresh = false
+    tags = ['traces_reload']
+) }}
+{{ fsc_evm.gold_traces_v1(
+    full_reload_start_block = 5000000,
+    full_reload_blocks = 1000000,
+    full_reload_mode = true,
+    uses_overflow_steps = true
 ) }}
-
-WITH silver_traces AS (
-
-    SELECT
-        block_number,
-        tx_position,
-        trace_address,
-        parent_trace_address,
-        trace_address_array,
-        trace_json,
-        traces_id,
-        'regular' AS source
-    FROM
-        {{ ref('silver__traces2') }}
-    WHERE
-        1 = 1
-
-{% if is_incremental() and not var(
-    'RELOAD_TRACES',
-) %}
-AND modified_timestamp > (
-    SELECT
-        MAX(modified_timestamp)
-    FROM
-        {{ this }}
-) {% elif is_incremental() and var(
-    'RELOAD_TRACES',
-) %}
-AND block_number BETWEEN (
-    SELECT
-        MAX(
-            block_number
-        )
-    FROM
-        {{ this }}
-)
-AND (
-    SELECT
-        MAX(
-            block_number
-        ) + 1000000
-    FROM
-        {{ this }}
-)
-{% else %}
-    AND block_number <= 5000000
-{% endif %}
-UNION ALL
-SELECT
-    block_number,
-    tx_position,
-    trace_address,
-    parent_trace_address,
-    trace_address_array,
-    trace_json,
-    traces_id,
-    'overflow' AS source
-FROM
-    {{ ref('silver__overflowed_traces2') }}
-WHERE
-    1 = 1
-
-{% if is_incremental() and not var(
-    'RELOAD_TRACES',
-) %}
-AND modified_timestamp > (
-    SELECT
-        MAX(modified_timestamp)
-    FROM
-        {{ this }}
-) {% elif is_incremental() and var(
-    'RELOAD_TRACES',
-) %}
-AND block_number BETWEEN (
-    SELECT
-        MAX(
-            block_number
-        )
-    FROM
-        {{ this }}
-)
-AND (
-    SELECT
-        MAX(
-            block_number
-        ) + 1000000
-    FROM
-        {{ this }}
-)
-{% else %}
-    AND block_number <= 5000000
-{% endif %}
-),
-sub_traces AS (
-    SELECT
-        block_number,
-        tx_position,
-        parent_trace_address,
-        COUNT(*) AS sub_traces
-    FROM
-        silver_traces
-    GROUP BY
-        block_number,
-        tx_position,
-        parent_trace_address
-),
-trace_index_array AS (
-    SELECT
-        block_number,
-        tx_position,
-        trace_address,
-        ARRAY_AGG(flat_value) AS number_array
-    FROM
-        (
-            SELECT
-                block_number,
-                tx_position,
-                trace_address,
-                IFF(
-                    VALUE :: STRING = 'ORIGIN',
-                    -1,
-                    VALUE :: INT
-                ) AS flat_value
-            FROM
-                silver_traces,
-                LATERAL FLATTEN (
-                    input => trace_address_array
-                )
-        )
-    GROUP BY
-        block_number,
-        tx_position,
-        trace_address
-),
-trace_index_sub_traces AS (
-    SELECT
-        b.block_number,
-        b.tx_position,
-        b.trace_address,
-        IFNULL(
-            sub_traces,
-            0
-        ) AS sub_traces,
-        number_array,
-        ROW_NUMBER() over (
-            PARTITION BY b.block_number,
-            b.tx_position
-            ORDER BY
-                number_array ASC
-        ) - 1 AS trace_index,
-        b.trace_json,
-        b.traces_id
-    FROM
-        silver_traces b
-        LEFT JOIN sub_traces s
-        ON b.block_number = s.block_number
-        AND b.tx_position = s.tx_position
-        AND b.trace_address = s.parent_trace_address
-        JOIN trace_index_array n
-        ON b.block_number = n.block_number
-        AND b.tx_position = n.tx_position
-        AND b.trace_address = n.trace_address
-),
-errored_traces AS (
-    SELECT
-        block_number,
-        tx_position,
-        trace_address,
-        trace_json
-    FROM
-        trace_index_sub_traces
-    WHERE
-        trace_json :error :: STRING IS NOT NULL
-),
-error_logic AS (
-    SELECT
-        b0.block_number,
-        b0.tx_position,
-        b0.trace_address,
-        b0.trace_json :error :: STRING AS error,
-        b1.trace_json :error :: STRING AS any_error,
-        b2.trace_json :error :: STRING AS origin_error
-    FROM
-        trace_index_sub_traces b0
-        LEFT JOIN errored_traces b1
-        ON b0.block_number = b1.block_number
-        AND b0.tx_position = b1.tx_position
-        AND b0.trace_address LIKE CONCAT(
-            b1.trace_address,
-            '_%'
-        )
-        LEFT JOIN errored_traces b2
-        ON b0.block_number = b2.block_number
-        AND b0.tx_position = b2.tx_position
-        AND b2.trace_address = 'ORIGIN'
-),
-aggregated_errors AS (
-    SELECT
-        block_number,
-        tx_position,
-        trace_address,
-        error,
-        IFF(MAX(any_error) IS NULL
-        AND error IS NULL
-        AND origin_error IS NULL, TRUE, FALSE) AS trace_succeeded
-    FROM
-        error_logic
-    GROUP BY
-        block_number,
-        tx_position,
-        trace_address,
-        error,
-        origin_error),
-        json_traces AS (
-            SELECT
-                block_number,
-                tx_position,
-                trace_address,
-                sub_traces,
-                number_array,
-                trace_index,
-                trace_json AS DATA,
-                trace_succeeded,
-                trace_json :error :: STRING AS error_reason,
-                trace_json :revertReason :: STRING AS revert_reason,
-                trace_json :from :: STRING AS from_address,
-                trace_json :to :: STRING AS to_address,
-                IFNULL(
-                    utils.udf_hex_to_int(
-                        trace_json :value :: STRING
-                    ),
-                    '0'
-                ) AS value_precise_raw,
-                utils.udf_decimal_adjust(
-                    value_precise_raw,
-                    18
-                ) AS value_precise,
-                value_precise :: FLOAT AS VALUE,
-                utils.udf_hex_to_int(
-                    trace_json :gas :: STRING
-                ) :: INT AS gas,
-                utils.udf_hex_to_int(
-                    trace_json :gasUsed :: STRING
-                ) :: INT AS gas_used,
-                trace_json :input :: STRING AS input,
-                trace_json :output :: STRING AS output,
-                trace_json :type :: STRING AS TYPE,
-                concat_ws(
-                    '_',
-                    TYPE,
-                    trace_address
-                ) AS identifier,
-                IFF(
-                    trace_succeeded,
-                    'SUCCESS',
-                    'FAIL'
-                ) AS trace_status,
-                traces_id
-            FROM
-                trace_index_sub_traces
-                JOIN aggregated_errors USING (
-                    block_number,
-                    tx_position,
-                    trace_address
-                )
-        ),
-        incremental_traces AS (
-            SELECT
-                f.block_number,
-                t.tx_hash,
-                t.block_timestamp,
-                t.tx_status,
-                f.tx_position,
-                f.trace_index,
-                f.from_address,
-                f.to_address,
-                f.value_precise_raw,
-                f.value_precise,
-                f.value,
-                f.gas,
-                f.gas_used,
-                f.input,
-                f.output,
-                f.type,
-                f.identifier,
-                f.sub_traces,
-                f.error_reason,
-                f.revert_reason,
-                f.trace_status,
-                f.data,
-                f.traces_id,
-                f.trace_succeeded,
-                f.trace_address
-            FROM
-                json_traces f
-                LEFT OUTER JOIN {{ ref('silver__transactions') }}
-                t
-                ON f.tx_position = t.position
-                AND f.block_number = t.block_number
-
-{% if is_incremental() and not var(
-    'RELOAD_TRACES',
-) %}
-AND t.modified_timestamp >= (
-    SELECT
-        DATEADD('hour', -24, MAX(modified_timestamp))
-    FROM
-        {{ this }})
-    {% endif %}
-)
-
-{% if is_incremental() %},
-overflow_blocks AS (
-    SELECT
-        DISTINCT block_number
-    FROM
-        silver_traces
-    WHERE
-        source = 'overflow'
-),
-heal_missing_data AS (
-    SELECT
-        t.block_number,
-        txs.tx_hash,
-        txs.block_timestamp,
-        txs.tx_status,
-        t.tx_position,
-        t.trace_index,
-        t.from_address,
-        t.to_address,
-        t.value_precise_raw,
-        t.value_precise,
-        t.value,
-        t.gas,
-        t.gas_used,
-        t.input,
-        t.output,
-        t.type,
-        t.identifier,
-        t.sub_traces,
-        t.error_reason,
-        t.revert_reason,
-        t.trace_status,
-        t.data,
-        t.fact_traces_id AS traces_id,
-        t.trace_succeeded,
-        t.trace_address
-    FROM
-        {{ this }}
-        t
-        JOIN {{ ref('silver__transactions') }}
-        txs
-        ON t.tx_position = txs.position
-        AND t.block_number = txs.block_number
-    WHERE
-        t.tx_hash IS NULL
-        OR t.block_timestamp IS NULL
-        OR t.tx_status IS NULL
-)
-{% endif %},
-all_traces AS (
-    SELECT
-        block_number,
-        tx_hash,
-        block_timestamp,
-        tx_status,
-        tx_position,
-        trace_index,
-        from_address,
-        to_address,
-        value_precise_raw,
-        value_precise,
-        VALUE,
-        gas,
-        gas_used,
-        input,
-        output,
-        TYPE,
-        identifier,
-        sub_traces,
-        error_reason,
-        revert_reason,
-        trace_status,
-        DATA,
-        trace_succeeded,
-        trace_address
-    FROM
-        incremental_traces
-
-{% if is_incremental() %}
-UNION ALL
-SELECT
-    block_number,
-    tx_hash,
-    block_timestamp,
-    tx_status,
-    tx_position,
-    trace_index,
-    from_address,
-    to_address,
-    value_precise_raw,
-    value_precise,
-    VALUE,
-    gas,
-    gas_used,
-    input,
-    output,
-    TYPE,
-    identifier,
-    sub_traces,
-    error_reason,
-    revert_reason,
-    trace_status,
-    DATA,
-    trace_succeeded,
-    trace_address
-FROM
-    heal_missing_data
-UNION ALL
-SELECT
-    block_number,
-    tx_hash,
-    block_timestamp,
-    tx_status,
-    tx_position,
-    trace_index,
-    from_address,
-    to_address,
-    value_precise_raw,
-    value_precise,
-    VALUE,
-    gas,
-    gas_used,
-    input,
-    output,
-    TYPE,
-    identifier,
-    sub_traces,
-    error_reason,
-    revert_reason,
-    trace_status,
-    DATA,
-    trace_succeeded,
-    trace_address
-FROM
-    {{ this }}
-    JOIN overflow_blocks USING (block_number)
-{% endif %}
-)
-SELECT
-    tx_hash,
-    block_number,
-    block_timestamp,
-    tx_position,
-    trace_index,
-    from_address,
-    to_address,
-    VALUE,
-    value_precise_raw,
-    value_precise,
-    gas,
-    gas_used,
-    input,
-    output,
-    TYPE,
-    trace_address,
-    identifier,
-    DATA,
-    sub_traces,
-    tx_status,
-    trace_status,
-    IFF(
-        tx_status = 'SUCCESS',
-        TRUE,
-        FALSE
-    ) AS tx_succeeded,
-    trace_succeeded,
-    error_reason,
-    revert_reason,
-    {{ dbt_utils.generate_surrogate_key(
-        ['tx_hash', 'trace_index']
-    ) }} AS fact_traces_id,
-    SYSDATE() AS inserted_timestamp,
-    SYSDATE() AS modified_timestamp
-FROM
-    all_traces qualify(ROW_NUMBER() over(PARTITION BY block_number, tx_position, trace_index
-ORDER BY
-    modified_timestamp DESC, block_timestamp DESC nulls last)) = 1
diff --git a/models/silver/core/silver__receipts.sql b/models/silver/core/silver__receipts.sql
index b2235cf..9527eeb 100644
--- a/models/silver/core/silver__receipts.sql
+++ b/models/silver/core/silver__receipts.sql
@@ -30,7 +30,7 @@ WHERE
     )
     AND IS_OBJECT(DATA)
 {% else %}
-    {{ ref('bronze__streamline_FR_receipts') }}
+    {{ ref('bronze__streamline_fr_receipts') }}
 WHERE
     IS_OBJECT(DATA)
 {% endif %}
diff --git a/models/silver/core/silver__traces.sql b/models/silver/core/silver__traces.sql
index d53149b..c06f382 100644
--- a/models/silver/core/silver__traces.sql
+++ b/models/silver/core/silver__traces.sql
@@ -30,7 +30,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_traces') }}
+    {{ ref('bronze__streamline_fr_traces') }}
 WHERE
     _partition_by_block_id <= 2300000
 {% endif %}
diff --git a/models/silver/core/silver__traces2.sql b/models/silver/core/silver__traces2.sql
index f50b681..91e1b78 100644
--- a/models/silver/core/silver__traces2.sql
+++ b/models/silver/core/silver__traces2.sql
@@ -8,127 +8,7 @@
     tags = ['core','non_realtime'],
     full_refresh = false
 ) }}
-
-WITH bronze_traces AS (
-
-    SELECT
-        block_number,
-        _partition_by_block_id AS partition_key,
-        VALUE :array_index :: INT AS tx_position,
-        DATA :result AS full_traces,
-        _inserted_timestamp
-    FROM
-
-{% if is_incremental() %}
-{{ ref('bronze__streamline_traces') }}
-WHERE
-    _inserted_timestamp >= (
-        SELECT
-            MAX(_inserted_timestamp) _inserted_timestamp
-        FROM
-            {{ this }}
-    )
-{% else %}
-    {{ ref('bronze__streamline_FR_traces') }}
-WHERE
-    _partition_by_block_id <= 2300000
-{% endif %}
-
-qualify(ROW_NUMBER() over (PARTITION BY block_number, tx_position
-ORDER BY
-    _inserted_timestamp DESC)) = 1
-),
-flatten_traces AS (
-    SELECT
-        block_number,
-        tx_position,
-        partition_key,
-        IFF(
-            path IN (
-                'result',
-                'result.value',
-                'result.type',
-                'result.to',
-                'result.input',
-                'result.gasUsed',
-                'result.gas',
-                'result.from',
-                'result.output',
-                'result.error',
-                'result.revertReason',
-                'gasUsed',
-                'gas',
-                'type',
-                'to',
-                'from',
-                'value',
-                'input',
-                'error',
-                'output',
-                'revertReason'
-            ),
-            'ORIGIN',
-            REGEXP_REPLACE(REGEXP_REPLACE(path, '[^0-9]+', '_'), '^_|_$', '')
-        ) AS trace_address,
-        _inserted_timestamp,
-        OBJECT_AGG(
-            key,
-            VALUE
-        ) AS trace_json,
-        CASE
-            WHEN trace_address = 'ORIGIN' THEN NULL
-            WHEN POSITION(
-                '_' IN trace_address
-            ) = 0 THEN 'ORIGIN'
-            ELSE REGEXP_REPLACE(
-                trace_address,
-                '_[0-9]+$',
-                '',
-                1,
-                1
-            )
-        END AS parent_trace_address,
-        SPLIT(
-            trace_address,
-            '_'
-        ) AS trace_address_array
-    FROM
-        bronze_traces txs,
-        TABLE(
-            FLATTEN(
-                input => PARSE_JSON(
-                    txs.full_traces
-                ),
-                recursive => TRUE
-            )
-        ) f
-    WHERE
-        f.index IS NULL
-        AND f.key != 'calls'
-        AND f.path != 'result'
-    GROUP BY
-        block_number,
-        tx_position,
-        partition_key,
-        trace_address,
-        _inserted_timestamp
-)
-SELECT
-    block_number,
-    tx_position,
-    trace_address,
-    parent_trace_address,
-    trace_address_array,
-    trace_json,
-    partition_key,
-    _inserted_timestamp,
-    {{ dbt_utils.generate_surrogate_key(
-        ['block_number', 'tx_position', 'trace_address']
-    ) }} AS traces_id,
-    SYSDATE() AS inserted_timestamp,
-    SYSDATE() AS modified_timestamp,
-    '{{ invocation_id }}' AS _invocation_id
-FROM
-    flatten_traces qualify(ROW_NUMBER() over(PARTITION BY traces_id
-ORDER BY
-    _inserted_timestamp DESC)) = 1
+{{ fsc_evm.silver_traces_v1(
+    full_reload_start_block = 2300000,
+    full_reload_blocks = 1000000
+) }}
diff --git a/models/silver/core/silver__transactions.sql b/models/silver/core/silver__transactions.sql
index 8f281ae..4e4fd5a 100644
--- a/models/silver/core/silver__transactions.sql
+++ b/models/silver/core/silver__transactions.sql
@@ -27,7 +27,7 @@ WHERE
     )
     AND IS_OBJECT(DATA)
 {% else %}
-    {{ ref('bronze__streamline_FR_transactions') }}
+    {{ ref('bronze__streamline_fr_transactions') }}
 WHERE
     IS_OBJECT(DATA)
 {% endif %}
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_flat_traces.sql b/models/streamline/bronze/core/bronze__streamline_FR_flat_traces.sql
deleted file mode 100644
index c2e9fde..0000000
--- a/models/streamline/bronze/core/bronze__streamline_FR_flat_traces.sql
+++ /dev/null
@@ -1,60 +0,0 @@
-{{ config (
-    materialized = 'view'
-) }}
-
-WITH meta AS (
-
-    SELECT
-        last_modified AS _inserted_timestamp,
-        file_name,
-        CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER) AS _partition_by_block_id
-    FROM
-        TABLE(
-            information_schema.external_table_files(
-                table_name => '{{ source( "bronze_streamline", "flat_traces") }}'
-            )
-        ) A
-)
-SELECT
-    block_number,
-    MD5(
-        CAST(
-            COALESCE(CAST(block_number AS text), '' :: STRING) AS text
-        )
-    ) AS id,
-    _inserted_timestamp,
-    s._partition_by_block_id,
-    s.value AS VALUE,
-    s.seq AS seq,
-    s.index AS INDEX,
-    s.key AS key,
-    s.path AS path,
-    s.value_ AS value_
-FROM
-    {{ source(
-        "bronze_streamline",
-        "flat_traces"
-    ) }}
-    s
-    JOIN meta b
-    ON b.file_name = metadata$filename
-    AND b._partition_by_block_id = s._partition_by_block_id
-WHERE
-    b._partition_by_block_id = s._partition_by_block_id
-    AND (
-        VALUE :DATA :error :code IS NULL
-        OR VALUE: DATA :error :code NOT IN (
-            '-32000',
-            '-32001',
-            '-32002',
-            '-32003',
-            '-32004',
-            '-32005',
-            '-32006',
-            '-32007',
-            '-32008',
-            '-32009',
-            '-32010',
-            '-32608'
-        )
-    )
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_blocks.sql b/models/streamline/bronze/core/fr/bronze__streamline_fr_blocks.sql
similarity index 87%
rename from models/streamline/bronze/core/bronze__streamline_FR_blocks.sql
rename to models/streamline/bronze/core/fr/bronze__streamline_fr_blocks.sql
index e0a16c6..f48f9c4 100644
--- a/models/streamline/bronze/core/bronze__streamline_FR_blocks.sql
+++ b/models/streamline/bronze/core/fr/bronze__streamline_fr_blocks.sql
@@ -3,7 +3,7 @@
 ) }}
 
 {% set model = this.identifier.split("_") [-1] %}
-{{ streamline_external_table_FR_query(
+{{ streamline_external_table_fr_query(
     model,
     partition_function = "CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER )",
     partition_name = "_partition_by_block_id",
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_confirm_blocks.sql b/models/streamline/bronze/core/fr/bronze__streamline_fr_confirm_blocks.sql
similarity index 86%
rename from models/streamline/bronze/core/bronze__streamline_FR_confirm_blocks.sql
rename to models/streamline/bronze/core/fr/bronze__streamline_fr_confirm_blocks.sql
index ae612bf..bee43e7 100644
--- a/models/streamline/bronze/core/bronze__streamline_FR_confirm_blocks.sql
+++ b/models/streamline/bronze/core/fr/bronze__streamline_fr_confirm_blocks.sql
@@ -1,7 +1,7 @@
 {{ config (
     materialized = 'view'
 ) }}
-{{ streamline_external_table_FR_query(
+{{ streamline_external_table_fr_query(
     model = "confirm_blocks",
     partition_function = "CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER )",
     partition_name = "_partition_by_block_id",
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_transactions.sql b/models/streamline/bronze/core/fr/bronze__streamline_fr_receipts.sql
similarity index 87%
rename from models/streamline/bronze/core/bronze__streamline_FR_transactions.sql
rename to models/streamline/bronze/core/fr/bronze__streamline_fr_receipts.sql
index e0a16c6..f48f9c4 100644
--- a/models/streamline/bronze/core/bronze__streamline_FR_transactions.sql
+++ b/models/streamline/bronze/core/fr/bronze__streamline_fr_receipts.sql
@@ -3,7 +3,7 @@
 ) }}
 
 {% set model = this.identifier.split("_") [-1] %}
-{{ streamline_external_table_FR_query(
+{{ streamline_external_table_fr_query(
     model,
     partition_function = "CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER )",
     partition_name = "_partition_by_block_id",
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_traces.sql b/models/streamline/bronze/core/fr/bronze__streamline_fr_traces.sql
similarity index 87%
rename from models/streamline/bronze/core/bronze__streamline_FR_traces.sql
rename to models/streamline/bronze/core/fr/bronze__streamline_fr_traces.sql
index e0a16c6..f48f9c4 100644
--- a/models/streamline/bronze/core/bronze__streamline_FR_traces.sql
+++ b/models/streamline/bronze/core/fr/bronze__streamline_fr_traces.sql
@@ -3,7 +3,7 @@
 ) }}
 
 {% set model = this.identifier.split("_") [-1] %}
-{{ streamline_external_table_FR_query(
+{{ streamline_external_table_fr_query(
     model,
     partition_function = "CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER )",
     partition_name = "_partition_by_block_id",
diff --git a/models/streamline/bronze/core/bronze__streamline_FR_receipts.sql b/models/streamline/bronze/core/fr/bronze__streamline_fr_transactions.sql
similarity index 87%
rename from models/streamline/bronze/core/bronze__streamline_FR_receipts.sql
rename to models/streamline/bronze/core/fr/bronze__streamline_fr_transactions.sql
index e0a16c6..f48f9c4 100644
--- a/models/streamline/bronze/core/bronze__streamline_FR_receipts.sql
+++ b/models/streamline/bronze/core/fr/bronze__streamline_fr_transactions.sql
@@ -3,7 +3,7 @@
 ) }}
 
 {% set model = this.identifier.split("_") [-1] %}
-{{ streamline_external_table_FR_query(
+{{ streamline_external_table_fr_query(
     model,
     partition_function = "CAST(SPLIT_PART(SPLIT_PART(file_name, '/', 4), '_', 1) AS INTEGER )",
     partition_name = "_partition_by_block_id",
diff --git a/models/streamline/silver/core/complete/streamline__complete_blocks.sql b/models/streamline/silver/core/complete/streamline__complete_blocks.sql
index 97f5c03..3082675 100644
--- a/models/streamline/silver/core/complete/streamline__complete_blocks.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_blocks.sql
@@ -23,7 +23,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_blocks') }}
+    {{ ref('bronze__streamline_fr_blocks') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY id
diff --git a/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql b/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
index 4432bd1..7e77b36 100644
--- a/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
@@ -21,7 +21,7 @@ WHERE
         FROM
             {{ this }})
         {% else %}
-            {{ ref('bronze__streamline_FR_confirm_blocks') }}
+            {{ ref('bronze__streamline_fr_confirm_blocks') }}
         {% endif %}
 
         qualify(ROW_NUMBER() over (PARTITION BY id
diff --git a/models/streamline/silver/core/complete/streamline__complete_receipts.sql b/models/streamline/silver/core/complete/streamline__complete_receipts.sql
index 6aec42a..b746f47 100644
--- a/models/streamline/silver/core/complete/streamline__complete_receipts.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_receipts.sql
@@ -24,7 +24,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_receipts') }}
+    {{ ref('bronze__streamline_fr_receipts') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY id
diff --git a/models/streamline/silver/core/complete/streamline__complete_traces.sql b/models/streamline/silver/core/complete/streamline__complete_traces.sql
index cf3599d..48ad4ed 100644
--- a/models/streamline/silver/core/complete/streamline__complete_traces.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_traces.sql
@@ -24,7 +24,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_traces') }}
+    {{ ref('bronze__streamline_fr_traces') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY id
diff --git a/models/streamline/silver/core/complete/streamline__complete_transactions.sql b/models/streamline/silver/core/complete/streamline__complete_transactions.sql
index 15b7173..0fe2960 100644
--- a/models/streamline/silver/core/complete/streamline__complete_transactions.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_transactions.sql
@@ -23,7 +23,7 @@ WHERE
             {{ this }}
     )
 {% else %}
-    {{ ref('bronze__streamline_FR_transactions') }}
+    {{ ref('bronze__streamline_fr_transactions') }}
 {% endif %}
 
 qualify(ROW_NUMBER() over (PARTITION BY id
diff --git a/package-lock.yml b/package-lock.yml
index 1c8d40e..933c78e 100644
--- a/package-lock.yml
+++ b/package-lock.yml
@@ -9,8 +9,10 @@ packages:
   revision: eb33ac727af26ebc8a8cc9711d4a6ebc3790a107
 - package: get-select/dbt_snowflake_query_tags
   version: 2.5.0
+- git: https://github.com/FlipsideCrypto/fsc-evm.git
+  revision: 2ce5a884e154684a4771c0a2c6e876a79c099868
 - package: calogica/dbt_date
   version: 0.7.2
 - git: https://github.com/FlipsideCrypto/livequery-models.git
   revision: b024188be4e9c6bc00ed77797ebdc92d351d620e
-sha1_hash: efa8844f7c3e54f84d660c43f887b9cb084dfd9f
+sha1_hash: 05336a5b7e0070b02e7d1316ce54f271685b1fd1
diff --git a/packages.yml b/packages.yml
index cef551a..0158591 100644
--- a/packages.yml
+++ b/packages.yml
@@ -8,4 +8,6 @@ packages:
   - git: https://github.com/FlipsideCrypto/fsc-utils.git
     revision: v1.29.0
   - package: get-select/dbt_snowflake_query_tags
-    version: [">=2.0.0", "<3.0.0"]
\ No newline at end of file
+    version: [">=2.0.0", "<3.0.0"]
+  - git: https://github.com/FlipsideCrypto/fsc-evm.git
+    revision: v1.1.0
\ No newline at end of file