diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
index bf661d834b..eb2573ef1e 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan__dfp_0.xml
@@ -26,23 +26,17 @@
                 <WhereConstraintNode>
                     <!-- description = 'Constrain Output with WHERE' -->
                     <!-- node_id = NodeId(id_str='wcc_0') -->
-                    <!-- where_condition =                               -->
-                    <!--   WhereFilterSpec(                              -->
-                    <!--     where_sql="listing__country_latest = 'us'", -->
-                    <!--     bind_parameters=SqlBindParameters(),        -->
-                    <!--     linkable_spec_set=LinkableSpecSet(          -->
-                    <!--       dimension_specs=(                         -->
-                    <!--         DimensionSpec(                          -->
-                    <!--           element_name='country_latest',        -->
-                    <!--           entity_links=(                        -->
-                    <!--             EntityReference(                    -->
-                    <!--               element_name='listing',           -->
-                    <!--             ),                                  -->
-                    <!--           ),                                    -->
-                    <!--         ),                                      -->
-                    <!--       ),                                        -->
-                    <!--     ),                                          -->
-                    <!--   )                                             -->
+                    <!-- where_condition =                                                -->
+                    <!--   WhereFilterSpec(                                               -->
+                    <!--     where_sql="listing__country_latest = 'us'",                  -->
+                    <!--     bind_parameters=SqlBindParameters(),                         -->
+                    <!--     linkable_specs=(                                             -->
+                    <!--       DimensionSpec(                                             -->
+                    <!--         element_name='country_latest',                           -->
+                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
+                    <!--   )                                                              -->
                     <ReadSqlSourceNode>
                         <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
                         <!-- node_id = NodeId(id_str='rss_28018') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
index da62fd9e41..d74f407e48 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_distinct_values_plan_with_join__dfp_0.xml
@@ -31,23 +31,17 @@
                 <WhereConstraintNode>
                     <!-- description = 'Constrain Output with WHERE' -->
                     <!-- node_id = NodeId(id_str='wcc_0') -->
-                    <!-- where_condition =                               -->
-                    <!--   WhereFilterSpec(                              -->
-                    <!--     where_sql="listing__country_latest = 'us'", -->
-                    <!--     bind_parameters=SqlBindParameters(),        -->
-                    <!--     linkable_spec_set=LinkableSpecSet(          -->
-                    <!--       dimension_specs=(                         -->
-                    <!--         DimensionSpec(                          -->
-                    <!--           element_name='country_latest',        -->
-                    <!--           entity_links=(                        -->
-                    <!--             EntityReference(                    -->
-                    <!--               element_name='listing',           -->
-                    <!--             ),                                  -->
-                    <!--           ),                                    -->
-                    <!--         ),                                      -->
-                    <!--       ),                                        -->
-                    <!--     ),                                          -->
-                    <!--   )                                             -->
+                    <!-- where_condition =                                                -->
+                    <!--   WhereFilterSpec(                                               -->
+                    <!--     where_sql="listing__country_latest = 'us'",                  -->
+                    <!--     bind_parameters=SqlBindParameters(),                         -->
+                    <!--     linkable_specs=(                                             -->
+                    <!--       DimensionSpec(                                             -->
+                    <!--         element_name='country_latest',                           -->
+                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
+                    <!--   )                                                              -->
                     <JoinToBaseOutputNode>
                         <!-- description = 'Join Standard Outputs' -->
                         <!-- node_id = NodeId(id_str='jso_0') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml
index 55f773dbc8..68a39bcd80 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml
@@ -5,24 +5,19 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_0') -->
-            <!-- metric_spec =                                        -->
-            <!--   MetricSpec(                                        -->
-            <!--     element_name='bookings_fill_nulls_with_0',       -->
-            <!--     filter_specs=(                                   -->
-            <!--       WhereFilterSpec(                               -->
-            <!--         where_sql="metric_time__day = '2020-01-01'", -->
-            <!--         bind_parameters=SqlBindParameters(),         -->
-            <!--         linkable_spec_set=LinkableSpecSet(           -->
-            <!--           time_dimension_specs=(                     -->
-            <!--             TimeDimensionSpec(                       -->
-            <!--               element_name='metric_time',            -->
-            <!--               time_granularity=DAY,                  -->
-            <!--             ),                                       -->
-            <!--           ),                                         -->
-            <!--         ),                                           -->
-            <!--       ),                                             -->
-            <!--     ),                                               -->
-            <!--   )                                                  -->
+            <!-- metric_spec =                                                                  -->
+            <!--   MetricSpec(                                                                  -->
+            <!--     element_name='bookings_fill_nulls_with_0',                                 -->
+            <!--     filter_specs=(                                                             -->
+            <!--       WhereFilterSpec(                                                         -->
+            <!--         where_sql="metric_time__day = '2020-01-01'",                           -->
+            <!--         bind_parameters=SqlBindParameters(),                                   -->
+            <!--         linkable_specs=(                                                       -->
+            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
+            <!--         ),                                                                     -->
+            <!--       ),                                                                       -->
+            <!--     ),                                                                         -->
+            <!--   )                                                                            -->
             <ConstrainTimeRangeNode>
                 <!-- description = 'Constrain Time Range to [2020-01-03T00:00:00, 2020-01-05T00:00:00]' -->
                 <!-- node_id = NodeId(id_str='ctr_1') -->
@@ -31,19 +26,12 @@
                 <WhereConstraintNode>
                     <!-- description = 'Constrain Output with WHERE' -->
                     <!-- node_id = NodeId(id_str='wcc_1') -->
-                    <!-- where_condition =                                -->
-                    <!--   WhereFilterSpec(                               -->
-                    <!--     where_sql="metric_time__day = '2020-01-01'", -->
-                    <!--     bind_parameters=SqlBindParameters(),         -->
-                    <!--     linkable_spec_set=LinkableSpecSet(           -->
-                    <!--       time_dimension_specs=(                     -->
-                    <!--         TimeDimensionSpec(                       -->
-                    <!--           element_name='metric_time',            -->
-                    <!--           time_granularity=DAY,                  -->
-                    <!--         ),                                       -->
-                    <!--       ),                                         -->
-                    <!--     ),                                           -->
-                    <!--   )                                              -->
+                    <!-- where_condition =                                                                          -->
+                    <!--   WhereFilterSpec(                                                                         -->
+                    <!--     where_sql="metric_time__day = '2020-01-01'",                                           -->
+                    <!--     bind_parameters=SqlBindParameters(),                                                   -->
+                    <!--     linkable_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
+                    <!--   )                                                                                        -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_0') -->
@@ -68,12 +56,10 @@
                                 <!--   WhereFilterSpec(                               -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'", -->
                                 <!--     bind_parameters=SqlBindParameters(),         -->
-                                <!--     linkable_spec_set=LinkableSpecSet(           -->
-                                <!--       time_dimension_specs=(                     -->
-                                <!--         TimeDimensionSpec(                       -->
-                                <!--           element_name='metric_time',            -->
-                                <!--           time_granularity=DAY,                  -->
-                                <!--         ),                                       -->
+                                <!--     linkable_specs=(                             -->
+                                <!--       TimeDimensionSpec(                         -->
+                                <!--         element_name='metric_time',              -->
+                                <!--         time_granularity=DAY,                    -->
                                 <!--       ),                                         -->
                                 <!--     ),                                           -->
                                 <!--   )                                              -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
index ebd82f88a6..e4e3677e4f 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
@@ -12,28 +12,22 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_0') -->
-                    <!-- metric_spec =                                -->
-                    <!--   MetricSpec(                                -->
-                    <!--     element_name='average_booking_value',    -->
-                    <!--     filter_specs=(                           -->
-                    <!--       WhereFilterSpec(                       -->
-                    <!--         where_sql='listing__is_lux_latest',  -->
-                    <!--         bind_parameters=SqlBindParameters(), -->
-                    <!--         linkable_spec_set=LinkableSpecSet(   -->
-                    <!--           dimension_specs=(                  -->
-                    <!--             DimensionSpec(                   -->
-                    <!--               element_name='is_lux_latest',  -->
-                    <!--               entity_links=(                 -->
-                    <!--                 EntityReference(             -->
-                    <!--                   element_name='listing',    -->
-                    <!--                 ),                           -->
-                    <!--               ),                             -->
-                    <!--             ),                               -->
-                    <!--           ),                                 -->
-                    <!--         ),                                   -->
-                    <!--       ),                                     -->
-                    <!--     ),                                       -->
-                    <!--   )                                          -->
+                    <!-- metric_spec =                                                        -->
+                    <!--   MetricSpec(                                                        -->
+                    <!--     element_name='average_booking_value',                            -->
+                    <!--     filter_specs=(                                                   -->
+                    <!--       WhereFilterSpec(                                               -->
+                    <!--         where_sql='listing__is_lux_latest',                          -->
+                    <!--         bind_parameters=SqlBindParameters(),                         -->
+                    <!--         linkable_specs=(                                             -->
+                    <!--           DimensionSpec(                                             -->
+                    <!--             element_name='is_lux_latest',                            -->
+                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
+                    <!--           ),                                                         -->
+                    <!--         ),                                                           -->
+                    <!--       ),                                                             -->
+                    <!--     ),                                                               -->
+                    <!--   )                                                                  -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_0') -->
@@ -46,23 +40,17 @@
                             <WhereConstraintNode>
                                 <!-- description = 'Constrain Output with WHERE' -->
                                 <!-- node_id = NodeId(id_str='wcc_0') -->
-                                <!-- where_condition =                        -->
-                                <!--   WhereFilterSpec(                       -->
-                                <!--     where_sql='listing__is_lux_latest',  -->
-                                <!--     bind_parameters=SqlBindParameters(), -->
-                                <!--     linkable_spec_set=LinkableSpecSet(   -->
-                                <!--       dimension_specs=(                  -->
-                                <!--         DimensionSpec(                   -->
-                                <!--           element_name='is_lux_latest',  -->
-                                <!--           entity_links=(                 -->
-                                <!--             EntityReference(             -->
-                                <!--               element_name='listing',    -->
-                                <!--             ),                           -->
-                                <!--           ),                             -->
-                                <!--         ),                               -->
-                                <!--       ),                                 -->
-                                <!--     ),                                   -->
-                                <!--   )                                      -->
+                                <!-- where_condition =                                                -->
+                                <!--   WhereFilterSpec(                                               -->
+                                <!--     where_sql='listing__is_lux_latest',                          -->
+                                <!--     bind_parameters=SqlBindParameters(),                         -->
+                                <!--     linkable_specs=(                                             -->
+                                <!--       DimensionSpec(                                             -->
+                                <!--         element_name='is_lux_latest',                            -->
+                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
+                                <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                                 -->
                                     <!--   ("Pass Only Elements: ['average_booking_value', 'listing__is_lux_latest', " -->
@@ -135,28 +123,22 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                -->
-                    <!--   MetricSpec(                                -->
-                    <!--     element_name='bookings',                 -->
-                    <!--     filter_specs=(                           -->
-                    <!--       WhereFilterSpec(                       -->
-                    <!--         where_sql='listing__is_lux_latest',  -->
-                    <!--         bind_parameters=SqlBindParameters(), -->
-                    <!--         linkable_spec_set=LinkableSpecSet(   -->
-                    <!--           dimension_specs=(                  -->
-                    <!--             DimensionSpec(                   -->
-                    <!--               element_name='is_lux_latest',  -->
-                    <!--               entity_links=(                 -->
-                    <!--                 EntityReference(             -->
-                    <!--                   element_name='listing',    -->
-                    <!--                 ),                           -->
-                    <!--               ),                             -->
-                    <!--             ),                               -->
-                    <!--           ),                                 -->
-                    <!--         ),                                   -->
-                    <!--       ),                                     -->
-                    <!--     ),                                       -->
-                    <!--   )                                          -->
+                    <!-- metric_spec =                                                        -->
+                    <!--   MetricSpec(                                                        -->
+                    <!--     element_name='bookings',                                         -->
+                    <!--     filter_specs=(                                                   -->
+                    <!--       WhereFilterSpec(                                               -->
+                    <!--         where_sql='listing__is_lux_latest',                          -->
+                    <!--         bind_parameters=SqlBindParameters(),                         -->
+                    <!--         linkable_specs=(                                             -->
+                    <!--           DimensionSpec(                                             -->
+                    <!--             element_name='is_lux_latest',                            -->
+                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
+                    <!--           ),                                                         -->
+                    <!--         ),                                                           -->
+                    <!--       ),                                                             -->
+                    <!--     ),                                                               -->
+                    <!--   )                                                                  -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_1') -->
@@ -169,23 +151,17 @@
                             <WhereConstraintNode>
                                 <!-- description = 'Constrain Output with WHERE' -->
                                 <!-- node_id = NodeId(id_str='wcc_1') -->
-                                <!-- where_condition =                        -->
-                                <!--   WhereFilterSpec(                       -->
-                                <!--     where_sql='listing__is_lux_latest',  -->
-                                <!--     bind_parameters=SqlBindParameters(), -->
-                                <!--     linkable_spec_set=LinkableSpecSet(   -->
-                                <!--       dimension_specs=(                  -->
-                                <!--         DimensionSpec(                   -->
-                                <!--           element_name='is_lux_latest',  -->
-                                <!--           entity_links=(                 -->
-                                <!--             EntityReference(             -->
-                                <!--               element_name='listing',    -->
-                                <!--             ),                           -->
-                                <!--           ),                             -->
-                                <!--         ),                               -->
-                                <!--       ),                                 -->
-                                <!--     ),                                   -->
-                                <!--   )                                      -->
+                                <!-- where_condition =                                                -->
+                                <!--   WhereFilterSpec(                                               -->
+                                <!--     where_sql='listing__is_lux_latest',                          -->
+                                <!--     bind_parameters=SqlBindParameters(),                         -->
+                                <!--     linkable_specs=(                                             -->
+                                <!--       DimensionSpec(                                             -->
+                                <!--         element_name='is_lux_latest',                            -->
+                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
+                                <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                    -->
                                     <!--   ("Pass Only Elements: ['bookings', 'listing__is_lux_latest', " -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
index 01e049e74c..7b35eae487 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
@@ -12,29 +12,23 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_0') -->
-                    <!-- metric_spec =                                         -->
-                    <!--   MetricSpec(                                         -->
-                    <!--     element_name='booking_value',                     -->
-                    <!--     filter_specs=(                                    -->
-                    <!--       WhereFilterSpec(                                -->
-                    <!--         where_sql='booking__is_instant',              -->
-                    <!--         bind_parameters=SqlBindParameters(),          -->
-                    <!--         linkable_spec_set=LinkableSpecSet(            -->
-                    <!--           dimension_specs=(                           -->
-                    <!--             DimensionSpec(                            -->
-                    <!--               element_name='is_instant',              -->
-                    <!--               entity_links=(                          -->
-                    <!--                 EntityReference(                      -->
-                    <!--                   element_name='booking',             -->
-                    <!--                 ),                                    -->
-                    <!--               ),                                      -->
-                    <!--             ),                                        -->
-                    <!--           ),                                          -->
-                    <!--         ),                                            -->
-                    <!--       ),                                              -->
-                    <!--     ),                                                -->
-                    <!--     alias='booking_value_with_is_instant_constraint', -->
-                    <!--   )                                                   -->
+                    <!-- metric_spec =                                                        -->
+                    <!--   MetricSpec(                                                        -->
+                    <!--     element_name='booking_value',                                    -->
+                    <!--     filter_specs=(                                                   -->
+                    <!--       WhereFilterSpec(                                               -->
+                    <!--         where_sql='booking__is_instant',                             -->
+                    <!--         bind_parameters=SqlBindParameters(),                         -->
+                    <!--         linkable_specs=(                                             -->
+                    <!--           DimensionSpec(                                             -->
+                    <!--             element_name='is_instant',                               -->
+                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
+                    <!--           ),                                                         -->
+                    <!--         ),                                                           -->
+                    <!--       ),                                                             -->
+                    <!--     ),                                                               -->
+                    <!--     alias='booking_value_with_is_instant_constraint',                -->
+                    <!--   )                                                                  -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_0') -->
@@ -47,23 +41,17 @@
                             <WhereConstraintNode>
                                 <!-- description = 'Constrain Output with WHERE' -->
                                 <!-- node_id = NodeId(id_str='wcc_0') -->
-                                <!-- where_condition =                        -->
-                                <!--   WhereFilterSpec(                       -->
-                                <!--     where_sql='booking__is_instant',     -->
-                                <!--     bind_parameters=SqlBindParameters(), -->
-                                <!--     linkable_spec_set=LinkableSpecSet(   -->
-                                <!--       dimension_specs=(                  -->
-                                <!--         DimensionSpec(                   -->
-                                <!--           element_name='is_instant',     -->
-                                <!--           entity_links=(                 -->
-                                <!--             EntityReference(             -->
-                                <!--               element_name='booking',    -->
-                                <!--             ),                           -->
-                                <!--           ),                             -->
-                                <!--         ),                               -->
-                                <!--       ),                                 -->
-                                <!--     ),                                   -->
-                                <!--   )                                      -->
+                                <!-- where_condition =                                                -->
+                                <!--   WhereFilterSpec(                                               -->
+                                <!--     where_sql='booking__is_instant',                             -->
+                                <!--     bind_parameters=SqlBindParameters(),                         -->
+                                <!--     linkable_specs=(                                             -->
+                                <!--       DimensionSpec(                                             -->
+                                <!--         element_name='is_instant',                               -->
+                                <!--         entity_links=(EntityReference(element_name='booking'),), -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
+                                <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                      -->
                                     <!--   ("Pass Only Elements: ['booking_value', 'booking__is_instant', " -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
index 1f539c3a57..75a683ec01 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
@@ -17,8 +17,17 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                                                         -->
-                        <!--   WhereFilterSpec(where_sql='listing__bookings > 2', bind_parameters=SqlBindParameters()) -->
+                        <!-- where_condition =                                                -->
+                        <!--   WhereFilterSpec(                                               -->
+                        <!--     where_sql='listing__bookings > 2',                           -->
+                        <!--     bind_parameters=SqlBindParameters(),                         -->
+                        <!--     linkable_specs=(                                             -->
+                        <!--       GroupByMetricSpec(                                         -->
+                        <!--         element_name='bookings',                                 -->
+                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
+                        <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description = "Pass Only Elements: ['listings', 'listing__bookings']" -->
                             <!-- node_id = NodeId(id_str='pfe_3') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
index f0a5328a55..41bf9e5c26 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
@@ -5,16 +5,22 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_1') -->
-            <!-- metric_spec =                                -->
-            <!--   MetricSpec(                                -->
-            <!--     element_name='listings',                 -->
-            <!--     filter_specs=(                           -->
-            <!--       WhereFilterSpec(                       -->
-            <!--         where_sql='listing__bookings > 2',   -->
-            <!--         bind_parameters=SqlBindParameters(), -->
-            <!--       ),                                     -->
-            <!--     ),                                       -->
-            <!--   )                                          -->
+            <!-- metric_spec =                                                        -->
+            <!--   MetricSpec(                                                        -->
+            <!--     element_name='listings',                                         -->
+            <!--     filter_specs=(                                                   -->
+            <!--       WhereFilterSpec(                                               -->
+            <!--         where_sql='listing__bookings > 2',                           -->
+            <!--         bind_parameters=SqlBindParameters(),                         -->
+            <!--         linkable_specs=(                                             -->
+            <!--           GroupByMetricSpec(                                         -->
+            <!--             element_name='bookings',                                 -->
+            <!--             entity_links=(EntityReference(element_name='listing'),), -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
+            <!--       ),                                                             -->
+            <!--     ),                                                               -->
+            <!--   )                                                                  -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_1') -->
@@ -26,8 +32,17 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                                                         -->
-                        <!--   WhereFilterSpec(where_sql='listing__bookings > 2', bind_parameters=SqlBindParameters()) -->
+                        <!-- where_condition =                                                -->
+                        <!--   WhereFilterSpec(                                               -->
+                        <!--     where_sql='listing__bookings > 2',                           -->
+                        <!--     bind_parameters=SqlBindParameters(),                         -->
+                        <!--     linkable_specs=(                                             -->
+                        <!--       GroupByMetricSpec(                                         -->
+                        <!--         element_name='bookings',                                 -->
+                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
+                        <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description = "Pass Only Elements: ['listings', 'listing__bookings']" -->
                             <!-- node_id = NodeId(id_str='pfe_3') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml
index 489ec19a70..1a30add9bb 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml
@@ -5,24 +5,19 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_1') -->
-            <!-- metric_spec =                                        -->
-            <!--   MetricSpec(                                        -->
-            <!--     element_name='bookings_at_start_of_month',       -->
-            <!--     filter_specs=(                                   -->
-            <!--       WhereFilterSpec(                               -->
-            <!--         where_sql="metric_time__day = '2020-01-01'", -->
-            <!--         bind_parameters=SqlBindParameters(),         -->
-            <!--         linkable_spec_set=LinkableSpecSet(           -->
-            <!--           time_dimension_specs=(                     -->
-            <!--             TimeDimensionSpec(                       -->
-            <!--               element_name='metric_time',            -->
-            <!--               time_granularity=DAY,                  -->
-            <!--             ),                                       -->
-            <!--           ),                                         -->
-            <!--         ),                                           -->
-            <!--       ),                                             -->
-            <!--     ),                                               -->
-            <!--   )                                                  -->
+            <!-- metric_spec =                                                                  -->
+            <!--   MetricSpec(                                                                  -->
+            <!--     element_name='bookings_at_start_of_month',                                 -->
+            <!--     filter_specs=(                                                             -->
+            <!--       WhereFilterSpec(                                                         -->
+            <!--         where_sql="metric_time__day = '2020-01-01'",                           -->
+            <!--         bind_parameters=SqlBindParameters(),                                   -->
+            <!--         linkable_specs=(                                                       -->
+            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
+            <!--         ),                                                                     -->
+            <!--       ),                                                                       -->
+            <!--     ),                                                                         -->
+            <!--   )                                                                            -->
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
                 <!-- node_id = NodeId(id_str='cm_0') -->
@@ -33,12 +28,10 @@
                 <!--       WhereFilterSpec(                               -->
                 <!--         where_sql="metric_time__day = '2020-01-01'", -->
                 <!--         bind_parameters=SqlBindParameters(),         -->
-                <!--         linkable_spec_set=LinkableSpecSet(           -->
-                <!--           time_dimension_specs=(                     -->
-                <!--             TimeDimensionSpec(                       -->
-                <!--               element_name='metric_time',            -->
-                <!--               time_granularity=DAY,                  -->
-                <!--             ),                                       -->
+                <!--         linkable_specs=(                             -->
+                <!--           TimeDimensionSpec(                         -->
+                <!--             element_name='metric_time',              -->
+                <!--             time_granularity=DAY,                    -->
                 <!--           ),                                         -->
                 <!--         ),                                           -->
                 <!--       ),                                             -->
@@ -58,19 +51,12 @@
                         <WhereConstraintNode>
                             <!-- description = 'Constrain Output with WHERE' -->
                             <!-- node_id = NodeId(id_str='wcc_0') -->
-                            <!-- where_condition =                                -->
-                            <!--   WhereFilterSpec(                               -->
-                            <!--     where_sql="metric_time__day = '2020-01-01'", -->
-                            <!--     bind_parameters=SqlBindParameters(),         -->
-                            <!--     linkable_spec_set=LinkableSpecSet(           -->
-                            <!--       time_dimension_specs=(                     -->
-                            <!--         TimeDimensionSpec(                       -->
-                            <!--           element_name='metric_time',            -->
-                            <!--           time_granularity=DAY,                  -->
-                            <!--         ),                                       -->
-                            <!--       ),                                         -->
-                            <!--     ),                                           -->
-                            <!--   )                                              -->
+                            <!-- where_condition =                                                                          -->
+                            <!--   WhereFilterSpec(                                                                         -->
+                            <!--     where_sql="metric_time__day = '2020-01-01'",                                           -->
+                            <!--     bind_parameters=SqlBindParameters(),                                                   -->
+                            <!--     linkable_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
+                            <!--   )                                                                                        -->
                             <FilterElementsNode>
                                 <!-- description =                                                                  -->
                                 <!--   "Pass Only Elements: ['bookings', 'metric_time__month', 'metric_time__day']" -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
index 4e94e82589..944c59cc46 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
@@ -5,24 +5,19 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_2') -->
-            <!-- metric_spec =                                                   -->
-            <!--   MetricSpec(                                                   -->
-            <!--     element_name='booking_fees_last_week_per_booker_this_week', -->
-            <!--     filter_specs=(                                              -->
-            <!--       WhereFilterSpec(                                          -->
-            <!--         where_sql="metric_time__day = '2020-01-01'",            -->
-            <!--         bind_parameters=SqlBindParameters(),                    -->
-            <!--         linkable_spec_set=LinkableSpecSet(                      -->
-            <!--           time_dimension_specs=(                                -->
-            <!--             TimeDimensionSpec(                                  -->
-            <!--               element_name='metric_time',                       -->
-            <!--               time_granularity=DAY,                             -->
-            <!--             ),                                                  -->
-            <!--           ),                                                    -->
-            <!--         ),                                                      -->
-            <!--       ),                                                        -->
-            <!--     ),                                                          -->
-            <!--   )                                                             -->
+            <!-- metric_spec =                                                                  -->
+            <!--   MetricSpec(                                                                  -->
+            <!--     element_name='booking_fees_last_week_per_booker_this_week',                -->
+            <!--     filter_specs=(                                                             -->
+            <!--       WhereFilterSpec(                                                         -->
+            <!--         where_sql="metric_time__day = '2020-01-01'",                           -->
+            <!--         bind_parameters=SqlBindParameters(),                                   -->
+            <!--         linkable_specs=(                                                       -->
+            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
+            <!--         ),                                                                     -->
+            <!--       ),                                                                       -->
+            <!--     ),                                                                         -->
+            <!--   )                                                                            -->
             <CombineAggregatedOutputsNode>
                 <!-- description = 'Combine Aggregated Outputs' -->
                 <!-- node_id = NodeId(id_str='cao_0') -->
@@ -36,12 +31,10 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql="metric_time__day = '2020-01-01'",                   -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
-                    <!--           time_dimension_specs=(                                       -->
-                    <!--             TimeDimensionSpec(                                         -->
-                    <!--               element_name='metric_time',                              -->
-                    <!--               time_granularity=DAY,                                    -->
-                    <!--             ),                                                         -->
+                    <!--         linkable_specs=(                                               -->
+                    <!--           TimeDimensionSpec(                                           -->
+                    <!--             element_name='metric_time',                                -->
+                    <!--             time_granularity=DAY,                                      -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
                     <!--       ),                                                               -->
@@ -64,12 +57,10 @@
                                 <!--   WhereFilterSpec(                               -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'", -->
                                 <!--     bind_parameters=SqlBindParameters(),         -->
-                                <!--     linkable_spec_set=LinkableSpecSet(           -->
-                                <!--       time_dimension_specs=(                     -->
-                                <!--         TimeDimensionSpec(                       -->
-                                <!--           element_name='metric_time',            -->
-                                <!--           time_granularity=DAY,                  -->
-                                <!--         ),                                       -->
+                                <!--     linkable_specs=(                             -->
+                                <!--       TimeDimensionSpec(                         -->
+                                <!--         element_name='metric_time',              -->
+                                <!--         time_granularity=DAY,                    -->
                                 <!--       ),                                         -->
                                 <!--     ),                                           -->
                                 <!--   )                                              -->
@@ -120,12 +111,10 @@
                     <!--       WhereFilterSpec(                               -->
                     <!--         where_sql="metric_time__day = '2020-01-01'", -->
                     <!--         bind_parameters=SqlBindParameters(),         -->
-                    <!--         linkable_spec_set=LinkableSpecSet(           -->
-                    <!--           time_dimension_specs=(                     -->
-                    <!--             TimeDimensionSpec(                       -->
-                    <!--               element_name='metric_time',            -->
-                    <!--               time_granularity=DAY,                  -->
-                    <!--             ),                                       -->
+                    <!--         linkable_specs=(                             -->
+                    <!--           TimeDimensionSpec(                         -->
+                    <!--             element_name='metric_time',              -->
+                    <!--             time_granularity=DAY,                    -->
                     <!--           ),                                         -->
                     <!--         ),                                           -->
                     <!--       ),                                             -->
@@ -147,12 +136,10 @@
                                 <!--   WhereFilterSpec(                               -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'", -->
                                 <!--     bind_parameters=SqlBindParameters(),         -->
-                                <!--     linkable_spec_set=LinkableSpecSet(           -->
-                                <!--       time_dimension_specs=(                     -->
-                                <!--         TimeDimensionSpec(                       -->
-                                <!--           element_name='metric_time',            -->
-                                <!--           time_granularity=DAY,                  -->
-                                <!--         ),                                       -->
+                                <!--     linkable_specs=(                             -->
+                                <!--       TimeDimensionSpec(                         -->
+                                <!--         element_name='metric_time',              -->
+                                <!--         time_granularity=DAY,                    -->
                                 <!--       ),                                         -->
                                 <!--     ),                                           -->
                                 <!--   )                                              -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
index b134b228aa..0955aebc17 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan__dfp_0.xml
@@ -5,28 +5,22 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_0') -->
-            <!-- metric_spec =                                       -->
-            <!--   MetricSpec(                                       -->
-            <!--     element_name='bookings',                        -->
-            <!--     filter_specs=(                                  -->
-            <!--       WhereFilterSpec(                              -->
-            <!--         where_sql="listing__country_latest = 'us'", -->
-            <!--         bind_parameters=SqlBindParameters(),        -->
-            <!--         linkable_spec_set=LinkableSpecSet(          -->
-            <!--           dimension_specs=(                         -->
-            <!--             DimensionSpec(                          -->
-            <!--               element_name='country_latest',        -->
-            <!--               entity_links=(                        -->
-            <!--                 EntityReference(                    -->
-            <!--                   element_name='listing',           -->
-            <!--                 ),                                  -->
-            <!--               ),                                    -->
-            <!--             ),                                      -->
-            <!--           ),                                        -->
-            <!--         ),                                          -->
-            <!--       ),                                            -->
-            <!--     ),                                              -->
-            <!--   )                                                 -->
+            <!-- metric_spec =                                                        -->
+            <!--   MetricSpec(                                                        -->
+            <!--     element_name='bookings',                                         -->
+            <!--     filter_specs=(                                                   -->
+            <!--       WhereFilterSpec(                                               -->
+            <!--         where_sql="listing__country_latest = 'us'",                  -->
+            <!--         bind_parameters=SqlBindParameters(),                         -->
+            <!--         linkable_specs=(                                             -->
+            <!--           DimensionSpec(                                             -->
+            <!--             element_name='country_latest',                           -->
+            <!--             entity_links=(EntityReference(element_name='listing'),), -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
+            <!--       ),                                                             -->
+            <!--     ),                                                               -->
+            <!--   )                                                                  -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
@@ -43,23 +37,17 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                               -->
-                        <!--   WhereFilterSpec(                              -->
-                        <!--     where_sql="listing__country_latest = 'us'", -->
-                        <!--     bind_parameters=SqlBindParameters(),        -->
-                        <!--     linkable_spec_set=LinkableSpecSet(          -->
-                        <!--       dimension_specs=(                         -->
-                        <!--         DimensionSpec(                          -->
-                        <!--           element_name='country_latest',        -->
-                        <!--           entity_links=(                        -->
-                        <!--             EntityReference(                    -->
-                        <!--               element_name='listing',           -->
-                        <!--             ),                                  -->
-                        <!--           ),                                    -->
-                        <!--         ),                                      -->
-                        <!--       ),                                        -->
-                        <!--     ),                                          -->
-                        <!--   )                                             -->
+                        <!-- where_condition =                                                -->
+                        <!--   WhereFilterSpec(                                               -->
+                        <!--     where_sql="listing__country_latest = 'us'",                  -->
+                        <!--     bind_parameters=SqlBindParameters(),                         -->
+                        <!--     linkable_specs=(                                             -->
+                        <!--       DimensionSpec(                                             -->
+                        <!--         element_name='country_latest',                           -->
+                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
+                        <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description =                                                                          -->
                             <!--   "Pass Only Elements: ['bookings', 'booking__is_instant', 'listing__country_latest']" -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
index b3ba6c0a1e..2eaabb15d5 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
@@ -5,24 +5,19 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_0') -->
-            <!-- metric_spec =                                         -->
-            <!--   MetricSpec(                                         -->
-            <!--     element_name='bookings',                          -->
-            <!--     filter_specs=(                                    -->
-            <!--       WhereFilterSpec(                                -->
-            <!--         where_sql="metric_time__day >= '2020-01-01'", -->
-            <!--         bind_parameters=SqlBindParameters(),          -->
-            <!--         linkable_spec_set=LinkableSpecSet(            -->
-            <!--           time_dimension_specs=(                      -->
-            <!--             TimeDimensionSpec(                        -->
-            <!--               element_name='metric_time',             -->
-            <!--               time_granularity=DAY,                   -->
-            <!--             ),                                        -->
-            <!--           ),                                          -->
-            <!--         ),                                            -->
-            <!--       ),                                              -->
-            <!--     ),                                                -->
-            <!--   )                                                   -->
+            <!-- metric_spec =                                                                  -->
+            <!--   MetricSpec(                                                                  -->
+            <!--     element_name='bookings',                                                   -->
+            <!--     filter_specs=(                                                             -->
+            <!--       WhereFilterSpec(                                                         -->
+            <!--         where_sql="metric_time__day >= '2020-01-01'",                          -->
+            <!--         bind_parameters=SqlBindParameters(),                                   -->
+            <!--         linkable_specs=(                                                       -->
+            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
+            <!--         ),                                                                     -->
+            <!--       ),                                                                       -->
+            <!--     ),                                                                         -->
+            <!--   )                                                                            -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
@@ -39,19 +34,12 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                 -->
-                        <!--   WhereFilterSpec(                                -->
-                        <!--     where_sql="metric_time__day >= '2020-01-01'", -->
-                        <!--     bind_parameters=SqlBindParameters(),          -->
-                        <!--     linkable_spec_set=LinkableSpecSet(            -->
-                        <!--       time_dimension_specs=(                      -->
-                        <!--         TimeDimensionSpec(                        -->
-                        <!--           element_name='metric_time',             -->
-                        <!--           time_granularity=DAY,                   -->
-                        <!--         ),                                        -->
-                        <!--       ),                                          -->
-                        <!--     ),                                            -->
-                        <!--   )                                               -->
+                        <!-- where_condition =                                                                          -->
+                        <!--   WhereFilterSpec(                                                                         -->
+                        <!--     where_sql="metric_time__day >= '2020-01-01'",                                          -->
+                        <!--     bind_parameters=SqlBindParameters(),                                                   -->
+                        <!--     linkable_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
+                        <!--   )                                                                                        -->
                         <FilterElementsNode>
                             <!-- description =                                                                   -->
                             <!--   "Pass Only Elements: ['bookings', 'booking__is_instant', 'metric_time__day']" -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
index 7a9e744ad3..07b2aa8b7a 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_with_common_linkable_plan__dfp_0.xml
@@ -5,51 +5,39 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_0') -->
-            <!-- metric_spec =                                       -->
-            <!--   MetricSpec(                                       -->
-            <!--     element_name='bookings',                        -->
-            <!--     filter_specs=(                                  -->
-            <!--       WhereFilterSpec(                              -->
-            <!--         where_sql="listing__country_latest = 'us'", -->
-            <!--         bind_parameters=SqlBindParameters(),        -->
-            <!--         linkable_spec_set=LinkableSpecSet(          -->
-            <!--           dimension_specs=(                         -->
-            <!--             DimensionSpec(                          -->
-            <!--               element_name='country_latest',        -->
-            <!--               entity_links=(                        -->
-            <!--                 EntityReference(                    -->
-            <!--                   element_name='listing',           -->
-            <!--                 ),                                  -->
-            <!--               ),                                    -->
-            <!--             ),                                      -->
-            <!--           ),                                        -->
-            <!--         ),                                          -->
-            <!--       ),                                            -->
-            <!--     ),                                              -->
-            <!--   )                                                 -->
+            <!-- metric_spec =                                                        -->
+            <!--   MetricSpec(                                                        -->
+            <!--     element_name='bookings',                                         -->
+            <!--     filter_specs=(                                                   -->
+            <!--       WhereFilterSpec(                                               -->
+            <!--         where_sql="listing__country_latest = 'us'",                  -->
+            <!--         bind_parameters=SqlBindParameters(),                         -->
+            <!--         linkable_specs=(                                             -->
+            <!--           DimensionSpec(                                             -->
+            <!--             element_name='country_latest',                           -->
+            <!--             entity_links=(EntityReference(element_name='listing'),), -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
+            <!--       ),                                                             -->
+            <!--     ),                                                               -->
+            <!--   )                                                                  -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
                 <WhereConstraintNode>
                     <!-- description = 'Constrain Output with WHERE' -->
                     <!-- node_id = NodeId(id_str='wcc_0') -->
-                    <!-- where_condition =                               -->
-                    <!--   WhereFilterSpec(                              -->
-                    <!--     where_sql="listing__country_latest = 'us'", -->
-                    <!--     bind_parameters=SqlBindParameters(),        -->
-                    <!--     linkable_spec_set=LinkableSpecSet(          -->
-                    <!--       dimension_specs=(                         -->
-                    <!--         DimensionSpec(                          -->
-                    <!--           element_name='country_latest',        -->
-                    <!--           entity_links=(                        -->
-                    <!--             EntityReference(                    -->
-                    <!--               element_name='listing',           -->
-                    <!--             ),                                  -->
-                    <!--           ),                                    -->
-                    <!--         ),                                      -->
-                    <!--       ),                                        -->
-                    <!--     ),                                          -->
-                    <!--   )                                             -->
+                    <!-- where_condition =                                                -->
+                    <!--   WhereFilterSpec(                                               -->
+                    <!--     where_sql="listing__country_latest = 'us'",                  -->
+                    <!--     bind_parameters=SqlBindParameters(),                         -->
+                    <!--     linkable_specs=(                                             -->
+                    <!--       DimensionSpec(                                             -->
+                    <!--         element_name='country_latest',                           -->
+                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
+                    <!--   )                                                              -->
                     <FilterElementsNode>
                         <!-- description = "Pass Only Elements: ['bookings', 'listing__country_latest']" -->
                         <!-- node_id = NodeId(id_str='pfe_2') -->
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
index 2171124c84..6b6d49f158 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
@@ -47,23 +47,17 @@
                         <WhereConstraintNode>
                             <!-- description = 'Constrain Output with WHERE' -->
                             <!-- node_id = NodeId(id_str='wcc_0') -->
-                            <!-- where_condition =                        -->
-                            <!--   WhereFilterSpec(                       -->
-                            <!--     where_sql='booking__is_instant',     -->
-                            <!--     bind_parameters=SqlBindParameters(), -->
-                            <!--     linkable_spec_set=LinkableSpecSet(   -->
-                            <!--       dimension_specs=(                  -->
-                            <!--         DimensionSpec(                   -->
-                            <!--           element_name='is_instant',     -->
-                            <!--           entity_links=(                 -->
-                            <!--             EntityReference(             -->
-                            <!--               element_name='booking',    -->
-                            <!--             ),                           -->
-                            <!--           ),                             -->
-                            <!--         ),                               -->
-                            <!--       ),                                 -->
-                            <!--     ),                                   -->
-                            <!--   )                                      -->
+                            <!-- where_condition =                                                -->
+                            <!--   WhereFilterSpec(                                               -->
+                            <!--     where_sql='booking__is_instant',                             -->
+                            <!--     bind_parameters=SqlBindParameters(),                         -->
+                            <!--     linkable_specs=(                                             -->
+                            <!--       DimensionSpec(                                             -->
+                            <!--         element_name='is_instant',                               -->
+                            <!--         entity_links=(EntityReference(element_name='booking'),), -->
+                            <!--       ),                                                         -->
+                            <!--     ),                                                           -->
+                            <!--   )                                                              -->
                             <FilterElementsNode>
                                 <!-- description =                                                                        -->
                                 <!--   "Pass Only Elements: ['booking_value', 'booking__is_instant', 'metric_time__day']" -->
diff --git a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
index 0ea28d8b15..f625d9c134 100644
--- a/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
@@ -47,23 +47,17 @@
                         <WhereConstraintNode>
                             <!-- description = 'Constrain Output with WHERE' -->
                             <!-- node_id = NodeId(id_str='wcc_1') -->
-                            <!-- where_condition =                        -->
-                            <!--   WhereFilterSpec(                       -->
-                            <!--     where_sql='booking__is_instant',     -->
-                            <!--     bind_parameters=SqlBindParameters(), -->
-                            <!--     linkable_spec_set=LinkableSpecSet(   -->
-                            <!--       dimension_specs=(                  -->
-                            <!--         DimensionSpec(                   -->
-                            <!--           element_name='is_instant',     -->
-                            <!--           entity_links=(                 -->
-                            <!--             EntityReference(             -->
-                            <!--               element_name='booking',    -->
-                            <!--             ),                           -->
-                            <!--           ),                             -->
-                            <!--         ),                               -->
-                            <!--       ),                                 -->
-                            <!--     ),                                   -->
-                            <!--   )                                      -->
+                            <!-- where_condition =                                                -->
+                            <!--   WhereFilterSpec(                                               -->
+                            <!--     where_sql='booking__is_instant',                             -->
+                            <!--     bind_parameters=SqlBindParameters(),                         -->
+                            <!--     linkable_specs=(                                             -->
+                            <!--       DimensionSpec(                                             -->
+                            <!--         element_name='is_instant',                               -->
+                            <!--         entity_links=(EntityReference(element_name='booking'),), -->
+                            <!--       ),                                                         -->
+                            <!--     ),                                                           -->
+                            <!--   )                                                              -->
                             <FilterElementsNode>
                                 <!-- description =                                                                        -->
                                 <!--   "Pass Only Elements: ['booking_value', 'booking__is_instant', 'metric_time__day']" -->