diff --git a/metricflow/test/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml b/metricflow/test/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
index 40e78e3dac..510611daaf 100644
--- a/metricflow/test/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
+++ b/metricflow/test/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                   -->
             <!--   {'class': 'MetricSpec',       -->
             <!--    'element_name': 'listings',  -->
-            <!--    'constraint': None,          -->
+            <!--    'filter_specs': (),          -->
             <!--    'alias': None,               -->
             <!--    'offset_window': None,       -->
             <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
index a22f6531b8..99061839c1 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -117,7 +117,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
index eec481fede..07c1cf0b90 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                           -->
             <!--   {'class': 'MetricSpec',               -->
             <!--    'element_name': 'revenue_all_time',  -->
-            <!--    'constraint': None,                  -->
+            <!--    'filter_specs': (),                  -->
             <!--    'alias': None,                       -->
             <!--    'offset_window': None,               -->
             <!--    'offset_to_grain': None}             -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml
index 482446a4f0..b46aae1d6e 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                           -->
             <!--   {'class': 'MetricSpec',               -->
             <!--    'element_name': 'revenue_all_time',  -->
-            <!--    'constraint': None,                  -->
+            <!--    'filter_specs': (),                  -->
             <!--    'alias': None,                       -->
             <!--    'offset_window': None,               -->
             <!--    'offset_to_grain': None}             -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
index 385ebf8855..8ab0f1bb08 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                    -->
             <!--   {'class': 'MetricSpec',                        -->
             <!--    'element_name': 'trailing_2_months_revenue',  -->
-            <!--    'constraint': None,                           -->
+            <!--    'filter_specs': (),                           -->
             <!--    'alias': None,                                -->
             <!--    'offset_window': None,                        -->
             <!--    'offset_to_grain': None}                      -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
index 6c9913097d..d639638086 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                               -->
             <!--   {'class': 'MetricSpec',                                   -->
             <!--    'element_name': 'bookings_growth_since_start_of_month',  -->
-            <!--    'constraint': None,                                      -->
+            <!--    'filter_specs': (),                                      -->
             <!--    'alias': None,                                           -->
             <!--    'offset_window': None,                                   -->
             <!--    'offset_to_grain': None}                                 -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
@@ -67,7 +67,7 @@
                     <!-- metric_spec =                                 -->
                     <!--   {'class': 'MetricSpec',                     -->
                     <!--    'element_name': 'bookings',                -->
-                    <!--    'constraint': None,                        -->
+                    <!--    'filter_specs': (),                        -->
                     <!--    'alias': 'bookings_at_start_of_month',     -->
                     <!--    'offset_window': None,                     -->
                     <!--    'offset_to_grain': TimeGranularity.MONTH}  -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
index c124ff3b33..1499e61ee9 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                             -->
             <!--   {'class': 'MetricSpec',                 -->
             <!--    'element_name': 'bookings_5_day_lag',  -->
-            <!--    'constraint': None,                    -->
+            <!--    'filter_specs': (),                    -->
             <!--    'alias': None,                         -->
             <!--    'offset_window': None,                 -->
             <!--    'offset_to_grain': None}               -->
@@ -18,7 +18,7 @@
                 <!-- metric_spec =                                              -->
                 <!--   {'class': 'MetricSpec',                                  -->
                 <!--    'element_name': 'bookings',                             -->
-                <!--    'constraint': None,                                     -->
+                <!--    'filter_specs': (),                                     -->
                 <!--    'alias': 'bookings_5_days_ago',                         -->
                 <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                 <!--                      'count': 5,                           -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
index 3e4efaa3bc..bef4e50147 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                             -->
             <!--   {'class': 'MetricSpec',                 -->
             <!--    'element_name': 'bookings_5_day_lag',  -->
-            <!--    'constraint': None,                    -->
+            <!--    'filter_specs': (),                    -->
             <!--    'alias': None,                         -->
             <!--    'offset_window': None,                 -->
             <!--    'offset_to_grain': None}               -->
@@ -18,7 +18,7 @@
                 <!-- metric_spec =                                              -->
                 <!--   {'class': 'MetricSpec',                                  -->
                 <!--    'element_name': 'bookings',                             -->
-                <!--    'constraint': None,                                     -->
+                <!--    'filter_specs': (),                                     -->
                 <!--    'alias': 'bookings_5_days_ago',                         -->
                 <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                 <!--                      'count': 5,                           -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
index 28e1ba6a80..1178ac5cba 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                          -->
             <!--   {'class': 'MetricSpec',                              -->
             <!--    'element_name': 'every_2_days_bookers_2_days_ago',  -->
-            <!--    'constraint': None,                                 -->
+            <!--    'filter_specs': (),                                 -->
             <!--    'alias': None,                                      -->
             <!--    'offset_window': None,                              -->
             <!--    'offset_to_grain': None}                            -->
@@ -18,7 +18,7 @@
                 <!-- metric_spec =                                              -->
                 <!--   {'class': 'MetricSpec',                                  -->
                 <!--    'element_name': 'every_two_days_bookers',               -->
-                <!--    'constraint': None,                                     -->
+                <!--    'filter_specs': (),                                     -->
                 <!--    'alias': 'every_2_days_bookers_2_days_ago',             -->
                 <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                 <!--                      'count': 2,                           -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
index 975ea90960..720015e76a 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
@@ -3,12 +3,12 @@
         <!-- description = Write to Dataframe -->
         <!-- node_id = wrd_0 -->
         <OrderByLimitNode>
-            <!-- description = Order By ['listing__country_latest'] Limit 100 -->
+            <!-- description = Order By ['listing__is_lux_latest'] Limit 100 -->
             <!-- node_id = obl_0 -->
             <!-- order_by_spec =                                                        -->
             <!--   {'class': 'OrderBySpec',                                             -->
             <!--    'instance_spec': {'class': 'DimensionSpec',                         -->
-            <!--                      'element_name': 'country_latest',                 -->
+            <!--                      'element_name': 'is_lux_latest',                  -->
             <!--                      'entity_links': ({'class': 'EntityReference',     -->
             <!--                                        'element_name': 'listing'},)},  -->
             <!--    'descending': True}                                                 -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml
index f4fc83bc2b..7d687dd6d5 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                     -->
             <!--   {'class': 'MetricSpec',                         -->
             <!--    'element_name': 'bookings_fill_nulls_with_0',  -->
-            <!--    'constraint': None,                            -->
+            <!--    'filter_specs': (),                            -->
             <!--    'alias': None,                                 -->
             <!--    'offset_window': None,                         -->
             <!--    'offset_to_grain': None}                       -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
index ba96239d86..47685e1624 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                                    -->
             <!--   {'class': 'MetricSpec',                                        -->
             <!--    'element_name': 'bookings_growth_2_weeks_fill_nulls_with_0',  -->
-            <!--    'constraint': None,                                           -->
+            <!--    'filter_specs': (),                                           -->
             <!--    'alias': None,                                                -->
             <!--    'offset_window': None,                                        -->
             <!--    'offset_to_grain': None}                                      -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                                     -->
                     <!--   {'class': 'MetricSpec',                         -->
                     <!--    'element_name': 'bookings_fill_nulls_with_0',  -->
-                    <!--    'constraint': None,                            -->
+                    <!--    'filter_specs': (),                            -->
                     <!--    'alias': None,                                 -->
                     <!--    'offset_window': None,                         -->
                     <!--    'offset_to_grain': None}                       -->
@@ -82,7 +82,7 @@
                     <!-- metric_spec =                                              -->
                     <!--   {'class': 'MetricSpec',                                  -->
                     <!--    'element_name': 'bookings_fill_nulls_with_0',           -->
-                    <!--    'constraint': None,                                     -->
+                    <!--    'filter_specs': (),                                     -->
                     <!--    'alias': 'bookings_2_weeks_ago',                        -->
                     <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                     <!--                      'count': 14,                          -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml
index 77a4943244..7f851c1783 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                     -->
             <!--   {'class': 'MetricSpec',                         -->
             <!--    'element_name': 'bookings_fill_nulls_with_0',  -->
-            <!--    'constraint': None,                            -->
+            <!--    'filter_specs': (),                            -->
             <!--    'alias': None,                                 -->
             <!--    'offset_window': None,                         -->
             <!--    'offset_to_grain': None}                       -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml
index 55b6fc1e28..162e2061a0 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                     -->
             <!--   {'class': 'MetricSpec',                         -->
             <!--    'element_name': 'bookings_fill_nulls_with_0',  -->
-            <!--    'constraint': None,                            -->
+            <!--    'filter_specs': (),                            -->
             <!--    'alias': None,                                 -->
             <!--    'offset_window': None,                         -->
             <!--    'offset_to_grain': None}                       -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
index 2e6ad5159b..4b98ec3365 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                   -->
             <!--   {'class': 'MetricSpec',       -->
             <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
+            <!--    'filter_specs': (),          -->
             <!--    'alias': None,               -->
             <!--    'offset_window': None,       -->
             <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
index 193da08216..a3ceaf37a9 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
@@ -12,7 +12,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
index 749d39917d..b380475c4f 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                      -->
             <!--   {'class': 'MetricSpec',                          -->
             <!--    'element_name': 'lux_booking_value_rate_expr',  -->
-            <!--    'constraint': None,                             -->
+            <!--    'filter_specs': (),                             -->
             <!--    'alias': None,                                  -->
             <!--    'offset_window': None,                          -->
             <!--    'offset_to_grain': None}                        -->
@@ -18,23 +18,23 @@
                 <ComputeMetricsNode>
                     <!-- description = Compute Metrics via Expressions -->
                     <!-- node_id = cm_0 -->
-                    <!-- metric_spec =                                                                                                    -->
-                    <!--   {'class': 'MetricSpec',                                                                                        -->
-                    <!--    'element_name': 'average_booking_value',                                                                      -->
-                    <!--    'constraint': {'class': 'WhereFilterSpec',                                                                    -->
-                    <!--                   'where_sql': 'listing__is_lux_latest',                                                         -->
-                    <!--                   'bind_parameters': {'class': 'SqlBindParameters',                                              -->
-                    <!--                                       'param_items': ()},                                                        -->
-                    <!--                   'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
-                    <!--                                         'dimension_specs': ({'class': 'DimensionSpec',                           -->
-                    <!--                                                              'element_name': 'is_lux_latest',                    -->
-                    <!--                                                              'entity_links': ({'class': 'EntityReference',       -->
-                    <!--                                                                                'element_name': 'listing'},)},),  -->
-                    <!--                                         'time_dimension_specs': (),                                              -->
-                    <!--                                         'entity_specs': ()}},                                                    -->
-                    <!--    'alias': None,                                                                                                -->
-                    <!--    'offset_window': None,                                                                                        -->
-                    <!--    'offset_to_grain': None}                                                                                      -->
+                    <!-- metric_spec =                                                                                                       -->
+                    <!--   {'class': 'MetricSpec',                                                                                           -->
+                    <!--    'element_name': 'average_booking_value',                                                                         -->
+                    <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                                    -->
+                    <!--                      'where_sql': 'listing__is_lux_latest',                                                         -->
+                    <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                              -->
+                    <!--                                          'param_items': ()},                                                        -->
+                    <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
+                    <!--                                            'dimension_specs': ({'class': 'DimensionSpec',                           -->
+                    <!--                                                                 'element_name': 'is_lux_latest',                    -->
+                    <!--                                                                 'entity_links': ({'class': 'EntityReference',       -->
+                    <!--                                                                                   'element_name': 'listing'},)},),  -->
+                    <!--                                            'time_dimension_specs': (),                                              -->
+                    <!--                                            'entity_specs': ()}},),                                                  -->
+                    <!--    'alias': None,                                                                                                   -->
+                    <!--    'offset_window': None,                                                                                           -->
+                    <!--    'offset_to_grain': None}                                                                                         -->
                     <AggregateMeasuresNode>
                         <!-- description = Aggregate Measures -->
                         <!-- node_id = am_0 -->
@@ -167,23 +167,23 @@
                 <ComputeMetricsNode>
                     <!-- description = Compute Metrics via Expressions -->
                     <!-- node_id = cm_1 -->
-                    <!-- metric_spec =                                                                                                    -->
-                    <!--   {'class': 'MetricSpec',                                                                                        -->
-                    <!--    'element_name': 'bookings',                                                                                   -->
-                    <!--    'constraint': {'class': 'WhereFilterSpec',                                                                    -->
-                    <!--                   'where_sql': 'listing__is_lux_latest',                                                         -->
-                    <!--                   'bind_parameters': {'class': 'SqlBindParameters',                                              -->
-                    <!--                                       'param_items': ()},                                                        -->
-                    <!--                   'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
-                    <!--                                         'dimension_specs': ({'class': 'DimensionSpec',                           -->
-                    <!--                                                              'element_name': 'is_lux_latest',                    -->
-                    <!--                                                              'entity_links': ({'class': 'EntityReference',       -->
-                    <!--                                                                                'element_name': 'listing'},)},),  -->
-                    <!--                                         'time_dimension_specs': (),                                              -->
-                    <!--                                         'entity_specs': ()}},                                                    -->
-                    <!--    'alias': None,                                                                                                -->
-                    <!--    'offset_window': None,                                                                                        -->
-                    <!--    'offset_to_grain': None}                                                                                      -->
+                    <!-- metric_spec =                                                                                                       -->
+                    <!--   {'class': 'MetricSpec',                                                                                           -->
+                    <!--    'element_name': 'bookings',                                                                                      -->
+                    <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                                    -->
+                    <!--                      'where_sql': 'listing__is_lux_latest',                                                         -->
+                    <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                              -->
+                    <!--                                          'param_items': ()},                                                        -->
+                    <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
+                    <!--                                            'dimension_specs': ({'class': 'DimensionSpec',                           -->
+                    <!--                                                                 'element_name': 'is_lux_latest',                    -->
+                    <!--                                                                 'entity_links': ({'class': 'EntityReference',       -->
+                    <!--                                                                                   'element_name': 'listing'},)},),  -->
+                    <!--                                            'time_dimension_specs': (),                                              -->
+                    <!--                                            'entity_specs': ()}},),                                                  -->
+                    <!--    'alias': None,                                                                                                   -->
+                    <!--    'offset_window': None,                                                                                           -->
+                    <!--    'offset_to_grain': None}                                                                                         -->
                     <AggregateMeasuresNode>
                         <!-- description = Aggregate Measures -->
                         <!-- node_id = am_1 -->
@@ -319,7 +319,7 @@
                     <!-- metric_spec =                        -->
                     <!--   {'class': 'MetricSpec',            -->
                     <!--    'element_name': 'booking_value',  -->
-                    <!--    'constraint': None,               -->
+                    <!--    'filter_specs': (),               -->
                     <!--    'alias': None,                    -->
                     <!--    'offset_window': None,            -->
                     <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
index 8d146e3041..f2381a7789 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                      -->
             <!--   {'class': 'MetricSpec',                          -->
             <!--    'element_name': 'instant_booking_value_ratio',  -->
-            <!--    'constraint': None,                             -->
+            <!--    'filter_specs': (),                             -->
             <!--    'alias': None,                                  -->
             <!--    'offset_window': None,                          -->
             <!--    'offset_to_grain': None}                        -->
@@ -18,23 +18,23 @@
                 <ComputeMetricsNode>
                     <!-- description = Compute Metrics via Expressions -->
                     <!-- node_id = cm_0 -->
-                    <!-- metric_spec =                                                                                                    -->
-                    <!--   {'class': 'MetricSpec',                                                                                        -->
-                    <!--    'element_name': 'booking_value',                                                                              -->
-                    <!--    'constraint': {'class': 'WhereFilterSpec',                                                                    -->
-                    <!--                   'where_sql': 'booking__is_instant',                                                            -->
-                    <!--                   'bind_parameters': {'class': 'SqlBindParameters',                                              -->
-                    <!--                                       'param_items': ()},                                                        -->
-                    <!--                   'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
-                    <!--                                         'dimension_specs': ({'class': 'DimensionSpec',                           -->
-                    <!--                                                              'element_name': 'is_instant',                       -->
-                    <!--                                                              'entity_links': ({'class': 'EntityReference',       -->
-                    <!--                                                                                'element_name': 'booking'},)},),  -->
-                    <!--                                         'time_dimension_specs': (),                                              -->
-                    <!--                                         'entity_specs': ()}},                                                    -->
-                    <!--    'alias': 'booking_value_with_is_instant_constraint',                                                          -->
-                    <!--    'offset_window': None,                                                                                        -->
-                    <!--    'offset_to_grain': None}                                                                                      -->
+                    <!-- metric_spec =                                                                                                       -->
+                    <!--   {'class': 'MetricSpec',                                                                                           -->
+                    <!--    'element_name': 'booking_value',                                                                                 -->
+                    <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                                    -->
+                    <!--                      'where_sql': 'booking__is_instant',                                                            -->
+                    <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                              -->
+                    <!--                                          'param_items': ()},                                                        -->
+                    <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
+                    <!--                                            'dimension_specs': ({'class': 'DimensionSpec',                           -->
+                    <!--                                                                 'element_name': 'is_instant',                       -->
+                    <!--                                                                 'entity_links': ({'class': 'EntityReference',       -->
+                    <!--                                                                                   'element_name': 'booking'},)},),  -->
+                    <!--                                            'time_dimension_specs': (),                                              -->
+                    <!--                                            'entity_specs': ()}},),                                                  -->
+                    <!--    'alias': 'booking_value_with_is_instant_constraint',                                                             -->
+                    <!--    'offset_window': None,                                                                                           -->
+                    <!--    'offset_to_grain': None}                                                                                         -->
                     <AggregateMeasuresNode>
                         <!-- description = Aggregate Measures -->
                         <!-- node_id = am_0 -->
@@ -115,7 +115,7 @@
                     <!-- metric_spec =                        -->
                     <!--   {'class': 'MetricSpec',            -->
                     <!--    'element_name': 'booking_value',  -->
-                    <!--    'constraint': None,               -->
+                    <!--    'filter_specs': (),               -->
                     <!--    'alias': None,                    -->
                     <!--    'offset_window': None,            -->
                     <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
index ddf15aebc4..a8cd2a96ed 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                            -->
             <!--   {'class': 'MetricSpec',                -->
             <!--    'element_name': 'bookings_per_view',  -->
-            <!--    'constraint': None,                   -->
+            <!--    'filter_specs': (),                   -->
             <!--    'alias': None,                        -->
             <!--    'offset_window': None,                -->
             <!--    'offset_to_grain': None}              -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
@@ -127,7 +127,7 @@
                     <!-- metric_spec =                -->
                     <!--   {'class': 'MetricSpec',    -->
                     <!--    'element_name': 'views',  -->
-                    <!--    'constraint': None,       -->
+                    <!--    'filter_specs': (),       -->
                     <!--    'alias': None,            -->
                     <!--    'offset_window': None,    -->
                     <!--    'offset_to_grain': None}  -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index c7808c613a..895e1bcd1b 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                    -->
             <!--   {'class': 'MetricSpec',        -->
             <!--    'element_name': 'txn_count',  -->
-            <!--    'constraint': None,           -->
+            <!--    'filter_specs': (),           -->
             <!--    'alias': None,                -->
             <!--    'offset_window': None,        -->
             <!--    'offset_to_grain': None}      -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
index 1ff685a04e..5768b4b593 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -61,7 +61,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
index 2c781b1527..b901742279 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                -->
             <!--   {'class': 'MetricSpec',                    -->
             <!--    'element_name': 'bookings_offset_twice',  -->
-            <!--    'constraint': None,                       -->
+            <!--    'filter_specs': (),                       -->
             <!--    'alias': None,                            -->
             <!--    'offset_window': None,                    -->
             <!--    'offset_to_grain': None}                  -->
@@ -32,7 +32,7 @@
                     <!-- metric_spec =                                              -->
                     <!--   {'class': 'MetricSpec',                                  -->
                     <!--    'element_name': 'bookings_offset_once',                 -->
-                    <!--    'constraint': None,                                     -->
+                    <!--    'filter_specs': (),                                     -->
                     <!--    'alias': None,                                          -->
                     <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                     <!--                      'count': 2,                           -->
@@ -44,7 +44,7 @@
                         <!-- metric_spec =                                              -->
                         <!--   {'class': 'MetricSpec',                                  -->
                         <!--    'element_name': 'bookings',                             -->
-                        <!--    'constraint': None,                                     -->
+                        <!--    'filter_specs': (),                                     -->
                         <!--    'alias': None,                                          -->
                         <!--    'offset_window': {'class': 'PydanticMetricTimeWindow',  -->
                         <!--                      'count': 5,                           -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
index ae588dbc5e..5c14fade18 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
@@ -18,7 +18,7 @@
             <!--   {'class': 'OrderBySpec',                        -->
             <!--    'instance_spec': {'class': 'MetricSpec',       -->
             <!--                      'element_name': 'bookings',  -->
-            <!--                      'constraint': None,          -->
+            <!--                      'filter_specs': (),          -->
             <!--                      'alias': None,               -->
             <!--                      'offset_window': None,       -->
             <!--                      'offset_to_grain': None},    -->
@@ -30,7 +30,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_primary_entity_dimension__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_primary_entity_dimension__dfp_0.xml
index a8d8373588..02a48b5e93 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_primary_entity_dimension__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_primary_entity_dimension__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                   -->
             <!--   {'class': 'MetricSpec',       -->
             <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
+            <!--    'filter_specs': (),          -->
             <!--    'alias': None,               -->
             <!--    'offset_window': None,       -->
             <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_simple_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_simple_plan__dfp_0.xml
index a8d8373588..02a48b5e93 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_simple_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_simple_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                   -->
             <!--   {'class': 'MetricSpec',       -->
             <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
+            <!--    'filter_specs': (),          -->
             <!--    'alias': None,               -->
             <!--    'offset_window': None,       -->
             <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
index ee7a40eceb..8d4232cd99 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                              -->
             <!--   {'class': 'MetricSpec',                  -->
             <!--    'element_name': 'bookings_per_booker',  -->
-            <!--    'constraint': None,                     -->
+            <!--    'filter_specs': (),                     -->
             <!--    'alias': None,                          -->
             <!--    'offset_window': None,                  -->
             <!--    'offset_to_grain': None}                -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
@@ -127,7 +127,7 @@
                     <!-- metric_spec =                  -->
                     <!--   {'class': 'MetricSpec',      -->
                     <!--    'element_name': 'bookers',  -->
-                    <!--    'constraint': None,         -->
+                    <!--    'filter_specs': (),         -->
                     <!--    'alias': None,              -->
                     <!--    'offset_window': None,      -->
                     <!--    'offset_to_grain': None}    -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
index 14d24551f2..eadd0c296c 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
@@ -5,13 +5,23 @@
         <ComputeMetricsNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = cm_0 -->
-            <!-- metric_spec =                   -->
-            <!--   {'class': 'MetricSpec',       -->
-            <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
-            <!--    'alias': None,               -->
-            <!--    'offset_window': None,       -->
-            <!--    'offset_to_grain': None}     -->
+            <!-- metric_spec =                                                                                                       -->
+            <!--   {'class': 'MetricSpec',                                                                                           -->
+            <!--    'element_name': 'bookings',                                                                                      -->
+            <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                                    -->
+            <!--                      'where_sql': "listing__country_latest = 'us'",                                                 -->
+            <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                              -->
+            <!--                                          'param_items': ()},                                                        -->
+            <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
+            <!--                                            'dimension_specs': ({'class': 'DimensionSpec',                           -->
+            <!--                                                                 'element_name': 'country_latest',                   -->
+            <!--                                                                 'entity_links': ({'class': 'EntityReference',       -->
+            <!--                                                                                   'element_name': 'listing'},)},),  -->
+            <!--                                            'time_dimension_specs': (),                                              -->
+            <!--                                            'entity_specs': ()}},),                                                  -->
+            <!--    'alias': None,                                                                                                   -->
+            <!--    'offset_window': None,                                                                                           -->
+            <!--    'offset_to_grain': None}                                                                                         -->
             <AggregateMeasuresNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = am_0 -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
index c9a38b5cb2..f249c3469d 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
@@ -5,13 +5,25 @@
         <ComputeMetricsNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = cm_0 -->
-            <!-- metric_spec =                   -->
-            <!--   {'class': 'MetricSpec',       -->
-            <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
-            <!--    'alias': None,               -->
-            <!--    'offset_window': None,       -->
-            <!--    'offset_to_grain': None}     -->
+            <!-- metric_spec =                                                                                                  -->
+            <!--   {'class': 'MetricSpec',                                                                                      -->
+            <!--    'element_name': 'bookings',                                                                                 -->
+            <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                               -->
+            <!--                      'where_sql': "metric_time__day >= '2020-01-01'",                                          -->
+            <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                         -->
+            <!--                                          'param_items': ()},                                                   -->
+            <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                         -->
+            <!--                                            'dimension_specs': (),                                              -->
+            <!--                                            'time_dimension_specs': ({'class': 'TimeDimensionSpec',             -->
+            <!--                                                                      'element_name': 'metric_time',            -->
+            <!--                                                                      'entity_links': (),                       -->
+            <!--                                                                      'time_granularity': TimeGranularity.DAY,  -->
+            <!--                                                                      'date_part': None,                        -->
+            <!--                                                                      'aggregation_state': None},),             -->
+            <!--                                            'entity_specs': ()}},),                                             -->
+            <!--    'alias': None,                                                                                              -->
+            <!--    'offset_window': None,                                                                                      -->
+            <!--    'offset_to_grain': None}                                                                                    -->
             <AggregateMeasuresNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = am_0 -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
index 1fc2c1f0e1..edec9fcdc8 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
@@ -5,13 +5,23 @@
         <ComputeMetricsNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = cm_0 -->
-            <!-- metric_spec =                   -->
-            <!--   {'class': 'MetricSpec',       -->
-            <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
-            <!--    'alias': None,               -->
-            <!--    'offset_window': None,       -->
-            <!--    'offset_to_grain': None}     -->
+            <!-- metric_spec =                                                                                                       -->
+            <!--   {'class': 'MetricSpec',                                                                                           -->
+            <!--    'element_name': 'bookings',                                                                                      -->
+            <!--    'filter_specs': ({'class': 'WhereFilterSpec',                                                                    -->
+            <!--                      'where_sql': "listing__country_latest = 'us'",                                                 -->
+            <!--                      'bind_parameters': {'class': 'SqlBindParameters',                                              -->
+            <!--                                          'param_items': ()},                                                        -->
+            <!--                      'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
+            <!--                                            'dimension_specs': ({'class': 'DimensionSpec',                           -->
+            <!--                                                                 'element_name': 'country_latest',                   -->
+            <!--                                                                 'entity_links': ({'class': 'EntityReference',       -->
+            <!--                                                                                   'element_name': 'listing'},)},),  -->
+            <!--                                            'time_dimension_specs': (),                                              -->
+            <!--                                            'entity_specs': ()}},),                                                  -->
+            <!--    'alias': None,                                                                                                   -->
+            <!--    'offset_window': None,                                                                                           -->
+            <!--    'offset_to_grain': None}                                                                                         -->
             <AggregateMeasuresNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = am_0 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
index c56df6a05c..1281c43f7b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                       -->
             <!--   {'class': 'MetricSpec',           -->
             <!--    'element_name': 'booking_fees',  -->
-            <!--    'constraint': None,              -->
+            <!--    'filter_specs': (),              -->
             <!--    'alias': None,                   -->
             <!--    'offset_window': None,           -->
             <!--    'offset_to_grain': None}         -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index 856fc27383..83e5894ff6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -22,7 +22,7 @@
                 <!-- metric_spec =                       -->
                 <!--   {'class': 'MetricSpec',           -->
                 <!--    'element_name': 'booking_fees',  -->
-                <!--    'constraint': None,              -->
+                <!--    'filter_specs': (),              -->
                 <!--    'alias': None,                   -->
                 <!--    'offset_window': None,           -->
                 <!--    'offset_to_grain': None}         -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index 9bb30f61b6..efca61f97b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -22,7 +22,7 @@
                 <!-- metric_spec =                       -->
                 <!--   {'class': 'MetricSpec',           -->
                 <!--    'element_name': 'booking_fees',  -->
-                <!--    'constraint': None,              -->
+                <!--    'filter_specs': (),              -->
                 <!--    'alias': None,                   -->
                 <!--    'offset_window': None,           -->
                 <!--    'offset_to_grain': None}         -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index a6a962c4eb..065f147e4a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -22,7 +22,7 @@
                 <!-- metric_spec =                       -->
                 <!--   {'class': 'MetricSpec',           -->
                 <!--    'element_name': 'booking_fees',  -->
-                <!--    'constraint': None,              -->
+                <!--    'filter_specs': (),              -->
                 <!--    'alias': None,                   -->
                 <!--    'offset_window': None,           -->
                 <!--    'offset_to_grain': None}         -->
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 07a6c6ce3e..024a941adf 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    is_instant
+    booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index 82df597d7d..ac9c044432 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
index d9dff12ede..4c20c2be98 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
index e3fb65cbf6..b9cfda8758 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    subq_9.is_instant
+    subq_9.booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 3dce9387f2..277bbde2d1 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
index db1199fc2e..bfb8b8826d 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index e95c1119b3..99c4cea0ad 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    subq_9.is_instant
+    subq_9.booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index d6f3055b49..240944062e 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
index db1199fc2e..bfb8b8826d 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
index e95c1119b3..99c4cea0ad 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    subq_9.is_instant
+    subq_9.booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index d6f3055b49..240944062e 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
index db1199fc2e..bfb8b8826d 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
index f5f844ea4f..7c96102439 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    subq_9.is_instant
+    subq_9.booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index 7c3d369cac..1fea7c0a8f 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
index db1199fc2e..bfb8b8826d 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 9c76dabead..f5cf8052e8 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -1,44 +1,44 @@
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.is_instant
+  subq_10.booking__is_instant
   , subq_10.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_9.is_instant
+    subq_9.booking__is_instant
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant']
+    --   ['bookings', 'booking__is_instant']
     SELECT
-      subq_8.is_instant
+      subq_8.booking__is_instant
       , subq_8.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_7.is_instant
+        subq_7.booking__is_instant
         , subq_7.listing__country_latest
         , subq_7.bookings
       FROM (
         -- Pass Only Elements:
-        --   ['bookings', 'is_instant', 'listing__country_latest']
+        --   ['bookings', 'booking__is_instant', 'listing__country_latest']
         SELECT
-          subq_6.is_instant
+          subq_6.booking__is_instant
           , subq_6.listing__country_latest
           , subq_6.bookings
         FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.listing AS listing
-            , subq_2.is_instant AS is_instant
+            , subq_2.booking__is_instant AS booking__is_instant
             , subq_5.country_latest AS listing__country_latest
             , subq_2.bookings AS bookings
           FROM (
             -- Pass Only Elements:
-            --   ['bookings', 'is_instant', 'listing']
+            --   ['bookings', 'booking__is_instant', 'listing']
             SELECT
               subq_1.listing
-              , subq_1.is_instant
+              , subq_1.booking__is_instant
               , subq_1.bookings
             FROM (
               -- Metric Time Dimension 'ds'
@@ -383,5 +383,5 @@ FROM (
     ) subq_8
   ) subq_9
   GROUP BY
-    subq_9.is_instant
+    subq_9.booking__is_instant
 ) subq_10
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index 29bb79a181..19b1b78329 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -1,27 +1,27 @@
 -- Constrain Output with WHERE
 -- Pass Only Elements:
---   ['bookings', 'is_instant']
+--   ['bookings', 'booking__is_instant']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  is_instant
+  booking__is_instant
   , SUM(bookings) AS bookings
 FROM (
   -- Join Standard Outputs
   -- Pass Only Elements:
-  --   ['bookings', 'is_instant', 'listing__country_latest']
+  --   ['bookings', 'booking__is_instant', 'listing__country_latest']
   SELECT
-    subq_13.is_instant AS is_instant
+    subq_13.booking__is_instant AS booking__is_instant
     , listings_latest_src_10004.country AS listing__country_latest
     , subq_13.bookings AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     -- Metric Time Dimension 'ds'
     -- Pass Only Elements:
-    --   ['bookings', 'is_instant', 'listing']
+    --   ['bookings', 'booking__is_instant', 'listing']
     SELECT
       listing_id AS listing
-      , is_instant
+      , is_instant AS booking__is_instant
       , 1 AS bookings
     FROM ***************************.fct_bookings bookings_source_src_10001
   ) subq_13
@@ -32,4 +32,4 @@ FROM (
 ) subq_18
 WHERE listing__country_latest = 'us'
 GROUP BY
-  is_instant
+  booking__is_instant
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index 06b2beab7f..cc50493468 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -309,7 +309,7 @@ FROM (
             )
         ) subq_5
       ) subq_6
-      WHERE listing__capacity > 2
+      WHERE (listing__capacity > 2) AND (listing__capacity > 2)
     ) subq_7
   ) subq_8
   GROUP BY
diff --git a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
index db1199fc2e..bfb8b8826d 100644
--- a/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
@@ -42,6 +42,6 @@ FROM (
       )
     )
 ) subq_16
-WHERE listing__capacity > 2
+WHERE (listing__capacity > 2) AND (listing__capacity > 2)
 GROUP BY
   metric_time__day
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
index a22f6531b8..99061839c1 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -117,7 +117,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
index 7f887a661a..6b71982849 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
@@ -8,14 +8,14 @@
             <!-- metric_spec =                   -->
             <!--   {'class': 'MetricSpec',       -->
             <!--    'element_name': 'bookings',  -->
-            <!--    'constraint': None,          -->
+            <!--    'filter_specs': (),          -->
             <!--    'alias': None,               -->
             <!--    'offset_window': None,       -->
             <!--    'offset_to_grain': None}     -->
             <!-- metric_spec =                        -->
             <!--   {'class': 'MetricSpec',            -->
             <!--    'element_name': 'booking_value',  -->
-            <!--    'constraint': None,               -->
+            <!--    'filter_specs': (),               -->
             <!--    'alias': None,                    -->
             <!--    'offset_window': None,            -->
             <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
index 85e26dc807..ac854dcf01 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -57,7 +57,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'listings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
index 84c9e7f792..7f0f6ccd39 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -57,7 +57,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'listings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
index fc92635b40..bae10c6770 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                              -->
                 <!--   {'class': 'MetricSpec',                  -->
                 <!--    'element_name': 'bookings_per_booker',  -->
-                <!--    'constraint': None,                     -->
+                <!--    'filter_specs': (),                     -->
                 <!--    'alias': None,                          -->
                 <!--    'offset_window': None,                  -->
                 <!--    'offset_to_grain': None}                -->
@@ -24,7 +24,7 @@
                         <!-- metric_spec =                   -->
                         <!--   {'class': 'MetricSpec',       -->
                         <!--    'element_name': 'bookings',  -->
-                        <!--    'constraint': None,          -->
+                        <!--    'filter_specs': (),          -->
                         <!--    'alias': None,               -->
                         <!--    'offset_window': None,       -->
                         <!--    'offset_to_grain': None}     -->
@@ -70,7 +70,7 @@
                         <!-- metric_spec =                  -->
                         <!--   {'class': 'MetricSpec',      -->
                         <!--    'element_name': 'bookers',  -->
-                        <!--    'constraint': None,         -->
+                        <!--    'filter_specs': (),         -->
                         <!--    'alias': None,              -->
                         <!--    'offset_window': None,      -->
                         <!--    'offset_to_grain': None}    -->
@@ -118,7 +118,7 @@
                 <!-- metric_spec =                              -->
                 <!--   {'class': 'MetricSpec',                  -->
                 <!--    'element_name': 'bookings_per_dollar',  -->
-                <!--    'constraint': None,                     -->
+                <!--    'filter_specs': (),                     -->
                 <!--    'alias': None,                          -->
                 <!--    'offset_window': None,                  -->
                 <!--    'offset_to_grain': None}                -->
@@ -131,7 +131,7 @@
                         <!-- metric_spec =                   -->
                         <!--   {'class': 'MetricSpec',       -->
                         <!--    'element_name': 'bookings',  -->
-                        <!--    'constraint': None,          -->
+                        <!--    'filter_specs': (),          -->
                         <!--    'alias': None,               -->
                         <!--    'offset_window': None,       -->
                         <!--    'offset_to_grain': None}     -->
@@ -177,7 +177,7 @@
                         <!-- metric_spec =                        -->
                         <!--   {'class': 'MetricSpec',            -->
                         <!--    'element_name': 'booking_value',  -->
-                        <!--    'constraint': None,               -->
+                        <!--    'filter_specs': (),               -->
                         <!--    'alias': None,                    -->
                         <!--    'offset_window': None,            -->
                         <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
index a25a07eaac..1ba8f19949 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
@@ -8,14 +8,14 @@
             <!-- metric_spec =                              -->
             <!--   {'class': 'MetricSpec',                  -->
             <!--    'element_name': 'bookings_per_booker',  -->
-            <!--    'constraint': None,                     -->
+            <!--    'filter_specs': (),                     -->
             <!--    'alias': None,                          -->
             <!--    'offset_window': None,                  -->
             <!--    'offset_to_grain': None}                -->
             <!-- metric_spec =                              -->
             <!--   {'class': 'MetricSpec',                  -->
             <!--    'element_name': 'bookings_per_dollar',  -->
-            <!--    'constraint': None,                     -->
+            <!--    'filter_specs': (),                     -->
             <!--    'alias': None,                          -->
             <!--    'offset_window': None,                  -->
             <!--    'offset_to_grain': None}                -->
@@ -25,28 +25,28 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
                 <!-- metric_spec =                  -->
                 <!--   {'class': 'MetricSpec',      -->
                 <!--    'element_name': 'bookers',  -->
-                <!--    'constraint': None,         -->
+                <!--    'filter_specs': (),         -->
                 <!--    'alias': None,              -->
                 <!--    'offset_window': None,      -->
                 <!--    'offset_to_grain': None}    -->
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
index b4deae8ae0..1cdf1a7158 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
@@ -57,7 +57,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -103,7 +103,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'listings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
index cebfc1c9bb..b3043e800e 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
@@ -11,14 +11,14 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -69,7 +69,7 @@
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'listings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
index c418de8aab..ebe9cffd88 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -54,23 +54,13 @@
             <ComputeMetricsNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = cm_1 -->
-                <!-- metric_spec =                                                                                                    -->
-                <!--   {'class': 'MetricSpec',                                                                                        -->
-                <!--    'element_name': 'instant_booking_value',                                                                      -->
-                <!--    'constraint': {'class': 'WhereFilterSpec',                                                                    -->
-                <!--                   'where_sql': 'booking__is_instant ',                                                           -->
-                <!--                   'bind_parameters': {'class': 'SqlBindParameters',                                              -->
-                <!--                                       'param_items': ()},                                                        -->
-                <!--                   'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
-                <!--                                         'dimension_specs': ({'class': 'DimensionSpec',                           -->
-                <!--                                                              'element_name': 'is_instant',                       -->
-                <!--                                                              'entity_links': ({'class': 'EntityReference',       -->
-                <!--                                                                                'element_name': 'booking'},)},),  -->
-                <!--                                         'time_dimension_specs': (),                                              -->
-                <!--                                         'entity_specs': ()}},                                                    -->
-                <!--    'alias': None,                                                                                                -->
-                <!--    'offset_window': None,                                                                                        -->
-                <!--    'offset_to_grain': None}                                                                                      -->
+                <!-- metric_spec =                                -->
+                <!--   {'class': 'MetricSpec',                    -->
+                <!--    'element_name': 'instant_booking_value',  -->
+                <!--    'filter_specs': (),                       -->
+                <!--    'alias': None,                            -->
+                <!--    'offset_window': None,                    -->
+                <!--    'offset_to_grain': None}                  -->
                 <AggregateMeasuresNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = am_1 -->
@@ -97,7 +87,7 @@
                             <!-- node_id = wcc_0 -->
                             <!-- where_condition =                                                                                 -->
                             <!--   {'class': 'WhereFilterSpec',                                                                    -->
-                            <!--    'where_sql': 'booking__is_instant ',                                                           -->
+                            <!--    'where_sql': 'booking__is_instant',                                                            -->
                             <!--    'bind_parameters': {'class': 'SqlBindParameters', 'param_items': ()},                          -->
                             <!--    'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
                             <!--                          'dimension_specs': ({'class': 'DimensionSpec',                           -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
index ff7f2e31d2..323c52b344 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -54,23 +54,13 @@
             <ComputeMetricsNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = cm_3 -->
-                <!-- metric_spec =                                                                                                    -->
-                <!--   {'class': 'MetricSpec',                                                                                        -->
-                <!--    'element_name': 'instant_booking_value',                                                                      -->
-                <!--    'constraint': {'class': 'WhereFilterSpec',                                                                    -->
-                <!--                   'where_sql': 'booking__is_instant ',                                                           -->
-                <!--                   'bind_parameters': {'class': 'SqlBindParameters',                                              -->
-                <!--                                       'param_items': ()},                                                        -->
-                <!--                   'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
-                <!--                                         'dimension_specs': ({'class': 'DimensionSpec',                           -->
-                <!--                                                              'element_name': 'is_instant',                       -->
-                <!--                                                              'entity_links': ({'class': 'EntityReference',       -->
-                <!--                                                                                'element_name': 'booking'},)},),  -->
-                <!--                                         'time_dimension_specs': (),                                              -->
-                <!--                                         'entity_specs': ()}},                                                    -->
-                <!--    'alias': None,                                                                                                -->
-                <!--    'offset_window': None,                                                                                        -->
-                <!--    'offset_to_grain': None}                                                                                      -->
+                <!-- metric_spec =                                -->
+                <!--   {'class': 'MetricSpec',                    -->
+                <!--    'element_name': 'instant_booking_value',  -->
+                <!--    'filter_specs': (),                       -->
+                <!--    'alias': None,                            -->
+                <!--    'offset_window': None,                    -->
+                <!--    'offset_to_grain': None}                  -->
                 <AggregateMeasuresNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = am_3 -->
@@ -97,7 +87,7 @@
                             <!-- node_id = wcc_1 -->
                             <!-- where_condition =                                                                                 -->
                             <!--   {'class': 'WhereFilterSpec',                                                                    -->
-                            <!--    'where_sql': 'booking__is_instant ',                                                           -->
+                            <!--    'where_sql': 'booking__is_instant',                                                            -->
                             <!--    'bind_parameters': {'class': 'SqlBindParameters', 'param_items': ()},                          -->
                             <!--    'linkable_spec_set': {'class': 'LinkableSpecSet',                                              -->
                             <!--                          'dimension_specs': ({'class': 'DimensionSpec',                           -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
index 03b6f242b8..a21a712cc5 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                    -->
             <!--   {'class': 'MetricSpec',                        -->
             <!--    'element_name': 'non_referred_bookings_pct',  -->
-            <!--    'constraint': None,                           -->
+            <!--    'filter_specs': (),                           -->
             <!--    'alias': None,                                -->
             <!--    'offset_window': None,                        -->
             <!--    'offset_to_grain': None}                      -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                            -->
                     <!--   {'class': 'MetricSpec',                -->
                     <!--    'element_name': 'referred_bookings',  -->
-                    <!--    'constraint': None,                   -->
+                    <!--    'filter_specs': (),                   -->
                     <!--    'alias': 'ref_bookings',              -->
                     <!--    'offset_window': None,                -->
                     <!--    'offset_to_grain': None}              -->
@@ -67,7 +67,7 @@
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
index 03772b6ebe..c11a33a049 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                    -->
             <!--   {'class': 'MetricSpec',                        -->
             <!--    'element_name': 'non_referred_bookings_pct',  -->
-            <!--    'constraint': None,                           -->
+            <!--    'filter_specs': (),                           -->
             <!--    'alias': None,                                -->
             <!--    'offset_window': None,                        -->
             <!--    'offset_to_grain': None}                      -->
@@ -18,14 +18,14 @@
                 <!-- metric_spec =                            -->
                 <!--   {'class': 'MetricSpec',                -->
                 <!--    'element_name': 'referred_bookings',  -->
-                <!--    'constraint': None,                   -->
+                <!--    'filter_specs': (),                   -->
                 <!--    'alias': 'ref_bookings',              -->
                 <!--    'offset_window': None,                -->
                 <!--    'offset_to_grain': None}              -->
                 <!-- metric_spec =                   -->
                 <!--   {'class': 'MetricSpec',       -->
                 <!--    'element_name': 'bookings',  -->
-                <!--    'constraint': None,          -->
+                <!--    'filter_specs': (),          -->
                 <!--    'alias': None,               -->
                 <!--    'offset_window': None,       -->
                 <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
index ca91324ad9..74496bd131 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -57,7 +57,7 @@
                 <!-- metric_spec =                                    -->
                 <!--   {'class': 'MetricSpec',                        -->
                 <!--    'element_name': 'non_referred_bookings_pct',  -->
-                <!--    'constraint': None,                           -->
+                <!--    'filter_specs': (),                           -->
                 <!--    'alias': None,                                -->
                 <!--    'offset_window': None,                        -->
                 <!--    'offset_to_grain': None}                      -->
@@ -70,7 +70,7 @@
                         <!-- metric_spec =                            -->
                         <!--   {'class': 'MetricSpec',                -->
                         <!--    'element_name': 'referred_bookings',  -->
-                        <!--    'constraint': None,                   -->
+                        <!--    'filter_specs': (),                   -->
                         <!--    'alias': 'ref_bookings',              -->
                         <!--    'offset_window': None,                -->
                         <!--    'offset_to_grain': None}              -->
@@ -116,7 +116,7 @@
                         <!-- metric_spec =                   -->
                         <!--   {'class': 'MetricSpec',       -->
                         <!--    'element_name': 'bookings',  -->
-                        <!--    'constraint': None,          -->
+                        <!--    'filter_specs': (),          -->
                         <!--    'alias': None,               -->
                         <!--    'offset_window': None,       -->
                         <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
index 9168186317..ba70d62062 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
@@ -11,7 +11,7 @@
                 <!-- metric_spec =                        -->
                 <!--   {'class': 'MetricSpec',            -->
                 <!--    'element_name': 'booking_value',  -->
-                <!--    'constraint': None,               -->
+                <!--    'filter_specs': (),               -->
                 <!--    'alias': None,                    -->
                 <!--    'offset_window': None,            -->
                 <!--    'offset_to_grain': None}          -->
@@ -57,7 +57,7 @@
                 <!-- metric_spec =                                    -->
                 <!--   {'class': 'MetricSpec',                        -->
                 <!--    'element_name': 'non_referred_bookings_pct',  -->
-                <!--    'constraint': None,                           -->
+                <!--    'filter_specs': (),                           -->
                 <!--    'alias': None,                                -->
                 <!--    'offset_window': None,                        -->
                 <!--    'offset_to_grain': None}                      -->
@@ -67,14 +67,14 @@
                     <!-- metric_spec =                            -->
                     <!--   {'class': 'MetricSpec',                -->
                     <!--    'element_name': 'referred_bookings',  -->
-                    <!--    'constraint': None,                   -->
+                    <!--    'filter_specs': (),                   -->
                     <!--    'alias': 'ref_bookings',              -->
                     <!--    'offset_window': None,                -->
                     <!--    'offset_to_grain': None}              -->
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
index 79228ef5a8..391d0b7ccd 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                                 -->
             <!--   {'class': 'MetricSpec',                                     -->
             <!--    'element_name': 'instant_plus_non_referred_bookings_pct',  -->
-            <!--    'constraint': None,                                        -->
+            <!--    'filter_specs': (),                                        -->
             <!--    'alias': None,                                             -->
             <!--    'offset_window': None,                                     -->
             <!--    'offset_to_grain': None}                                   -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                                    -->
                     <!--   {'class': 'MetricSpec',                        -->
                     <!--    'element_name': 'non_referred_bookings_pct',  -->
-                    <!--    'constraint': None,                           -->
+                    <!--    'filter_specs': (),                           -->
                     <!--    'alias': 'non_referred',                      -->
                     <!--    'offset_window': None,                        -->
                     <!--    'offset_to_grain': None}                      -->
@@ -34,7 +34,7 @@
                             <!-- metric_spec =                            -->
                             <!--   {'class': 'MetricSpec',                -->
                             <!--    'element_name': 'referred_bookings',  -->
-                            <!--    'constraint': None,                   -->
+                            <!--    'filter_specs': (),                   -->
                             <!--    'alias': 'ref_bookings',              -->
                             <!--    'offset_window': None,                -->
                             <!--    'offset_to_grain': None}              -->
@@ -80,7 +80,7 @@
                             <!-- metric_spec =                   -->
                             <!--   {'class': 'MetricSpec',       -->
                             <!--    'element_name': 'bookings',  -->
-                            <!--    'constraint': None,          -->
+                            <!--    'filter_specs': (),          -->
                             <!--    'alias': None,               -->
                             <!--    'offset_window': None,       -->
                             <!--    'offset_to_grain': None}     -->
@@ -128,7 +128,7 @@
                     <!-- metric_spec =                           -->
                     <!--   {'class': 'MetricSpec',               -->
                     <!--    'element_name': 'instant_bookings',  -->
-                    <!--    'constraint': None,                  -->
+                    <!--    'filter_specs': (),                  -->
                     <!--    'alias': 'instant',                  -->
                     <!--    'offset_window': None,               -->
                     <!--    'offset_to_grain': None}             -->
@@ -174,7 +174,7 @@
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
index 3566eb57fb..98f1557f51 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
@@ -8,7 +8,7 @@
             <!-- metric_spec =                                                 -->
             <!--   {'class': 'MetricSpec',                                     -->
             <!--    'element_name': 'instant_plus_non_referred_bookings_pct',  -->
-            <!--    'constraint': None,                                        -->
+            <!--    'filter_specs': (),                                        -->
             <!--    'alias': None,                                             -->
             <!--    'offset_window': None,                                     -->
             <!--    'offset_to_grain': None}                                   -->
@@ -21,7 +21,7 @@
                     <!-- metric_spec =                                    -->
                     <!--   {'class': 'MetricSpec',                        -->
                     <!--    'element_name': 'non_referred_bookings_pct',  -->
-                    <!--    'constraint': None,                           -->
+                    <!--    'filter_specs': (),                           -->
                     <!--    'alias': 'non_referred',                      -->
                     <!--    'offset_window': None,                        -->
                     <!--    'offset_to_grain': None}                      -->
@@ -31,14 +31,14 @@
                         <!-- metric_spec =                            -->
                         <!--   {'class': 'MetricSpec',                -->
                         <!--    'element_name': 'referred_bookings',  -->
-                        <!--    'constraint': None,                   -->
+                        <!--    'filter_specs': (),                   -->
                         <!--    'alias': 'ref_bookings',              -->
                         <!--    'offset_window': None,                -->
                         <!--    'offset_to_grain': None}              -->
                         <!-- metric_spec =                   -->
                         <!--   {'class': 'MetricSpec',       -->
                         <!--    'element_name': 'bookings',  -->
-                        <!--    'constraint': None,          -->
+                        <!--    'filter_specs': (),          -->
                         <!--    'alias': None,               -->
                         <!--    'offset_window': None,       -->
                         <!--    'offset_to_grain': None}     -->
@@ -90,14 +90,14 @@
                     <!-- metric_spec =                           -->
                     <!--   {'class': 'MetricSpec',               -->
                     <!--    'element_name': 'instant_bookings',  -->
-                    <!--    'constraint': None,                  -->
+                    <!--    'filter_specs': (),                  -->
                     <!--    'alias': 'instant',                  -->
                     <!--    'offset_window': None,               -->
                     <!--    'offset_to_grain': None}             -->
                     <!-- metric_spec =                   -->
                     <!--   {'class': 'MetricSpec',       -->
                     <!--    'element_name': 'bookings',  -->
-                    <!--    'constraint': None,          -->
+                    <!--    'filter_specs': (),          -->
                     <!--    'alias': None,               -->
                     <!--    'offset_window': None,       -->
                     <!--    'offset_to_grain': None}     -->