diff --git a/models/marts/warehouse/dim_shipping__companies.sql b/models/marts/warehouse/dim_shipping__companies.sql
index f02197a..f5dcd46 100644
--- a/models/marts/warehouse/dim_shipping__companies.sql
+++ b/models/marts/warehouse/dim_shipping__companies.sql
@@ -14,18 +14,19 @@ company_documents AS (
 
 -- LOGIC
 latest_company_documents AS (
+
     SELECT
-        document_id AS identity_document_id,
-        parent_company_id  AS identity_parent_company_id,
-        approver_user_id    AS identity_approver_user_id,
-        status  AS identity_status,
-        document_type   AS identity_document_type,
-        identity_number AS identity_identity_number,
-        approved_datetime   AS identity_approved_datetime,
-        deleted_datetime    AS identity_deleted_datetime,
-        created_datetime    AS identity_created_datetime,
-        updated_datetime    AS identity_updated_datetime,
-        row_number() OVER 
+        document_id             AS identity_document_id,
+        parent_company_id       AS identity_parent_company_id,
+        approver_user_id        AS identity_approver_user_id,
+        status                  AS identity_status,
+        document_type           AS identity_document_type,
+        identity_number         AS identity_identity_number,
+        approved_datetime       AS identity_approved_datetime,
+        deleted_datetime        AS identity_deleted_datetime,
+        created_datetime        AS identity_created_datetime,
+        updated_datetime        AS identity_updated_datetime,
+        ROW_NUMBER() OVER 
                     (PARTITION BY parent_company_id 
                     ORDER BY created_datetime DESC) AS latest_row_number
     
@@ -36,15 +37,19 @@ latest_company_documents AS (
 
     QUALIFY 
         latest_row_number = 1
+
 ),
 
 sub_companies_enrich AS (
+
     SELECT
         parent_and_sub_companies.parent_company_id,
         parent_and_sub_companies.autocount_id,
         parent_and_sub_companies.sub_company_id,
         parent_and_sub_companies.sub_company_marking_id,
-        parent_and_sub_companies.status AS sub_company_status,
+        parent_and_sub_companies.status                     AS sub_company_status,
+        parent_and_sub_companies.is_credit_term_company,
+        parent_and_sub_companies.is_migrated_company,
         parent_and_sub_companies.parent_company_name,
         parent_and_sub_companies.sub_company_name,
         parent_and_sub_companies.company_type,
@@ -64,9 +69,9 @@ sub_companies_enrich AS (
         latest_sub_company_billing_addresses.postcode,
         latest_sub_company_billing_addresses.address_type,
         latest_sub_company_billing_addresses.is_default_address,
-        latest_sub_company_billing_addresses.status    AS company_address_status,
-        latest_sub_company_billing_addresses.created_datetime  AS company_addresses_created_datetime,
-        latest_sub_company_billing_addresses.updated_datetime  AS company_addresses_updated_datetime,
+        latest_sub_company_billing_addresses.status                 AS company_address_status,
+        latest_sub_company_billing_addresses.created_datetime       AS company_addresses_created_datetime,
+        latest_sub_company_billing_addresses.updated_datetime       AS company_addresses_updated_datetime,
 
         latest_company_documents.identity_document_id,
         latest_company_documents.identity_approver_user_id,
@@ -87,10 +92,13 @@ sub_companies_enrich AS (
 
     LEFT JOIN latest_company_documents
         ON (parent_and_sub_companies.parent_company_id = latest_company_documents.identity_parent_company_id)
+
 ),
 
+
 -- FINAL
 final__dim_shipping__companies AS (
+
     SELECT
         -- ids
         sub_company_id,
@@ -107,6 +115,8 @@ final__dim_shipping__companies AS (
         sub_company_name,
         company_type,
         business_type,
+        is_credit_term_company,
+        is_migrated_company,
         company_address_status,
         address_reference,
         address_line_one,
@@ -138,8 +148,8 @@ final__dim_shipping__companies AS (
         -- metadata
         _dbt_ran_datetime
 
-
     FROM sub_companies_enrich
+    
 )
 
 SELECT * FROM final__dim_shipping__companies
\ No newline at end of file