diff --git a/models/silver/atlas/silver__atlas_address_first_action.sql b/models/silver/atlas/silver__atlas_address_first_action.sql
index 98d246e..b92f8f0 100644
--- a/models/silver/atlas/silver__atlas_address_first_action.sql
+++ b/models/silver/atlas/silver__atlas_address_first_action.sql
@@ -14,17 +14,20 @@ WITH txs AS (
         block_id,
         block_timestamp,
         tx_hash,
-        COALESCE(
-            _load_timestamp,
-            _inserted_timestamp
-        ) AS _inserted_timestamp
+        _partition_by_block_number,
+        _inserted_timestamp,
+        modified_timestamp AS _modified_timestamp
     FROM
         {{ ref('silver__streamline_transactions_final') }}
     WHERE
         {% if var("MANUAL_FIX") %}
             {{ partition_load_manual('no_buffer') }}
         {% else %}
-            {{ incremental_load_filter('_inserted_timestamp') }}
+            {% if var('IS_MIGRATION') %}
+                {{ incremental_load_filter('_inserted_timestamp') }}
+            {% else %}
+                {{ incremental_load_filter('_modified_timestamp') }}
+            {% endif %}
         {% endif %}
 ),
 FINAL AS (
@@ -32,7 +35,9 @@ FINAL AS (
         address,
         MIN(block_timestamp) AS first_tx_timestamp,
         MIN(block_id) AS first_tx_block_id,
-        MIN(_inserted_timestamp) AS _inserted_timestamp
+        MIN(_partition_by_block_number) AS _partition_by_block_number,
+        MIN(_inserted_timestamp) AS _inserted_timestamp,
+        MIN(_modified_timestamp) AS _modified_timestamp
     FROM
         txs
     GROUP BY
@@ -45,7 +50,9 @@ SELECT
     address,
     first_tx_timestamp,
     first_tx_block_id,
+    _partition_by_block_number,
     _inserted_timestamp,
+    _modified_timestamp,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
     '{{ invocation_id }}' AS _invocation_id
diff --git a/models/silver/atlas/silver__atlas_address_first_action.yml b/models/silver/atlas/silver__atlas_address_first_action.yml
index 48d5b09..80c2f36 100644
--- a/models/silver/atlas/silver__atlas_address_first_action.yml
+++ b/models/silver/atlas/silver__atlas_address_first_action.yml
@@ -28,12 +28,18 @@ models:
         tests:
           - not_null
 
+      - name: _partition_by_block_number
+        description: "{{ doc('_partition_by_block_number') }}"
+
       - name: _inserted_timestamp
         description: "{{ doc('_inserted_timestamp') }}"
         tests:
           - name: not_null_silver__atlas_address_first_action_INSERTED_TIMESTAMP_
             test_name: not_null
 
+      - name: _modified_timestamp
+        description: "{{ doc('_modified_timestamp') }}"
+
       - name: inserted_timestamp
         description: "{{ doc('inserted_timestamp') }}"
         tests:
diff --git a/models/silver/atlas/silver__atlas_nft_transactions.sql b/models/silver/atlas/silver__atlas_nft_transactions.sql
index efe285a..9234881 100644
--- a/models/silver/atlas/silver__atlas_nft_transactions.sql
+++ b/models/silver/atlas/silver__atlas_nft_transactions.sql
@@ -18,17 +18,20 @@ WITH nft_mints AS (
         signer_id,
         owner_id AS owner,
         token_id,
-        COALESCE(
-            _inserted_timestamp,
-            _load_timestamp
-        ) AS _inserted_timestamp
+        _partition_by_block_number,
+        _inserted_timestamp,
+        modified_timestamp AS _modified_timestamp
     FROM
         {{ ref('silver__standard_nft_mint_s3') }}
     WHERE
         {% if var("MANUAL_FIX") %}
             {{ partition_load_manual('no_buffer') }}
         {% else %}
-            {{ incremental_load_filter('_inserted_timestamp') }}
+            {% if var('IS_MIGRATION') %}
+                {{ incremental_load_filter('_inserted_timestamp') }}
+            {% else %}
+                {{ incremental_load_filter('_modified_timestamp') }}
+            {% endif %}
         {% endif %}
 ),
 nft_transfers AS (
@@ -44,10 +47,9 @@ nft_transfers AS (
         signer_id,
         args ['receiver_id'] AS owner,
         args ['token_id'] AS token_id,
-        COALESCE(
-            _inserted_timestamp,
-            _load_timestamp
-        ) AS _inserted_timestamp
+        _partition_by_block_number,
+        _inserted_timestamp,
+        modified_timestamp AS _modified_timestamp
     FROM
         {{ ref('silver__actions_events_function_call_s3') }}
     WHERE
@@ -55,7 +57,11 @@ nft_transfers AS (
         AND {% if var("MANUAL_FIX") %}
             {{ partition_load_manual('no_buffer') }}
         {% else %}
-            {{ incremental_load_filter('_inserted_timestamp') }}
+            {% if var('IS_MIGRATION') %}
+                {{ incremental_load_filter('_inserted_timestamp') }}
+            {% else %}
+                {{ incremental_load_filter('_modified_timestamp') }}
+            {% endif %}
         {% endif %}
 ),
 unioned_nft_data AS (
@@ -82,8 +88,10 @@ SELECT
     token_id,
     SYSDATE() AS inserted_timestamp,
     SYSDATE() AS modified_timestamp,
+    '{{ invocation_id }}' AS _invocation_id,
+    _partition_by_block_number,
     _inserted_timestamp,
-    '{{ invocation_id }}' AS _invocation_id
+    _modified_timestamp
 FROM
     unioned_nft_data
 WHERE
diff --git a/models/silver/atlas/silver__atlas_nft_transactions.yml b/models/silver/atlas/silver__atlas_nft_transactions.yml
index 90eefb3..620c8a6 100644
--- a/models/silver/atlas/silver__atlas_nft_transactions.yml
+++ b/models/silver/atlas/silver__atlas_nft_transactions.yml
@@ -52,11 +52,6 @@ models:
         tests:
           - not_null
 
-      - name: _inserted_timestamp
-        description: "{{doc('_inserted_timestamp')}}"
-        tests:
-          - not_null
-
       - name: inserted_timestamp
         description: "{{doc('inserted_timestamp')}}"
         tests:
@@ -69,3 +64,14 @@ models:
 
       - name: _invocation_id
         description: "{{doc('invocation_id')}}"
+
+      - name: _partition_by_block_number
+        description: "{{doc('_partition_by_block_number')}}"
+
+      - name: _inserted_timestamp
+        description: "{{doc('_inserted_timestamp')}}"
+        tests:
+          - not_null
+
+      - name: _modified_timestamp
+        description: "{{doc('_modified_timestamp')}}"
\ No newline at end of file
diff --git a/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.sql b/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.sql
index a03c055..5f065ae 100644
--- a/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.sql
+++ b/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.sql
@@ -10,14 +10,27 @@
 WITH receipts AS (
 
     SELECT
-        *
+        receipt_object_id,
+        tx_hash,
+        block_timestamp,
+        receipt_actions,
+        receiver_id,
+        status_value,
+        logs,
+        _partition_by_block_number,
+        _inserted_timestamp,
+        modified_timestamp AS _modified_timestamp
     FROM
         {{ ref('silver__streamline_receipts_final') }}
     WHERE
         {% if var("MANUAL_FIX") %}
             {{ partition_load_manual('no_buffer') }}
         {% else %}
-            {{ incremental_load_filter('_inserted_timestamp') }}
+            {% if var('IS_MIGRATION') %}
+                {{ incremental_load_filter('_inserted_timestamp') }}
+            {% else %}
+                {{ incremental_load_filter('_modified_timestamp') }}
+            {% endif %}
         {% endif %}
 ),
 FINAL AS (
@@ -32,15 +45,9 @@ FINAL AS (
             status_value
         ) [0] :: STRING AS status,
         logs,
-        COALESCE(
-            _inserted_timestamp,
-            _load_timestamp
-        ) AS _inserted_timestamp,
         _partition_by_block_number,
-        {{ dbt_utils.generate_surrogate_key(['receipt_object_id']) }} AS atlas_supply_lockup_receipts_id,
-        SYSDATE() AS inserted_timestamp,
-        SYSDATE() AS modified_timestamp,
-        '{{ invocation_id }}' AS _invocation_id
+        _inserted_timestamp,
+        _modified_timestamp
     FROM
         receipts
     WHERE
@@ -48,6 +55,10 @@ FINAL AS (
         AND status != 'Failure'
 )
 SELECT
-    *
+    *,
+    {{ dbt_utils.generate_surrogate_key(['receipt_object_id']) }} AS atlas_supply_lockup_receipts_id,
+    SYSDATE() AS inserted_timestamp,
+    SYSDATE() AS modified_timestamp,
+    '{{ invocation_id }}' AS _invocation_id
 FROM
     FINAL
diff --git a/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.yml b/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.yml
index a7f5faf..9e7036d 100644
--- a/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.yml
+++ b/models/silver/atlas/supply/silver__atlas_supply_lockup_receipts.yml
@@ -36,10 +36,12 @@ models:
           - not_null
       - name: logs
         description: "{{ doc('logs') }}"
-      - name: _inserted_timestamp
-        description: "{{ doc('_inserted_timestamp') }}"
       - name: _partition_by_block_number
         description: "{{ doc('_partition_by_block_number') }}"
+      - name: _inserted_timestamp
+        description: "{{ doc('_inserted_timestamp') }}"
+      - name: _modified_timestamp
+        description: "{{ doc('_modified_timestamp') }}"
       - name: atlas_supply_lockup_receipts_id
         description: "{{ doc('id') }}"
         tests: