diff --git a/models/staging/shipping/stg_shipping__parent_and_sub_companies.sql b/models/staging/shipping/stg_shipping__parent_and_sub_companies.sql
index f2e95e1..71f3559 100644
--- a/models/staging/shipping/stg_shipping__parent_and_sub_companies.sql
+++ b/models/staging/shipping/stg_shipping__parent_and_sub_companies.sql
@@ -26,23 +26,27 @@ status AS (
     WHERE category = 'DEFAULT'
 ),
 
+migrated_sub_company_marking_id AS (
+    SELECT * FROM {{ ref('seed_shipping__migrated_company_marking_id') }}
+),
+
 
 -- LOGIC
 parent_companies_join_sub_companies AS (
     SELECT 
-        parent_companies.parent_company_id  AS parent_company_id,
+        parent_companies.parent_company_id      AS parent_company_id,
         parent_companies.autocount_id,
-        parent_companies.name   AS parent_company_name,
+        parent_companies.name                   AS parent_company_name,
         parent_companies.parent_company_type    AS company_type,
         parent_companies.status,
-        parent_companies.created_datetime   AS parent_company_created_datetime,
-        parent_companies.updated_datetime   AS parent_company_updated_datetime,
+        parent_companies.created_datetime       AS parent_company_created_datetime,
+        parent_companies.updated_datetime       AS parent_company_updated_datetime,
 
-        sub_companies.sub_company_id    AS sub_company_id,
-        sub_companies.name  AS sub_company_name,
-        sub_companies.sub_company_type  AS business_type,
-        sub_companies.created_datetime  AS sub_company_created_datetime,
-        sub_companies.updated_datetime  AS sub_company_updated_datetime
+        sub_companies.sub_company_id            AS sub_company_id,
+        sub_companies.name                      AS sub_company_name,
+        sub_companies.sub_company_type          AS business_type,
+        sub_companies.created_datetime          AS sub_company_created_datetime,
+        sub_companies.updated_datetime          AS sub_company_updated_datetime
 
     FROM parent_companies
 
@@ -56,39 +60,50 @@ parent_companies_and_sub_companies_map_constants AS (
         parent_companies_join_sub_companies.autocount_id,
         parent_companies_join_sub_companies.parent_company_name,
 
-        COALESCE(company_types.name, parent_companies_join_sub_companies.company_type::string)   AS company_type,
+        COALESCE(company_types.name, parent_companies_join_sub_companies.company_type::string)      AS company_type,
 
-        COALESCE(status.name, parent_companies_join_sub_companies.status::string)   AS status,        
+        COALESCE(status.name, parent_companies_join_sub_companies.status::string)                   AS status,        
 
         parent_companies_join_sub_companies.parent_company_created_datetime,
         parent_companies_join_sub_companies.parent_company_updated_datetime,
         parent_companies_join_sub_companies.sub_company_id,
         parent_companies_join_sub_companies.sub_company_name,
 
-        COALESCE(business_type.name, parent_companies_join_sub_companies.business_type::string)   AS business_type,        
+        COALESCE(business_type.name, parent_companies_join_sub_companies.business_type::string)     AS business_type,        
 
         parent_companies_join_sub_companies.sub_company_created_datetime,
         parent_companies_join_sub_companies.sub_company_updated_datetime,
 
         sub_company_marking_connections.sub_company_marking_id,
+        sub_company_marking_connections.is_credit_term_company,
 
-        '{{ modules.datetime.datetime.now(modules.pytz.timezone("Asia/Kuala_Lumpur")) }}'   AS _dbt_ran_datetime
+        CASE 
+            WHEN sub_company_marking_id IN (SELECT * FROM migrated_sub_company_marking_id)
+            OR 
+            DATE(sub_company_marking_connections.created_datetime) = '2021-08-18'
+            THEN 1
+            ELSE 0
+        END     AS is_migrated_company,
+
+        '{{ modules.datetime.datetime.now(modules.pytz.timezone("Asia/Kuala_Lumpur")) }}'           AS _dbt_ran_datetime
 
     FROM parent_companies_join_sub_companies
 
     LEFT JOIN sub_company_marking_connections
         ON (parent_companies_join_sub_companies.sub_company_id = sub_company_marking_connections.sub_company_id)
 
-    LEFT JOIN parent_company_types AS company_types
+    LEFT JOIN parent_company_types  AS company_types
         ON (parent_companies_join_sub_companies.company_type = company_types.id)
 
-    LEFT JOIN sub_company_types AS business_type
+    LEFT JOIN sub_company_types     AS business_type
         ON (parent_companies_join_sub_companies.business_type = business_type.id)
 
     LEFT JOIN status
         ON (parent_companies_join_sub_companies.status = status.id)
+
 ),
 
+
 -- FINAL
 final__stg_shipping__parent_and_sub_companies AS (
 
@@ -101,6 +116,8 @@ final__stg_shipping__parent_and_sub_companies AS (
 
         -- dimensions
         status,
+        is_credit_term_company,
+        is_migrated_company,
         parent_company_name,
         sub_company_name,
         company_type,
@@ -118,6 +135,7 @@ final__stg_shipping__parent_and_sub_companies AS (
         _dbt_ran_datetime
 
     FROM parent_companies_and_sub_companies_map_constants
+
 ) 
 
-SELECT * FROM final__stg_shipping__parent_and_sub_companies
+SELECT * FROM final__stg_shipping__parent_and_sub_companies
\ No newline at end of file