diff --git a/metricflow/test/generate_snapshots.py b/metricflow/test/generate_snapshots.py
index 64b87d91b5..ece4ff78ce 100644
--- a/metricflow/test/generate_snapshots.py
+++ b/metricflow/test/generate_snapshots.py
@@ -153,7 +153,8 @@ def run_tests(test_configuration: MetricFlowTestConfiguration, test_file_paths:
         engine_name = test_configuration.engine.value.lower()
         os.environ["MF_TEST_ADAPTER_TYPE"] = engine_name
         hatch_env = f"{engine_name}-env"
-        use_persistent_source_schema = test_configuration.engine != SqlEngine.POSTGRES
+        # use_persistent_source_schema = test_configuration.engine != SqlEngine.POSTGRES
+        use_persistent_source_schema = False
         run_command(
             f"hatch -v run {hatch_env}:pytest -x -vv -n 4 "
             f"--overwrite-snapshots"
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
index 73911c3dd1..2250a63a9c 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS ds__week
-  , DATE_TRUNC(users_latest_src_10008.ds, month) AS ds__month
-  , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS ds__quarter
-  , DATE_TRUNC(users_latest_src_10008.ds, year) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS ds_latest__week
+  , DATE_TRUNC(users_latest_src_10008.ds, month) AS ds_latest__month
+  , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS ds_latest__quarter
+  , DATE_TRUNC(users_latest_src_10008.ds, year) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS user__ds__week
-  , DATE_TRUNC(users_latest_src_10008.ds, month) AS user__ds__month
-  , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS user__ds__quarter
-  , DATE_TRUNC(users_latest_src_10008.ds, year) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS user__ds_latest__week
+  , DATE_TRUNC(users_latest_src_10008.ds, month) AS user__ds_latest__month
+  , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS user__ds_latest__quarter
+  , DATE_TRUNC(users_latest_src_10008.ds, year) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..c93c11b262 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..c93c11b262 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..c93c11b262 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..c93c11b262 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..c93c11b262 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -1,16 +1,16 @@
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
-  users_latest_src_10008.ds AS ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  users_latest_src_10008.ds AS ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds_latest__year
   , users_latest_src_10008.home_state_latest
-  , users_latest_src_10008.ds AS user__ds__day
-  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
-  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
-  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
-  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , users_latest_src_10008.ds AS user__ds_latest__day
+  , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds_latest__week
+  , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds_latest__month
+  , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds_latest__quarter
+  , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds_latest__year
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_with_measures__result0.txt b/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_with_measures__result0.txt
new file mode 100644
index 0000000000..6eb9b3b386
--- /dev/null
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_with_measures__result0.txt
@@ -0,0 +1,26 @@
+['ds__day',
+ 'ds__month',
+ 'ds__quarter',
+ 'ds__week',
+ 'ds__year',
+ 'ds_partitioned__day',
+ 'ds_partitioned__month',
+ 'ds_partitioned__quarter',
+ 'ds_partitioned__week',
+ 'ds_partitioned__year',
+ 'identity_verifications',
+ 'user',
+ 'verification',
+ 'verification__ds__day',
+ 'verification__ds__month',
+ 'verification__ds__quarter',
+ 'verification__ds__week',
+ 'verification__ds__year',
+ 'verification__ds_partitioned__day',
+ 'verification__ds_partitioned__month',
+ 'verification__ds_partitioned__quarter',
+ 'verification__ds_partitioned__week',
+ 'verification__ds_partitioned__year',
+ 'verification__user',
+ 'verification__verification_type',
+ 'verification_type']
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_without_measures__result0.txt b/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_without_measures__result0.txt
new file mode 100644
index 0000000000..d7603d9c5d
--- /dev/null
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/list/test_convert_table_semantic_model_without_measures__result0.txt
@@ -0,0 +1,13 @@
+['ds_latest__day',
+ 'ds_latest__month',
+ 'ds_latest__quarter',
+ 'ds_latest__week',
+ 'ds_latest__year',
+ 'home_state_latest',
+ 'user',
+ 'user__ds_latest__day',
+ 'user__ds_latest__month',
+ 'user__ds_latest__quarter',
+ 'user__ds_latest__week',
+ 'user__ds_latest__year',
+ 'user__home_state_latest']
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index 96381bbd71..c86bb33dcf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS account_id__ds_partitioned__month
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, isoweek) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index d35179ebf0..3fda2c8f42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index d35179ebf0..3fda2c8f42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index d35179ebf0..3fda2c8f42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index d35179ebf0..3fda2c8f42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index d35179ebf0..3fda2c8f42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -111,6 +111,11 @@ FROM (
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.bridge_account__ds_partitioned__day AS bridge_account__ds_partitioned__day
+            , subq_3.bridge_account__ds_partitioned__week AS bridge_account__ds_partitioned__week
+            , subq_3.bridge_account__ds_partitioned__month AS bridge_account__ds_partitioned__month
+            , subq_3.bridge_account__ds_partitioned__quarter AS bridge_account__ds_partitioned__quarter
+            , subq_3.bridge_account__ds_partitioned__year AS bridge_account__ds_partitioned__year
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -119,8 +124,11 @@ FROM (
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
+            , subq_3.bridge_account__account_id AS bridge_account__account_id
+            , subq_3.bridge_account__customer_id AS bridge_account__customer_id
             , subq_3.extra_dim AS extra_dim
             , subq_3.account_id__extra_dim AS account_id__extra_dim
+            , subq_3.bridge_account__extra_dim AS bridge_account__extra_dim
             , subq_5.customer_name AS customer_id__customer_name
             , subq_5.customer_atomic_weight AS customer_id__customer_atomic_weight
           FROM (
@@ -138,9 +146,17 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , bridge_table_src_10011.extra_dim AS bridge_account__extra_dim
+              , bridge_table_src_10011.ds_partitioned AS bridge_account__ds_partitioned__day
+              , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__week
+              , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__month
+              , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__quarter
+              , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS bridge_account__ds_partitioned__year
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
+              , bridge_table_src_10011.account_id AS bridge_account__account_id
+              , bridge_table_src_10011.customer_id AS bridge_account__customer_id
             FROM ***************************.bridge_table bridge_table_src_10011
           ) subq_3
           LEFT OUTER JOIN (
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
index 039becd5f3..d5faaadea0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
@@ -353,179 +353,179 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10287),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10288),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10290),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10291),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10292),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col8 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10152),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                         <!--    'column_alias': 'ds__week'}                        -->
                                         <!-- col9 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10153),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                         <!--    'column_alias': 'ds__month'}                       -->
                                         <!-- col10 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10154),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                         <!--    'column_alias': 'ds__quarter'}                     -->
                                         <!-- col11 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
                                         <!-- col12 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10297),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                         <!-- col13 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
                                         <!-- col14 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
                                         <!-- col15 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
                                         <!-- col17 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10302),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
                                         <!-- col18 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
                                         <!-- col19 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
                                         <!-- col20 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
                                         <!-- col21 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
                                         <!-- col22 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10307),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
                                         <!-- col23 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10308),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
                                         <!-- col24 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
                                         <!-- col25 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
                                         <!-- col26 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
                                         <!-- col27 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
                                         <!-- col28 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10313),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
                                         <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
                                         <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
                                         <!-- col31 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
                                         <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
                                         <!-- col33 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
                                         <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10176),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
                                         <!-- col35 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10177),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
                                         <!-- col36 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10178),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
                                         <!-- col37 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
                                         <!-- col38 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10323),  -->
                                         <!--    'column_alias': 'listing'}                               -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10324),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
                                         <!-- col40 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10325),  -->
                                         <!--    'column_alias': 'host'}                                  -->
                                         <!-- col41 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10326),  -->
                                         <!--    'column_alias': 'user'}                                  -->
                                         <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10327),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
                                         <!-- col43 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10328),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
                                         <!-- col44 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10329),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- col45 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
                                         <!--    'column_alias': 'booking__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                         <!-- where = None -->
@@ -565,119 +565,119 @@
                                     <!-- node_id = ss_10017 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10338),  -->
                                     <!--    'column_alias': 'window_start__day'}                     -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10176),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
                                     <!--    'column_alias': 'window_start__week'}              -->
                                     <!-- col2 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10177),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
                                     <!--    'column_alias': 'window_start__month'}             -->
                                     <!-- col3 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10178),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
                                     <!--    'column_alias': 'window_start__quarter'}           -->
                                     <!-- col4 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
                                     <!--    'column_alias': 'window_start__year'}              -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10335),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
                                     <!--    'column_alias': 'window_end__day'}                       -->
                                     <!-- col6 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
                                     <!--    'column_alias': 'window_end__week'}                -->
                                     <!-- col7 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
                                     <!--    'column_alias': 'window_end__month'}               -->
                                     <!-- col8 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
                                     <!--    'column_alias': 'window_end__quarter'}             -->
                                     <!-- col9 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
                                     <!--    'column_alias': 'window_end__year'}                -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10340),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
                                     <!--    'column_alias': 'country'}                               -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10341),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10349),  -->
                                     <!--    'column_alias': 'is_lux'}                                -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10342),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10350),  -->
                                     <!--    'column_alias': 'capacity'}                              -->
                                     <!-- col13 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10351),  -->
                                     <!--    'column_alias': 'listing__window_start__day'}            -->
                                     <!-- col14 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
                                     <!--    'column_alias': 'listing__window_start__week'}     -->
                                     <!-- col15 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
                                     <!--    'column_alias': 'listing__window_start__month'}    -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
                                     <!--    'column_alias': 'listing__window_start__quarter'}  -->
                                     <!-- col17 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
                                     <!--    'column_alias': 'listing__window_start__year'}     -->
                                     <!-- col18 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
                                     <!--    'column_alias': 'listing__window_end__day'}              -->
                                     <!-- col19 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10192),  -->
                                     <!--    'column_alias': 'listing__window_end__week'}       -->
                                     <!-- col20 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10193),  -->
                                     <!--    'column_alias': 'listing__window_end__month'}      -->
                                     <!-- col21 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10194),  -->
                                     <!--    'column_alias': 'listing__window_end__quarter'}    -->
                                     <!-- col22 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10195),  -->
                                     <!--    'column_alias': 'listing__window_end__year'}       -->
                                     <!-- col23 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10353),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10361),  -->
                                     <!--    'column_alias': 'listing__country'}                      -->
                                     <!-- col24 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10354),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10362),  -->
                                     <!--    'column_alias': 'listing__is_lux'}                       -->
                                     <!-- col25 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10355),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10363),  -->
                                     <!--    'column_alias': 'listing__capacity'}                     -->
                                     <!-- col26 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10364),  -->
                                     <!--    'column_alias': 'listing'}                               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10357),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10365),  -->
                                     <!--    'column_alias': 'user'}                                  -->
                                     <!-- col28 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10358),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10366),  -->
                                     <!--    'column_alias': 'listing__user'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 61d600e32e..8e29941b48 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -332,179 +332,179 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10287),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10288),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10290),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10291),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10292),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col8 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10152),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                 <!--    'column_alias': 'ds__week'}                        -->
                                 <!-- col9 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10153),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                 <!--    'column_alias': 'ds__month'}                       -->
                                 <!-- col10 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10154),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                 <!--    'column_alias': 'ds__quarter'}                     -->
                                 <!-- col11 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
                                 <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10297),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                 <!-- col13 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
                                 <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
                                 <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
                                 <!-- col17 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10302),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
                                 <!-- col18 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
                                 <!-- col19 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
                                 <!-- col20 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
                                 <!-- col21 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
                                 <!-- col22 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10307),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
                                 <!-- col23 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10308),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
                                 <!-- col24 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
                                 <!-- col25 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
                                 <!-- col26 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
                                 <!-- col27 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
                                 <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10313),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
                                 <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
                                 <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
                                 <!-- col31 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
                                 <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
                                 <!-- col33 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
                                 <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10176),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
                                 <!-- col35 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10177),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
                                 <!-- col36 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10178),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
                                 <!-- col37 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
                                 <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10323),  -->
                                 <!--    'column_alias': 'listing'}                               -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10324),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
                                 <!-- col40 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10325),  -->
                                 <!--    'column_alias': 'host'}                                  -->
                                 <!-- col41 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10326),  -->
                                 <!--    'column_alias': 'user'}                                  -->
                                 <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10327),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
                                 <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10328),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
                                 <!-- col44 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10329),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- col45 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
@@ -695,119 +695,119 @@
                                 <!-- node_id = ss_10017 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10338),  -->
                                 <!--    'column_alias': 'window_start__day'}                     -->
                                 <!-- col1 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10176),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
                                 <!--    'column_alias': 'window_start__week'}              -->
                                 <!-- col2 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10177),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
                                 <!--    'column_alias': 'window_start__month'}             -->
                                 <!-- col3 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10178),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
                                 <!--    'column_alias': 'window_start__quarter'}           -->
                                 <!-- col4 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
                                 <!--    'column_alias': 'window_start__year'}              -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10335),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
                                 <!--    'column_alias': 'window_end__day'}                       -->
                                 <!-- col6 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
                                 <!--    'column_alias': 'window_end__week'}                -->
                                 <!-- col7 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
                                 <!--    'column_alias': 'window_end__month'}               -->
                                 <!-- col8 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
                                 <!--    'column_alias': 'window_end__quarter'}             -->
                                 <!-- col9 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
                                 <!--    'column_alias': 'window_end__year'}                -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10340),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
                                 <!--    'column_alias': 'country'}                               -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10341),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10349),  -->
                                 <!--    'column_alias': 'is_lux'}                                -->
                                 <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10342),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10350),  -->
                                 <!--    'column_alias': 'capacity'}                              -->
                                 <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10351),  -->
                                 <!--    'column_alias': 'listing__window_start__day'}            -->
                                 <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
                                 <!--    'column_alias': 'listing__window_start__week'}     -->
                                 <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
                                 <!--    'column_alias': 'listing__window_start__month'}    -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
                                 <!--    'column_alias': 'listing__window_start__quarter'}  -->
                                 <!-- col17 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
                                 <!--    'column_alias': 'listing__window_start__year'}     -->
                                 <!-- col18 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
                                 <!--    'column_alias': 'listing__window_end__day'}              -->
                                 <!-- col19 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10192),  -->
                                 <!--    'column_alias': 'listing__window_end__week'}       -->
                                 <!-- col20 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10193),  -->
                                 <!--    'column_alias': 'listing__window_end__month'}      -->
                                 <!-- col21 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10194),  -->
                                 <!--    'column_alias': 'listing__window_end__quarter'}    -->
                                 <!-- col22 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10195),  -->
                                 <!--    'column_alias': 'listing__window_end__year'}       -->
                                 <!-- col23 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10353),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10361),  -->
                                 <!--    'column_alias': 'listing__country'}                      -->
                                 <!-- col24 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10354),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10362),  -->
                                 <!--    'column_alias': 'listing__is_lux'}                       -->
                                 <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10355),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10363),  -->
                                 <!--    'column_alias': 'listing__capacity'}                     -->
                                 <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10364),  -->
                                 <!--    'column_alias': 'listing'}                               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10357),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10365),  -->
                                 <!--    'column_alias': 'user'}                                  -->
                                 <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10358),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10366),  -->
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                 <!-- where = None -->
@@ -893,55 +893,55 @@
                                     <!-- node_id = ss_10021 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10408),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10428),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10224),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10236),  -->
                                     <!--    'column_alias': 'ds__week'}                        -->
                                     <!-- col2 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10225),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10237),  -->
                                     <!--    'column_alias': 'ds__month'}                       -->
                                     <!-- col3 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10226),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10238),  -->
                                     <!--    'column_alias': 'ds__quarter'}                     -->
                                     <!-- col4 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10227),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10239),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10413),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10433),  -->
                                     <!--    'column_alias': 'home_state_latest'}                     -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10414),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10434),  -->
                                     <!--    'column_alias': 'user__ds__day'}                         -->
                                     <!-- col7 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10228),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10240),  -->
                                     <!--    'column_alias': 'user__ds__week'}                  -->
                                     <!-- col8 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10229),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10241),  -->
                                     <!--    'column_alias': 'user__ds__month'}                 -->
                                     <!-- col9 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10230),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10242),  -->
                                     <!--    'column_alias': 'user__ds__quarter'}               -->
                                     <!-- col10 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10231),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10243),  -->
                                     <!--    'column_alias': 'user__ds__year'}                  -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10419),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10439),  -->
                                     <!--    'column_alias': 'user__home_state_latest'}               -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10420),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10440),  -->
                                     <!--    'column_alias': 'user'}                                  -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10021) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index af8393dcd6..cc2e46d425 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -332,179 +332,179 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10287),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10288),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10290),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10291),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10292),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col8 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10152),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                 <!--    'column_alias': 'ds__week'}                        -->
                                 <!-- col9 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10153),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                 <!--    'column_alias': 'ds__month'}                       -->
                                 <!-- col10 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10154),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                 <!--    'column_alias': 'ds__quarter'}                     -->
                                 <!-- col11 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
                                 <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10297),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                 <!-- col13 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
                                 <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
                                 <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
                                 <!-- col17 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10302),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
                                 <!-- col18 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
                                 <!-- col19 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
                                 <!-- col20 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
                                 <!-- col21 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
                                 <!-- col22 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10307),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
                                 <!-- col23 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10308),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
                                 <!-- col24 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
                                 <!-- col25 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
                                 <!-- col26 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
                                 <!-- col27 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
                                 <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10313),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
                                 <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
                                 <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
                                 <!-- col31 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
                                 <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
                                 <!-- col33 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
                                 <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10176),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
                                 <!-- col35 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10177),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
                                 <!-- col36 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10178),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
                                 <!-- col37 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
                                 <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10323),  -->
                                 <!--    'column_alias': 'listing'}                               -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10324),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
                                 <!-- col40 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10325),  -->
                                 <!--    'column_alias': 'host'}                                  -->
                                 <!-- col41 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10326),  -->
                                 <!--    'column_alias': 'user'}                                  -->
                                 <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10327),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
                                 <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10328),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
                                 <!-- col44 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10329),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- col45 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
@@ -614,15 +614,15 @@
                                 <!-- node_id = ss_10018 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10359),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10367),  -->
                                 <!--    'column_alias': 'listing'}                               -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10360),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10368),  -->
                                 <!--    'column_alias': 'lux_listing'}                           -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10361),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10369),  -->
                                 <!--    'column_alias': 'listing__lux_listing'}                  -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10018) -->
                                 <!-- where = None -->
@@ -759,95 +759,95 @@
                                     <!-- node_id = ss_10019 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10362),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10370),  -->
                                     <!--    'column_alias': 'window_start__day'}                     -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10192),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10196),  -->
                                     <!--    'column_alias': 'window_start__week'}              -->
                                     <!-- col2 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10193),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10197),  -->
                                     <!--    'column_alias': 'window_start__month'}             -->
                                     <!-- col3 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10194),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10198),  -->
                                     <!--    'column_alias': 'window_start__quarter'}           -->
                                     <!-- col4 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10195),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10199),  -->
                                     <!--    'column_alias': 'window_start__year'}              -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10367),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10375),  -->
                                     <!--    'column_alias': 'window_end__day'}                       -->
                                     <!-- col6 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10196),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10200),  -->
                                     <!--    'column_alias': 'window_end__week'}                -->
                                     <!-- col7 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10197),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10201),  -->
                                     <!--    'column_alias': 'window_end__month'}               -->
                                     <!-- col8 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10198),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10202),  -->
                                     <!--    'column_alias': 'window_end__quarter'}             -->
                                     <!-- col9 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10199),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10203),  -->
                                     <!--    'column_alias': 'window_end__year'}                -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10372),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10380),  -->
                                     <!--    'column_alias': 'is_confirmed_lux'}                      -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10373),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10381),  -->
                                     <!--    'column_alias': 'lux_listing__window_start__day'}        -->
                                     <!-- col12 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10200),   -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10204),   -->
                                     <!--    'column_alias': 'lux_listing__window_start__week'}  -->
                                     <!-- col13 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10201),    -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10205),    -->
                                     <!--    'column_alias': 'lux_listing__window_start__month'}  -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10202),      -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10206),      -->
                                     <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
                                     <!-- col15 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10203),   -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10207),   -->
                                     <!--    'column_alias': 'lux_listing__window_start__year'}  -->
                                     <!-- col16 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10378),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10386),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__day'}          -->
                                     <!-- col17 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10204),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10208),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__week'}   -->
                                     <!-- col18 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10205),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10209),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__month'}  -->
                                     <!-- col19 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10206),    -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10210),    -->
                                     <!--    'column_alias': 'lux_listing__window_end__quarter'}  -->
                                     <!-- col20 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10207),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10211),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__year'}   -->
                                     <!-- col21 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10383),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10391),  -->
                                     <!--    'column_alias': 'lux_listing__is_confirmed_lux'}         -->
                                     <!-- col22 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10384),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10392),  -->
                                     <!--    'column_alias': 'lux_listing'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10019) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index c6279b9625..bae6a6dc68 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_11 -->
         <!-- col0 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),      -->
         <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),  -->
         <!--    'column_alias': 'txn_count'}                           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- group_by0 =                                                   -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                        -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_172),      -->
                 <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),  -->
                 <!--    'column_alias': 'txn_count'}                           -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- where = None -->
@@ -49,23 +49,23 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),  -->
                     <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),  -->
                     <!--    'column_alias': 'account_id'}                          -->
                     <!-- col3 =                                                        -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),      -->
                     <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),  -->
                     <!--    'column_alias': 'txn_count'}                           -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                     <!-- join_0 =                                                  -->
@@ -82,16 +82,16 @@
                         <!-- node_id = ss_4 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_108),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                         <!--    'column_alias': 'account_id'}                          -->
-                        <!-- col2 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                        <!--    'column_alias': 'txn_count'}                          -->
+                        <!-- col2 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
+                        <!--    'column_alias': 'txn_count'}                           -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                         <!-- where = None -->
                         <SqlSelectStatementNode>
@@ -99,119 +99,119 @@
                             <!-- node_id = ss_3 -->
                             <!-- col0 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                -->
                             <!-- col1 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}               -->
                             <!-- col2 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}              -->
                             <!-- col3 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}            -->
                             <!-- col4 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}               -->
                             <!-- col5 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
                             <!--    'column_alias': 'ds__day'}                            -->
                             <!-- col6 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
                             <!--    'column_alias': 'ds__week'}                           -->
                             <!-- col7 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
                             <!--    'column_alias': 'ds__month'}                          -->
                             <!-- col8 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
                             <!--    'column_alias': 'ds__quarter'}                        -->
                             <!-- col9 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
                             <!--    'column_alias': 'ds__year'}                           -->
                             <!-- col10 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__day'}    -->
                             <!-- col11 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__week'}   -->
                             <!-- col12 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__month'}  -->
                             <!-- col13 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),    -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
                             <!-- col14 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__year'}   -->
                             <!-- col15 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
                             <!--    'column_alias': 'account_id__ds__day'}                -->
                             <!-- col16 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
                             <!--    'column_alias': 'account_id__ds__week'}               -->
                             <!-- col17 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
                             <!--    'column_alias': 'account_id__ds__month'}              -->
                             <!-- col18 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
                             <!--    'column_alias': 'account_id__ds__quarter'}            -->
-                            <!-- col19 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-                            <!--    'column_alias': 'account_id__ds__year'}               -->
-                            <!-- col20 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-                            <!--    'column_alias': 'metric_time__day'}                   -->
-                            <!-- col21 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-                            <!--    'column_alias': 'metric_time__week'}                  -->
-                            <!-- col22 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-                            <!--    'column_alias': 'metric_time__month'}                 -->
-                            <!-- col23 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}               -->
-                            <!-- col24 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                            <!--    'column_alias': 'metric_time__year'}                  -->
-                            <!-- col25 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                            <!--    'column_alias': 'account_id'}                         -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                            <!--    'column_alias': 'account_id__ds__year'}                -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                            <!--    'column_alias': 'account_id'}                          -->
                             <!-- col26 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
                             <!--    'column_alias': 'account_month'}                      -->
                             <!-- col27 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
                             <!--    'column_alias': 'account_id__account_month'}          -->
                             <!-- col28 =                                                  -->
                             <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
                             <!--    'column_alias': 'txn_count'}                          -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10010) -->
                             <!-- where = None -->
@@ -331,15 +331,15 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
                         <!--    'column_alias': 'account_id'}                          -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
                         <!--    'column_alias': 'customer_id__customer_name'}          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                         <!-- where = None -->
@@ -348,91 +348,123 @@
                             <!-- node_id = ss_6 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_123),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_132),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_124),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_125),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_126),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_127),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_128),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_129),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_130),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__month'}   -->
                             <!-- col8 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_131),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),   -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_132),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__year'}    -->
-                            <!-- col10 =                                                   -->
+                            <!-- col10 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),   -->
+                            <!--    'column_alias': 'bridge_account__ds_partitioned__day'}  -->
+                            <!-- col11 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),    -->
+                            <!--    'column_alias': 'bridge_account__ds_partitioned__week'}  -->
+                            <!-- col12 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),     -->
+                            <!--    'column_alias': 'bridge_account__ds_partitioned__month'}  -->
+                            <!-- col13 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),       -->
+                            <!--    'column_alias': 'bridge_account__ds_partitioned__quarter'}  -->
+                            <!-- col14 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),    -->
+                            <!--    'column_alias': 'bridge_account__ds_partitioned__year'}  -->
+                            <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
-                            <!-- col11 =                                                   -->
+                            <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
-                            <!-- col12 =                                                   -->
+                            <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
-                            <!-- col13 =                                                     -->
+                            <!-- col18 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_157),    -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
-                            <!-- col14 =                                                   -->
+                            <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
-                            <!-- col15 =                                                   -->
+                            <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
                             <!--    'column_alias': 'account_id'}                          -->
-                            <!-- col16 =                                                   -->
+                            <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
                             <!--    'column_alias': 'customer_id'}                         -->
-                            <!-- col17 =                                                   -->
+                            <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
                             <!--    'column_alias': 'account_id__customer_id'}             -->
-                            <!-- col18 =                                                   -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
+                            <!--    'column_alias': 'bridge_account__account_id'}          -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                            <!--    'column_alias': 'bridge_account__customer_id'}         -->
+                            <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_121),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_129),  -->
                             <!--    'column_alias': 'extra_dim'}                           -->
-                            <!-- col19 =                                                   -->
+                            <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_122),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_130),  -->
                             <!--    'column_alias': 'account_id__extra_dim'}               -->
-                            <!-- col20 =                                                   -->
+                            <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_131),  -->
+                            <!--    'column_alias': 'bridge_account__extra_dim'}           -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
                             <!--    'column_alias': 'customer_id__customer_name'}          -->
-                            <!-- col21 =                                                    -->
+                            <!-- col29 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),   -->
                             <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10011) -->
                             <!-- join_0 =                                                  -->
@@ -496,15 +528,47 @@
                                 <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10251),  -->
-                                <!--    'column_alias': 'account_id'}                            -->
+                                <!--    'column_alias': 'bridge_account__extra_dim'}             -->
                                 <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10252),  -->
-                                <!--    'column_alias': 'customer_id'}                           -->
+                                <!--    'column_alias': 'bridge_account__ds_partitioned__day'}   -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10253),  -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10144),        -->
+                                <!--    'column_alias': 'bridge_account__ds_partitioned__week'}  -->
+                                <!-- col15 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10145),         -->
+                                <!--    'column_alias': 'bridge_account__ds_partitioned__month'}  -->
+                                <!-- col16 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10146),           -->
+                                <!--    'column_alias': 'bridge_account__ds_partitioned__quarter'}  -->
+                                <!-- col17 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10147),        -->
+                                <!--    'column_alias': 'bridge_account__ds_partitioned__year'}  -->
+                                <!-- col18 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10257),  -->
+                                <!--    'column_alias': 'account_id'}                            -->
+                                <!-- col19 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10258),  -->
+                                <!--    'column_alias': 'customer_id'}                           -->
+                                <!-- col20 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10259),  -->
                                 <!--    'column_alias': 'account_id__customer_id'}               -->
+                                <!-- col21 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10260),  -->
+                                <!--    'column_alias': 'bridge_account__account_id'}            -->
+                                <!-- col22 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10261),  -->
+                                <!--    'column_alias': 'bridge_account__customer_id'}           -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10011) -->
                                 <!-- where = None -->
                                 <SqlTableFromClauseNode>
@@ -534,63 +598,63 @@
                                 <!-- node_id = ss_5 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_114),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_115),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_108),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_116),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_117),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_118),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_119),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_120),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_121),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
                                 <!-- col8 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_114),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_122),    -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_115),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_123),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_116),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_124),  -->
                                 <!--    'column_alias': 'customer_id'}                         -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                                 <!--    'column_alias': 'customer_name'}                       -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
                                 <!--    'column_alias': 'customer_atomic_weight'}              -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
                                 <!--    'column_alias': 'customer_id__customer_name'}          -->
                                 <!-- col14 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),   -->
                                 <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10013) -->
                                 <!-- where = None -->
@@ -599,63 +663,63 @@
                                     <!-- node_id = ss_10013 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10261),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10269),  -->
                                     <!--    'column_alias': 'customer_name'}                         -->
                                     <!-- col1 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10262),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10270),  -->
                                     <!--    'column_alias': 'customer_atomic_weight'}                -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10263),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10271),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                     <!-- col3 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10144),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10148),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
                                     <!-- col4 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10145),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10149),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
                                     <!-- col5 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10146),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10150),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
                                     <!-- col6 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10147),  -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10151),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10268),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10276),  -->
                                     <!--    'column_alias': 'customer_id__customer_name'}            -->
                                     <!-- col8 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10269),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10277),  -->
                                     <!--    'column_alias': 'customer_id__customer_atomic_weight'}   -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10270),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10278),  -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__day'}      -->
                                     <!-- col10 =                                                  -->
                                     <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10148),     -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10152),     -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__week'}  -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10149),      -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10153),      -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10150),        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10154),        -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
                                     <!-- col13 =                                                  -->
                                     <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10151),     -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),     -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__year'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10275),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
                                     <!--    'column_alias': 'customer_id'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10013) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt b/metricflow/test/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
index c8353a502b..26b6031523 100644
--- a/metricflow/test/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
+++ b/metricflow/test/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
@@ -28,12 +28,22 @@ users_ds_source      ('listing', 'user')  created_at         MONTH
 users_ds_source      ('listing', 'user')  created_at         QUARTER             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  created_at         WEEK                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  created_at         YEAR                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 DAY                 ['JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 MONTH               ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 QUARTER             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 WEEK                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 YEAR                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     DAY                 ['JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     MONTH               ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     QUARTER             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     WEEK                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     YEAR                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  home_state                             ['JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          DAY                 ['JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          MONTH               ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          QUARTER             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          WEEK                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          YEAR                ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 users_latest         ('listing', 'user')  home_state_latest                      ['JOINED', 'MULTI_HOP']
 views_source         ()                   listing                                ['ENTITY', 'LOCAL']
 views_source         ()                   metric_time        DAY                 ['METRIC_TIME']
diff --git a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
index 08f466a809..b00abc7965 100644
--- a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
+++ b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
@@ -11,9 +11,9 @@
  'ds__year',
  'txn_revenue',
  'user',
- 'user__ds__day',
- 'user__ds__month',
- 'user__ds__quarter',
- 'user__ds__week',
- 'user__ds__year',
+ 'user__ds_latest__day',
+ 'user__ds_latest__month',
+ 'user__ds_latest__quarter',
+ 'user__ds_latest__week',
+ 'user__ds_latest__year',
  'user__home_state_latest']
diff --git a/metricflow/test/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt b/metricflow/test/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt
index f50761e42d..306ae39392 100644
--- a/metricflow/test/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt
+++ b/metricflow/test/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt
@@ -4,6 +4,7 @@
                           'country_latest',
                           'created_at',
                           'ds',
+                          'ds_latest',
                           'ds_partitioned',
                           'home_state',
                           'home_state_latest',
diff --git a/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set__result0.txt b/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set__result0.txt
index b7d9cf0827..09c1c191ca 100644
--- a/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set__result0.txt
+++ b/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set__result0.txt
@@ -12,12 +12,16 @@ listings_latest      ('listing',)         is_lux_latest
 listings_latest      ('listing',)         user                                   ['ENTITY', 'JOINED']
 lux_listing_mapping  ('listing',)         lux_listing                            ['ENTITY', 'JOINED']
 users_ds_source      ('listing', 'user')  created_at         DAY                 ['JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 DAY                 ['JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     DAY                 ['JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  home_state                             ['JOINED', 'MULTI_HOP']
 users_ds_source      ('user',)            created_at         DAY                 ['JOINED']
+users_ds_source      ('user',)            ds                 DAY                 ['JOINED']
 users_ds_source      ('user',)            ds_partitioned     DAY                 ['JOINED']
 users_ds_source      ('user',)            home_state                             ['JOINED']
+users_latest         ('listing', 'user')  ds_latest          DAY                 ['JOINED', 'MULTI_HOP']
 users_latest         ('listing', 'user')  home_state_latest                      ['JOINED', 'MULTI_HOP']
+users_latest         ('user',)            ds_latest          DAY                 ['JOINED']
 users_latest         ('user',)            home_state_latest                      ['JOINED']
 views_source         ()                   listing                                ['ENTITY', 'LOCAL']
 views_source         ()                   user                                   ['ENTITY', 'LOCAL']
diff --git a/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set_for_common_dimensions_in_different_models__result0.txt b/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set_for_common_dimensions_in_different_models__result0.txt
index b56a470a75..2ff65f8c34 100644
--- a/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set_for_common_dimensions_in_different_models__result0.txt
+++ b/metricflow/test/snapshots/test_semantic_model_container.py/str/test_linkable_set_for_common_dimensions_in_different_models__result0.txt
@@ -12,8 +12,10 @@ listings_latest      ('listing',)         is_lux_latest
 listings_latest      ('listing',)         user                                   ['ENTITY', 'JOINED']
 lux_listing_mapping  ('listing',)         lux_listing                            ['ENTITY', 'JOINED']
 users_ds_source      ('listing', 'user')  created_at         DAY                 ['JOINED', 'MULTI_HOP']
+users_ds_source      ('listing', 'user')  ds                 DAY                 ['JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  ds_partitioned     DAY                 ['JOINED', 'MULTI_HOP']
 users_ds_source      ('listing', 'user')  home_state                             ['JOINED', 'MULTI_HOP']
+users_latest         ('listing', 'user')  ds_latest          DAY                 ['JOINED', 'MULTI_HOP']
 users_latest         ('listing', 'user')  home_state_latest                      ['JOINED', 'MULTI_HOP']
 views_source         ()                   listing                                ['ENTITY', 'LOCAL']
 views_source         ()                   metric_time        DAY                 ['METRIC_TIME']
diff --git a/metricflow/test/snapshots/test_semantic_model_container.py/tuple/test_elements_for_metric__result0.txt b/metricflow/test/snapshots/test_semantic_model_container.py/tuple/test_elements_for_metric__result0.txt
index 5891bc57cb..1a6e510df2 100644
--- a/metricflow/test/snapshots/test_semantic_model_container.py/tuple/test_elements_for_metric__result0.txt
+++ b/metricflow/test/snapshots/test_semantic_model_container.py/tuple/test_elements_for_metric__result0.txt
@@ -9,6 +9,8 @@
  'listing__user__company',
  'listing__user__company_name',
  'listing__user__created_at__day',
+ 'listing__user__ds__day',
+ 'listing__user__ds_latest__day',
  'listing__user__ds_partitioned__day',
  'listing__user__home_state',
  'listing__user__home_state_latest',
@@ -16,6 +18,8 @@
  'user__company',
  'user__company_name',
  'user__created_at__day',
+ 'user__ds__day',
+ 'user__ds_latest__day',
  'user__ds_partitioned__day',
  'user__home_state',
  'user__home_state_latest',