diff --git a/dbt_project.yml b/dbt_project.yml
index 445c34f..93ab912 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'ad_reporting'
-version: '0.4.0'
+version: '0.4.1'
 config-version: 2
 
 require-dbt-version: [">=0.20.0"]
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
index 679c6e8..a82b2ed 100644
--- a/integration_tests/dbt_project.yml
+++ b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'ad_reporting_integration_tests'
-version: '0.4.0'
+version: '0.4.1'
 profile: 'integration_tests'
 config-version: 2
 
@@ -95,10 +95,12 @@ seeds:
       +column_types:
         created_time: timestamp
         last_modified_time: timestamp
+        account_id: "{{ 'int64' if target.name == 'bigquery' else 'bigint' }}"
     linkedin_campaign_history_data:
       +column_types:
         created_time: timestamp
         last_modified_time: timestamp
+        account_id: "{{ 'int64' if target.name == 'bigquery' else 'bigint' }}"
 
     ### Twitter Seeds
 
@@ -165,6 +167,7 @@ seeds:
     facebook_ads_account_history_data:
       +column_types:
         id: "{{ 'int64' if target.name == 'bigquery' else 'bigint' }}"
+        name: "{{ 'string' if target.name in ['bigquery','spark'] else 'varchar' }}"
     facebook_ads_ad_history_data:
       +column_types:
         id: "{{ 'int64' if target.name == 'bigquery' else 'bigint' }}"
diff --git a/models/stg_facebook_ads.sql b/models/stg_facebook_ads.sql
index f82240f..6003d5e 100644
--- a/models/stg_facebook_ads.sql
+++ b/models/stg_facebook_ads.sql
@@ -9,6 +9,8 @@ with base as (
 
     select
         cast(date_day as date) as date_day,
+        account_name,
+        cast(account_id as {{ dbt_utils.type_string() }}) as account_id,
         base_url,
         url_host,
         url_path,
@@ -26,7 +28,7 @@ with base as (
         sum(coalesce(impressions, 0)) as impressions,
         sum(coalesce(spend, 0)) as spend
     from base
-    {{ dbt_utils.group_by(14) }}
+    {{ dbt_utils.group_by(16) }}
 
 
 )
diff --git a/models/stg_google_ads.sql b/models/stg_google_ads.sql
index 9170f86..420b05e 100644
--- a/models/stg_google_ads.sql
+++ b/models/stg_google_ads.sql
@@ -11,7 +11,7 @@ with base as (
         'Google Ads' as platform,
         cast(date_day as date) as date_day,
         account_name,
-        external_customer_id as account_id,
+        cast(external_customer_id as {{ dbt_utils.type_string() }}) as account_id,
         campaign_name,
         cast(campaign_id as {{ dbt_utils.type_string() }}) as campaign_id,
         ad_group_name,
diff --git a/models/stg_linkedin_ads.sql b/models/stg_linkedin_ads.sql
index 4e71839..73a9664 100644
--- a/models/stg_linkedin_ads.sql
+++ b/models/stg_linkedin_ads.sql
@@ -11,7 +11,7 @@ with base as (
         'LinkedIn Ads' as platform,
         cast(date_day as date) as date_day,
         account_name,
-        account_id,
+        cast(account_id as {{ dbt_utils.type_string() }}) as account_id,
         campaign_group_name as campaign_name,
         cast(campaign_group_id as {{ dbt_utils.type_string() }}) as campaign_id,
         campaign_name as ad_group_name,
diff --git a/models/stg_microsoft_ads.sql b/models/stg_microsoft_ads.sql
index 6ff404c..a765e40 100644
--- a/models/stg_microsoft_ads.sql
+++ b/models/stg_microsoft_ads.sql
@@ -11,7 +11,7 @@ with base as (
         'Microsoft Ads' as platform,
         cast(date_day as date) as date_day,
         account_name,
-        account_id,
+        cast(account_id as {{ dbt_utils.type_string() }}) as account_id,
         campaign_name,
         cast(campaign_id as {{ dbt_utils.type_string() }}) as campaign_id,
         ad_group_name,