diff --git a/dbt_project.yml b/dbt_project.yml
index 043a7c1..e2774d6 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'dbt_object_mgmt'
-version: '0.2.6'
+version: '0.2.7'
 config-version: 2
 
 target-path: "target"
diff --git a/macros/create_pipe.sql b/macros/create_pipe.sql
index dcdde52..f4bb778 100644
--- a/macros/create_pipe.sql
+++ b/macros/create_pipe.sql
@@ -8,7 +8,8 @@
 {% endif %}
 
 {% set pipe = gather_results(file) %}
-{%- set schema_name = target.database ~ '.' ~ pipe.schema_name %}
+{%- set database_name = pipe.database_name or target.database %}
+{%- set schema_name = database_name ~ '.' ~ pipe.schema_name %}
 {%- set table_name = pipe.table_name %}
 {%- set file_type = pipe.file_type %}