diff --git a/README.md b/README.md
index 7e81e364..7c7f0371 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This package contains staging models, designed to work simultaneously with our [
 
 * Remove any rows that are soft-deleted
 * Name columns consistently across all packages:
-* Boolean fields are prefixed with is_ or has_
+* Boolean fields are prefixed with `is_` or `has_`
 * Timestamps are appended with `_timestamp`
 * ID primary keys are prefixed with the name of the table. For example, the user table's ID column is renamed user_id.
 
diff --git a/dbt_project.yml b/dbt_project.yml
index b25e7a4a..83a80b90 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,7 +1,7 @@
 name: 'hubspot_source'
-version: '1.0.0'
+version: '0.2.0'
 config-version: 2
-require-dbt-version: ">=0.17.0"
+require-dbt-version: [">=0.18.0", "<0.19.0"]
 
 vars:
   hubspot_source: 
diff --git a/macros/enabled_vars.sql b/macros/enabled_vars.sql
deleted file mode 100644
index ca9c9e7f..00000000
--- a/macros/enabled_vars.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-{% macro enabled_vars(vars) %}
-
-{% for v in vars %}
-    
-    {% if var(v, True) == False %}
-    {{ return(False) }}
-    {% endif %}
-
-{% endfor %}
-
-{{ return(True) }}
-
-{% endmacro %}
\ No newline at end of file
diff --git a/macros/full_name.sql b/macros/full_name.sql
deleted file mode 100644
index c0cc4b6d..00000000
--- a/macros/full_name.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-{% macro full_name(first_name, last_name) %}
-
-trim({{ dbt_utils.concat([first_name, "' '", last_name])}}) as full_name
-
-{% endmacro %}
\ No newline at end of file
diff --git a/macros/remove_prefix_from_columns.sql b/macros/remove_prefix_from_columns.sql
deleted file mode 100644
index 96b86dbc..00000000
--- a/macros/remove_prefix_from_columns.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-{% macro remove_prefix_from_columns(columns, prefix='property_', exclude=[]) %}
-
-        {%- for col in columns if col.name not in exclude -%}
-        {%- if col.name[:prefix|length]|lower == prefix -%}
-        {{ col.name }} as {{ col.name[prefix|length:] }}
-        {%- else -%}
-        {{ col.name }}
-        {%- endif -%}
-        {%- if not loop.last -%},{%- endif %}
-        {% endfor -%}
-
-{% endmacro %}
\ No newline at end of file
diff --git a/models/stg_hubspot__company.sql b/models/stg_hubspot__company.sql
index 84982a1c..6c212b43 100644
--- a/models/stg_hubspot__company.sql
+++ b/models/stg_hubspot__company.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
 
 {%- set columns = adapter.get_columns_in_relation(ref('stg_hubspot__company_adapter')) -%}
 
@@ -12,7 +12,7 @@ with base as (
 
     select
         id as company_id, 
-        {{ remove_prefix_from_columns(columns=columns, exclude=['id']) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_', exclude=['id']) }}
     from base
 
 )
diff --git a/models/stg_hubspot__company_adapter.sql b/models/stg_hubspot__company_adapter.sql
index 9f2f45ae..bc977cc3 100644
--- a/models/stg_hubspot__company_adapter.sql
+++ b/models/stg_hubspot__company_adapter.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
 
 select *
 from {{ var('company') }}
\ No newline at end of file
diff --git a/models/stg_hubspot__company_property_history.sql b/models/stg_hubspot__company_property_history.sql
index d9c62170..166fba08 100644
--- a/models/stg_hubspot__company_property_history.sql
+++ b/models/stg_hubspot__company_property_history.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__contact.sql b/models/stg_hubspot__contact.sql
index fb7dc565..77445e5d 100644
--- a/models/stg_hubspot__contact.sql
+++ b/models/stg_hubspot__contact.sql
@@ -4,13 +4,13 @@ with base as (
 
     select *
     from {{ ref('stg_hubspot__contact_adapter') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
     select
         id as contact_id,
-        {{ remove_prefix_from_columns(columns=columns, exclude=['id']) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_', exclude=['id']) }}
     from base
 
 )
diff --git a/models/stg_hubspot__contact_list.sql b/models/stg_hubspot__contact_list.sql
index c4e6a810..29f9a110 100644
--- a/models/stg_hubspot__contact_list.sql
+++ b/models/stg_hubspot__contact_list.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('contact_list') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
diff --git a/models/stg_hubspot__contact_list_member.sql b/models/stg_hubspot__contact_list_member.sql
index 7a1faf8f..20f0a642 100644
--- a/models/stg_hubspot__contact_list_member.sql
+++ b/models/stg_hubspot__contact_list_member.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('contact_list_member') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
diff --git a/models/stg_hubspot__deal.sql b/models/stg_hubspot__deal.sql
index af98615f..86c7b01c 100644
--- a/models/stg_hubspot__deal.sql
+++ b/models/stg_hubspot__deal.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 {%- set columns = adapter.get_columns_in_relation(ref('stg_hubspot__deal_adapter')) -%}
 
@@ -11,7 +11,7 @@ with base as (
 ), fields as (
 
     select
-        {{ remove_prefix_from_columns(columns=columns) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_') }}
     from base
 
 )
diff --git a/models/stg_hubspot__deal_adapter.sql b/models/stg_hubspot__deal_adapter.sql
index 45f20a28..7fabc7d9 100644
--- a/models/stg_hubspot__deal_adapter.sql
+++ b/models/stg_hubspot__deal_adapter.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 select *
 from {{ var('deal') }}
\ No newline at end of file
diff --git a/models/stg_hubspot__deal_pipeline.sql b/models/stg_hubspot__deal_pipeline.sql
index 8a7d01fb..aa5152f6 100644
--- a/models/stg_hubspot__deal_pipeline.sql
+++ b/models/stg_hubspot__deal_pipeline.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('deal_pipeline')}}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
diff --git a/models/stg_hubspot__deal_pipeline_stage.sql b/models/stg_hubspot__deal_pipeline_stage.sql
index 9c0a7866..3935c020 100644
--- a/models/stg_hubspot__deal_pipeline_stage.sql
+++ b/models/stg_hubspot__deal_pipeline_stage.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('deal_pipeline_stage')}}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
diff --git a/models/stg_hubspot__deal_property_history.sql b/models/stg_hubspot__deal_property_history.sql
index bbc45993..cfea522d 100644
--- a/models/stg_hubspot__deal_property_history.sql
+++ b/models/stg_hubspot__deal_property_history.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_campaign.sql b/models/stg_hubspot__email_campaign.sql
index a580fae2..eb6b4fcc 100644
--- a/models/stg_hubspot__email_campaign.sql
+++ b/models/stg_hubspot__email_campaign.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event.sql b/models/stg_hubspot__email_event.sql
index 40da61b8..bfad54ed 100644
--- a/models/stg_hubspot__email_event.sql
+++ b/models/stg_hubspot__email_event.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_bounce.sql b/models/stg_hubspot__email_event_bounce.sql
index 76a1dc81..f14e756f 100644
--- a/models/stg_hubspot__email_event_bounce.sql
+++ b/models/stg_hubspot__email_event_bounce.sql
@@ -1,5 +1,5 @@
 
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_bounce_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_bounce_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_click.sql b/models/stg_hubspot__email_event_click.sql
index 16bb240c..69f3e3cb 100644
--- a/models/stg_hubspot__email_event_click.sql
+++ b/models/stg_hubspot__email_event_click.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_click_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_click_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_deferred.sql b/models/stg_hubspot__email_event_deferred.sql
index c3f3d0f2..f3079aac 100644
--- a/models/stg_hubspot__email_event_deferred.sql
+++ b/models/stg_hubspot__email_event_deferred.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_delivered.sql b/models/stg_hubspot__email_event_delivered.sql
index 93b8f295..cd6b6a23 100644
--- a/models/stg_hubspot__email_event_delivered.sql
+++ b/models/stg_hubspot__email_event_delivered.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_delivered_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_delivered_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_dropped.sql b/models/stg_hubspot__email_event_dropped.sql
index e7e6b2f3..1ed34f84 100644
--- a/models/stg_hubspot__email_event_dropped.sql
+++ b/models/stg_hubspot__email_event_dropped.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_forward.sql b/models/stg_hubspot__email_event_forward.sql
index 18df4893..c61b895d 100644
--- a/models/stg_hubspot__email_event_forward.sql
+++ b/models/stg_hubspot__email_event_forward.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_forward_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_forward_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_open.sql b/models/stg_hubspot__email_event_open.sql
index 89ee774b..16fb0385 100644
--- a/models/stg_hubspot__email_event_open.sql
+++ b/models/stg_hubspot__email_event_open.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_print.sql b/models/stg_hubspot__email_event_print.sql
index 408dbab0..ffb6953e 100644
--- a/models/stg_hubspot__email_event_print.sql
+++ b/models/stg_hubspot__email_event_print.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_print_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_print_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_sent.sql b/models/stg_hubspot__email_event_sent.sql
index b5a59e3a..b8d09fc1 100644
--- a/models/stg_hubspot__email_event_sent.sql
+++ b/models/stg_hubspot__email_event_sent.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_spam_report.sql b/models/stg_hubspot__email_event_spam_report.sql
index e154131d..ba6ebec8 100644
--- a/models/stg_hubspot__email_event_spam_report.sql
+++ b/models/stg_hubspot__email_event_spam_report.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_spam_report_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_spam_report_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__email_event_status_change.sql b/models/stg_hubspot__email_event_status_change.sql
index c69d6282..f64d6870 100644
--- a/models/stg_hubspot__email_event_status_change.sql
+++ b/models/stg_hubspot__email_event_status_change.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement.sql b/models/stg_hubspot__engagement.sql
index 5b0de279..1f4d5ff7 100644
--- a/models/stg_hubspot__engagement.sql
+++ b/models/stg_hubspot__engagement.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_call.sql b/models/stg_hubspot__engagement_call.sql
index f546a1f6..0c915384 100644
--- a/models/stg_hubspot__engagement_call.sql
+++ b/models/stg_hubspot__engagement_call.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_call_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_call_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_company.sql b/models/stg_hubspot__engagement_company.sql
index 3a0c80df..314eefa0 100644
--- a/models/stg_hubspot__engagement_company.sql
+++ b/models/stg_hubspot__engagement_company.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_company_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_company_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_contact.sql b/models/stg_hubspot__engagement_contact.sql
index 520a6ea1..5586cd91 100644
--- a/models/stg_hubspot__engagement_contact.sql
+++ b/models/stg_hubspot__engagement_contact.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_contact_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_contact_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_deal.sql b/models/stg_hubspot__engagement_deal.sql
index 1122d330..b2cdec87 100644
--- a/models/stg_hubspot__engagement_deal.sql
+++ b/models/stg_hubspot__engagement_deal.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_deal_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_email.sql b/models/stg_hubspot__engagement_email.sql
index 3f20f6f5..c65ff4ff 100644
--- a/models/stg_hubspot__engagement_email.sql
+++ b/models/stg_hubspot__engagement_email.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_meeting.sql b/models/stg_hubspot__engagement_meeting.sql
index 6ca870a3..9350b4c0 100644
--- a/models/stg_hubspot__engagement_meeting.sql
+++ b/models/stg_hubspot__engagement_meeting.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_note.sql b/models/stg_hubspot__engagement_note.sql
index 0bcd9467..379d0543 100644
--- a/models/stg_hubspot__engagement_note.sql
+++ b/models/stg_hubspot__engagement_note.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_note_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_note_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__engagement_task.sql b/models/stg_hubspot__engagement_task.sql
index dfd9137b..bb268ea7 100644
--- a/models/stg_hubspot__engagement_task.sql
+++ b/models/stg_hubspot__engagement_task.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_task_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_task_enabled'])) }}
 
 with base as (
 
diff --git a/models/stg_hubspot__owner.sql b/models/stg_hubspot__owner.sql
index c504b3e0..f93b87bb 100644
--- a/models/stg_hubspot__owner.sql
+++ b/models/stg_hubspot__owner.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_owner_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_owner_enabled'])) }}
 
 with base as (
 
@@ -17,7 +17,7 @@ with base as (
         portal_id,
         type as owner_type,
         updated_at as updated_timestamp,
-        {{ full_name('first_name','last_name') }}
+        trim( {{ dbt_utils.concat(['first_name', "' '", 'last_name']) }} ) as full_name
     from base
     
 )
diff --git a/packages.yml b/packages.yml
index 37cc7bd8..d45e3109 100644
--- a/packages.yml
+++ b/packages.yml
@@ -1,3 +1,6 @@
 packages:
   - package: fishtown-analytics/dbt_utils
-    version: [">=0.4.0"]
\ No newline at end of file
+    version: [">=0.6.0", "<0.7.0"]
+
+  - git: "https://github.com/fivetran/dbt_fivetran_utils.git"
+    warn-unpinned: false
\ No newline at end of file