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 790ffe2f20..542d5be751 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
@@ -30,12 +30,6 @@
                     <!--   WhereFilterSpec(                                               -->
                     <!--     where_sql="listing__country_latest = 'us'",                  -->
                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                    <!--     linkable_specs=(                                             -->
-                    <!--       DimensionSpec(                                             -->
-                    <!--         element_name='country_latest',                           -->
-                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--       ),                                                         -->
-                    <!--     ),                                                           -->
                     <!--     linkable_elements=(                                          -->
                     <!--       LinkableDimension(                                         -->
                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -52,6 +46,18 @@
                     <!--         properties=frozenset('LOCAL',),                          -->
                     <!--       ),                                                         -->
                     <!--     ),                                                           -->
+                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                    <!--       dimension_specs=(                                          -->
+                    <!--         DimensionSpec(                                           -->
+                    <!--           element_name='country_latest',                         -->
+                    <!--           entity_links=(                                         -->
+                    <!--             EntityReference(                                     -->
+                    <!--               element_name='listing',                            -->
+                    <!--             ),                                                   -->
+                    <!--           ),                                                     -->
+                    <!--         ),                                                       -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
                     <!--   )                                                              -->
                     <ReadSqlSourceNode>
                         <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
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 7077e14d3d..e4eb53ea7e 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
@@ -35,12 +35,6 @@
                     <!--   WhereFilterSpec(                                               -->
                     <!--     where_sql="listing__country_latest = 'us'",                  -->
                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                    <!--     linkable_specs=(                                             -->
-                    <!--       DimensionSpec(                                             -->
-                    <!--         element_name='country_latest',                           -->
-                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--       ),                                                         -->
-                    <!--     ),                                                           -->
                     <!--     linkable_elements=(                                          -->
                     <!--       LinkableDimension(                                         -->
                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -57,6 +51,18 @@
                     <!--         properties=frozenset('LOCAL',),                          -->
                     <!--       ),                                                         -->
                     <!--     ),                                                           -->
+                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                    <!--       dimension_specs=(                                          -->
+                    <!--         DimensionSpec(                                           -->
+                    <!--           element_name='country_latest',                         -->
+                    <!--           entity_links=(                                         -->
+                    <!--             EntityReference(                                     -->
+                    <!--               element_name='listing',                            -->
+                    <!--             ),                                                   -->
+                    <!--           ),                                                     -->
+                    <!--         ),                                                       -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
                     <!--   )                                                              -->
                     <JoinOnEntitiesNode>
                         <!-- description = 'Join Standard Outputs' -->
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 d358d42813..2af5d836a4 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,35 +5,40 @@
         <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_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('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_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_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') -->
@@ -42,28 +47,35 @@
                 <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_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
-                    <!--     linkable_elements=(                                                                    -->
-                    <!--       LinkableDimension(                                                                   -->
-                    <!--         defined_in_semantic_model=SemanticModelReference(                                  -->
-                    <!--           semantic_model_name='bookings_source',                                           -->
-                    <!--         ),                                                                                 -->
-                    <!--         element_name='metric_time',                                                        -->
-                    <!--         dimension_type=TIME,                                                               -->
-                    <!--         join_path=SemanticModelJoinPath(                                                   -->
-                    <!--           left_semantic_model_reference=SemanticModelReference(                            -->
-                    <!--             semantic_model_name='bookings_source',                                         -->
-                    <!--           ),                                                                               -->
-                    <!--         ),                                                                                 -->
-                    <!--         properties=frozenset('METRIC_TIME',),                                              -->
-                    <!--         time_granularity=DAY,                                                              -->
-                    <!--       ),                                                                                   -->
-                    <!--     ),                                                                                     -->
-                    <!--   )                                                                                        -->
+                    <!-- where_condition =                                               -->
+                    <!--   WhereFilterSpec(                                              -->
+                    <!--     where_sql="metric_time__day = '2020-01-01'",                -->
+                    <!--     bind_parameters=SqlBindParameters(),                        -->
+                    <!--     linkable_elements=(                                         -->
+                    <!--       LinkableDimension(                                        -->
+                    <!--         defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--           semantic_model_name='bookings_source',                -->
+                    <!--         ),                                                      -->
+                    <!--         element_name='metric_time',                             -->
+                    <!--         dimension_type=TIME,                                    -->
+                    <!--         join_path=SemanticModelJoinPath(                        -->
+                    <!--           left_semantic_model_reference=SemanticModelReference( -->
+                    <!--             semantic_model_name='bookings_source',              -->
+                    <!--           ),                                                    -->
+                    <!--         ),                                                      -->
+                    <!--         properties=frozenset('METRIC_TIME',),                   -->
+                    <!--         time_granularity=DAY,                                   -->
+                    <!--       ),                                                        -->
+                    <!--     ),                                                          -->
+                    <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--       time_dimension_specs=(                                    -->
+                    <!--         TimeDimensionSpec(                                      -->
+                    <!--           element_name='metric_time',                           -->
+                    <!--           time_granularity=DAY,                                 -->
+                    <!--         ),                                                      -->
+                    <!--       ),                                                        -->
+                    <!--     ),                                                          -->
+                    <!--   )                                                             -->
                     <!-- All filters always applied: = True -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
@@ -89,12 +101,6 @@
                                 <!--   WhereFilterSpec(                                              -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                -->
                                 <!--     bind_parameters=SqlBindParameters(),                        -->
-                                <!--     linkable_specs=(                                            -->
-                                <!--       TimeDimensionSpec(                                        -->
-                                <!--         element_name='metric_time',                             -->
-                                <!--         time_granularity=DAY,                                   -->
-                                <!--       ),                                                        -->
-                                <!--     ),                                                          -->
                                 <!--     linkable_elements=(                                         -->
                                 <!--       LinkableDimension(                                        -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -111,6 +117,14 @@
                                 <!--         time_granularity=DAY,                                   -->
                                 <!--       ),                                                        -->
                                 <!--     ),                                                          -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                <!--       time_dimension_specs=(                                    -->
+                                <!--         TimeDimensionSpec(                                      -->
+                                <!--           element_name='metric_time',                           -->
+                                <!--           time_granularity=DAY,                                 -->
+                                <!--         ),                                                      -->
+                                <!--       ),                                                        -->
+                                <!--     ),                                                          -->
                                 <!--   )                                                             -->
                                 <FilterElementsNode>
                                     <!-- description = "Pass Only Elements: ['bookings', 'metric_time__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 e10f1637e1..b7316dcade 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,50 +12,56 @@
                 <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_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='average_booking_value',                           -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='listing__is_lux_latest',                         -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='listings_latest',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_lux_latest',                           -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='listing'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--               path_elements=(                                       -->
+                    <!--                 SemanticModelJoinPathElement(                       -->
+                    <!--                   semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='listings_latest',          -->
+                    <!--                   ),                                                -->
+                    <!--                   join_on_entity=EntityReference(                   -->
+                    <!--                     element_name='listing',                         -->
+                    <!--                   ),                                                -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('JOINED',),                        -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_lux_latest',                         -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='listing',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_0') -->
@@ -72,12 +78,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='listing__is_lux_latest',                          -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -104,6 +104,18 @@
                                 <!--         properties=frozenset('JOINED',),                         -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_lux_latest',                          -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='listing',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                                 -->
@@ -177,50 +189,56 @@
                 <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_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='listings_latest',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_lux_latest',                            -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='listing'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--               path_elements=(                                        -->
-                    <!--                 SemanticModelJoinPathElement(                        -->
-                    <!--                   semantic_model_reference=SemanticModelReference(   -->
-                    <!--                     semantic_model_name='listings_latest',           -->
-                    <!--                   ),                                                 -->
-                    <!--                   join_on_entity=EntityReference(                    -->
-                    <!--                     element_name='listing',                          -->
-                    <!--                   ),                                                 -->
-                    <!--                 ),                                                   -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('JOINED',),                         -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings',                                        -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='listing__is_lux_latest',                         -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='listings_latest',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_lux_latest',                           -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='listing'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--               path_elements=(                                       -->
+                    <!--                 SemanticModelJoinPathElement(                       -->
+                    <!--                   semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='listings_latest',          -->
+                    <!--                   ),                                                -->
+                    <!--                   join_on_entity=EntityReference(                   -->
+                    <!--                     element_name='listing',                         -->
+                    <!--                   ),                                                -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('JOINED',),                        -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_lux_latest',                         -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='listing',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_1') -->
@@ -237,12 +255,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='listing__is_lux_latest',                          -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_lux_latest',                            -->
-                                <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -269,6 +281,18 @@
                                 <!--         properties=frozenset('JOINED',),                         -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_lux_latest',                          -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='listing',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                    -->
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 dacb8f92cf..5cae6fe5da 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,41 +12,47 @@
                 <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_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--     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_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_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') -->
@@ -63,12 +69,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='booking__is_instant',                             -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_instant',                               -->
-                                <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -85,6 +85,18 @@
                                 <!--         properties=frozenset('LOCAL',),                          -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_instant',                             -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='booking',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                      -->
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 d6fdb718ed..010e620781 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,20 +17,28 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                                -->
-                        <!--   WhereFilterSpec(                                               -->
-                        <!--     where_sql='listing__bookings > 2',                           -->
-                        <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       GroupByMetricSpec(                                         -->
-                        <!--         element_name='bookings',                                 -->
-                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                        <!--         metric_subquery_entity_links=(                           -->
-                        <!--           EntityReference(element_name='listing'),               -->
-                        <!--         ),                                                       -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
-                        <!--   )                                                              -->
+                        <!-- where_condition =                        -->
+                        <!--   WhereFilterSpec(                       -->
+                        <!--     where_sql='listing__bookings > 2',   -->
+                        <!--     bind_parameters=SqlBindParameters(), -->
+                        <!--     linkable_spec_set=LinkableSpecSet(   -->
+                        <!--       group_by_metric_specs=(            -->
+                        <!--         GroupByMetricSpec(               -->
+                        <!--           element_name='bookings',       -->
+                        <!--           entity_links=(                 -->
+                        <!--             EntityReference(             -->
+                        <!--               element_name='listing',    -->
+                        <!--             ),                           -->
+                        <!--           ),                             -->
+                        <!--           metric_subquery_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 14829a5c07..b0a31a473c 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,27 +5,33 @@
         <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(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           GroupByMetricSpec(                                         -->
-            <!--             element_name='bookings',                                 -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--             metric_subquery_entity_links=(                           -->
-            <!--               EntityReference(                                       -->
-            <!--                 element_name='listing',                              -->
-            <!--               ),                                                     -->
-            <!--             ),                                                       -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
-            <!--       ),                                                             -->
-            <!--     ),                                                               -->
-            <!--   )                                                                  -->
+            <!-- metric_spec =                                -->
+            <!--   MetricSpec(                                -->
+            <!--     element_name='listings',                 -->
+            <!--     filter_specs=(                           -->
+            <!--       WhereFilterSpec(                       -->
+            <!--         where_sql='listing__bookings > 2',   -->
+            <!--         bind_parameters=SqlBindParameters(), -->
+            <!--         linkable_spec_set=LinkableSpecSet(   -->
+            <!--           group_by_metric_specs=(            -->
+            <!--             GroupByMetricSpec(               -->
+            <!--               element_name='bookings',       -->
+            <!--               entity_links=(                 -->
+            <!--                 EntityReference(             -->
+            <!--                   element_name='listing',    -->
+            <!--                 ),                           -->
+            <!--               ),                             -->
+            <!--               metric_subquery_entity_links=( -->
+            <!--                 EntityReference(             -->
+            <!--                   element_name='listing',    -->
+            <!--                 ),                           -->
+            <!--               ),                             -->
+            <!--             ),                               -->
+            <!--           ),                                 -->
+            <!--         ),                                   -->
+            <!--       ),                                     -->
+            <!--     ),                                       -->
+            <!--   )                                          -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_1') -->
@@ -37,20 +43,28 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                                -->
-                        <!--   WhereFilterSpec(                                               -->
-                        <!--     where_sql='listing__bookings > 2',                           -->
-                        <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       GroupByMetricSpec(                                         -->
-                        <!--         element_name='bookings',                                 -->
-                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                        <!--         metric_subquery_entity_links=(                           -->
-                        <!--           EntityReference(element_name='listing'),               -->
-                        <!--         ),                                                       -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
-                        <!--   )                                                              -->
+                        <!-- where_condition =                        -->
+                        <!--   WhereFilterSpec(                       -->
+                        <!--     where_sql='listing__bookings > 2',   -->
+                        <!--     bind_parameters=SqlBindParameters(), -->
+                        <!--     linkable_spec_set=LinkableSpecSet(   -->
+                        <!--       group_by_metric_specs=(            -->
+                        <!--         GroupByMetricSpec(               -->
+                        <!--           element_name='bookings',       -->
+                        <!--           entity_links=(                 -->
+                        <!--             EntityReference(             -->
+                        <!--               element_name='listing',    -->
+                        <!--             ),                           -->
+                        <!--           ),                             -->
+                        <!--           metric_subquery_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 99b604df39..83cfb6e9df 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,35 +5,40 @@
         <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_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('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_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_specs=(                                    -->
+            <!--             TimeDimensionSpec(                                      -->
+            <!--               element_name='metric_time',                           -->
+            <!--               time_granularity=DAY,                                 -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--       ),                                                            -->
+            <!--     ),                                                              -->
+            <!--   )                                                                 -->
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
                 <!-- node_id = NodeId(id_str='cm_0') -->
@@ -44,12 +49,6 @@
                 <!--       WhereFilterSpec(                                              -->
                 <!--         where_sql="metric_time__day = '2020-01-01'",                -->
                 <!--         bind_parameters=SqlBindParameters(),                        -->
-                <!--         linkable_specs=(                                            -->
-                <!--           TimeDimensionSpec(                                        -->
-                <!--             element_name='metric_time',                             -->
-                <!--             time_granularity=DAY,                                   -->
-                <!--           ),                                                        -->
-                <!--         ),                                                          -->
                 <!--         linkable_elements=(                                         -->
                 <!--           LinkableDimension(                                        -->
                 <!--             defined_in_semantic_model=SemanticModelReference(       -->
@@ -66,6 +65,14 @@
                 <!--             time_granularity=DAY,                                   -->
                 <!--           ),                                                        -->
                 <!--         ),                                                          -->
+                <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                <!--           time_dimension_specs=(                                    -->
+                <!--             TimeDimensionSpec(                                      -->
+                <!--               element_name='metric_time',                           -->
+                <!--               time_granularity=DAY,                                 -->
+                <!--             ),                                                      -->
+                <!--           ),                                                        -->
+                <!--         ),                                                          -->
                 <!--       ),                                                            -->
                 <!--     ),                                                              -->
                 <!--     alias='bookings_start_of_month',                                -->
@@ -83,28 +90,35 @@
                         <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_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
-                            <!--     linkable_elements=(                                                                    -->
-                            <!--       LinkableDimension(                                                                   -->
-                            <!--         defined_in_semantic_model=SemanticModelReference(                                  -->
-                            <!--           semantic_model_name='bookings_source',                                           -->
-                            <!--         ),                                                                                 -->
-                            <!--         element_name='metric_time',                                                        -->
-                            <!--         dimension_type=TIME,                                                               -->
-                            <!--         join_path=SemanticModelJoinPath(                                                   -->
-                            <!--           left_semantic_model_reference=SemanticModelReference(                            -->
-                            <!--             semantic_model_name='bookings_source',                                         -->
-                            <!--           ),                                                                               -->
-                            <!--         ),                                                                                 -->
-                            <!--         properties=frozenset('METRIC_TIME',),                                              -->
-                            <!--         time_granularity=DAY,                                                              -->
-                            <!--       ),                                                                                   -->
-                            <!--     ),                                                                                     -->
-                            <!--   )                                                                                        -->
+                            <!-- where_condition =                                               -->
+                            <!--   WhereFilterSpec(                                              -->
+                            <!--     where_sql="metric_time__day = '2020-01-01'",                -->
+                            <!--     bind_parameters=SqlBindParameters(),                        -->
+                            <!--     linkable_elements=(                                         -->
+                            <!--       LinkableDimension(                                        -->
+                            <!--         defined_in_semantic_model=SemanticModelReference(       -->
+                            <!--           semantic_model_name='bookings_source',                -->
+                            <!--         ),                                                      -->
+                            <!--         element_name='metric_time',                             -->
+                            <!--         dimension_type=TIME,                                    -->
+                            <!--         join_path=SemanticModelJoinPath(                        -->
+                            <!--           left_semantic_model_reference=SemanticModelReference( -->
+                            <!--             semantic_model_name='bookings_source',              -->
+                            <!--           ),                                                    -->
+                            <!--         ),                                                      -->
+                            <!--         properties=frozenset('METRIC_TIME',),                   -->
+                            <!--         time_granularity=DAY,                                   -->
+                            <!--       ),                                                        -->
+                            <!--     ),                                                          -->
+                            <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                            <!--       time_dimension_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 9b55aa5c18..8c4815d37b 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,35 +5,40 @@
         <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_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('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_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_specs=(                                    -->
+            <!--             TimeDimensionSpec(                                      -->
+            <!--               element_name='metric_time',                           -->
+            <!--               time_granularity=DAY,                                 -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--       ),                                                            -->
+            <!--     ),                                                              -->
+            <!--   )                                                                 -->
             <CombineAggregatedOutputsNode>
                 <!-- description = 'Combine Aggregated Outputs' -->
                 <!-- node_id = NodeId(id_str='cao_0') -->
@@ -47,12 +52,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql="metric_time__day = '2020-01-01'",                   -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           TimeDimensionSpec(                                           -->
-                    <!--             element_name='metric_time',                                -->
-                    <!--             time_granularity=DAY,                                      -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -69,6 +68,14 @@
                     <!--             time_granularity=DAY,                                      -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           time_dimension_specs=(                                       -->
+                    <!--             TimeDimensionSpec(                                         -->
+                    <!--               element_name='metric_time',                              -->
+                    <!--               time_granularity=DAY,                                    -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     offset_window=PydanticMetricTimeWindow(count=1, granularity=WEEK), -->
@@ -89,12 +96,6 @@
                                 <!--   WhereFilterSpec(                                              -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                -->
                                 <!--     bind_parameters=SqlBindParameters(),                        -->
-                                <!--     linkable_specs=(                                            -->
-                                <!--       TimeDimensionSpec(                                        -->
-                                <!--         element_name='metric_time',                             -->
-                                <!--         time_granularity=DAY,                                   -->
-                                <!--       ),                                                        -->
-                                <!--     ),                                                          -->
                                 <!--     linkable_elements=(                                         -->
                                 <!--       LinkableDimension(                                        -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -111,6 +112,14 @@
                                 <!--         time_granularity=DAY,                                   -->
                                 <!--       ),                                                        -->
                                 <!--     ),                                                          -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                <!--       time_dimension_specs=(                                    -->
+                                <!--         TimeDimensionSpec(                                      -->
+                                <!--           element_name='metric_time',                           -->
+                                <!--           time_granularity=DAY,                                 -->
+                                <!--         ),                                                      -->
+                                <!--       ),                                                        -->
+                                <!--     ),                                                          -->
                                 <!--   )                                                             -->
                                 <FilterElementsNode>
                                     <!-- description =                                                     -->
@@ -159,12 +168,6 @@
                     <!--       WhereFilterSpec(                                              -->
                     <!--         where_sql="metric_time__day = '2020-01-01'",                -->
                     <!--         bind_parameters=SqlBindParameters(),                        -->
-                    <!--         linkable_specs=(                                            -->
-                    <!--           TimeDimensionSpec(                                        -->
-                    <!--             element_name='metric_time',                             -->
-                    <!--             time_granularity=DAY,                                   -->
-                    <!--           ),                                                        -->
-                    <!--         ),                                                          -->
                     <!--         linkable_elements=(                                         -->
                     <!--           LinkableDimension(                                        -->
                     <!--             defined_in_semantic_model=SemanticModelReference(       -->
@@ -181,6 +184,14 @@
                     <!--             time_granularity=DAY,                                   -->
                     <!--           ),                                                        -->
                     <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           time_dimension_specs=(                                    -->
+                    <!--             TimeDimensionSpec(                                      -->
+                    <!--               element_name='metric_time',                           -->
+                    <!--               time_granularity=DAY,                                 -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
                     <!--       ),                                                            -->
                     <!--     ),                                                              -->
                     <!--   )                                                                 -->
@@ -200,12 +211,6 @@
                                 <!--   WhereFilterSpec(                                              -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                -->
                                 <!--     bind_parameters=SqlBindParameters(),                        -->
-                                <!--     linkable_specs=(                                            -->
-                                <!--       TimeDimensionSpec(                                        -->
-                                <!--         element_name='metric_time',                             -->
-                                <!--         time_granularity=DAY,                                   -->
-                                <!--       ),                                                        -->
-                                <!--     ),                                                          -->
                                 <!--     linkable_elements=(                                         -->
                                 <!--       LinkableDimension(                                        -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -222,6 +227,14 @@
                                 <!--         time_granularity=DAY,                                   -->
                                 <!--       ),                                                        -->
                                 <!--     ),                                                          -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                <!--       time_dimension_specs=(                                    -->
+                                <!--         TimeDimensionSpec(                                      -->
+                                <!--           element_name='metric_time',                           -->
+                                <!--           time_granularity=DAY,                                 -->
+                                <!--         ),                                                      -->
+                                <!--       ),                                                        -->
+                                <!--     ),                                                          -->
                                 <!--   )                                                             -->
                                 <FilterElementsNode>
                                     <!-- description =                                                                 -->
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 97d6aa3a03..467d3bf909 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
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql="listing__country_latest = 'us'",                  -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='country_latest',                           -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -44,6 +38,18 @@
             <!--             properties=frozenset('JOINED',),                         -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='country_latest',                         -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='listing',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -67,12 +73,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql="listing__country_latest = 'us'",                  -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='country_latest',                           -->
-                        <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -99,6 +99,18 @@
                         <!--         properties=frozenset('JOINED',),                         -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='country_latest',                         -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='listing',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description =                                                                          -->
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 a84a4e5acf..c950f9385b 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,35 +5,40 @@
         <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_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('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_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_specs=(                                    -->
+            <!--             TimeDimensionSpec(                                      -->
+            <!--               element_name='metric_time',                           -->
+            <!--               time_granularity=DAY,                                 -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--       ),                                                            -->
+            <!--     ),                                                              -->
+            <!--   )                                                                 -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
@@ -50,28 +55,35 @@
                     <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_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
-                        <!--     linkable_elements=(                                                                    -->
-                        <!--       LinkableDimension(                                                                   -->
-                        <!--         defined_in_semantic_model=SemanticModelReference(                                  -->
-                        <!--           semantic_model_name='bookings_source',                                           -->
-                        <!--         ),                                                                                 -->
-                        <!--         element_name='metric_time',                                                        -->
-                        <!--         dimension_type=TIME,                                                               -->
-                        <!--         join_path=SemanticModelJoinPath(                                                   -->
-                        <!--           left_semantic_model_reference=SemanticModelReference(                            -->
-                        <!--             semantic_model_name='bookings_source',                                         -->
-                        <!--           ),                                                                               -->
-                        <!--         ),                                                                                 -->
-                        <!--         properties=frozenset('METRIC_TIME',),                                              -->
-                        <!--         time_granularity=DAY,                                                              -->
-                        <!--       ),                                                                                   -->
-                        <!--     ),                                                                                     -->
-                        <!--   )                                                                                        -->
+                        <!-- where_condition =                                               -->
+                        <!--   WhereFilterSpec(                                              -->
+                        <!--     where_sql="metric_time__day >= '2020-01-01'",               -->
+                        <!--     bind_parameters=SqlBindParameters(),                        -->
+                        <!--     linkable_elements=(                                         -->
+                        <!--       LinkableDimension(                                        -->
+                        <!--         defined_in_semantic_model=SemanticModelReference(       -->
+                        <!--           semantic_model_name='bookings_source',                -->
+                        <!--         ),                                                      -->
+                        <!--         element_name='metric_time',                             -->
+                        <!--         dimension_type=TIME,                                    -->
+                        <!--         join_path=SemanticModelJoinPath(                        -->
+                        <!--           left_semantic_model_reference=SemanticModelReference( -->
+                        <!--             semantic_model_name='bookings_source',              -->
+                        <!--           ),                                                    -->
+                        <!--         ),                                                      -->
+                        <!--         properties=frozenset('METRIC_TIME',),                   -->
+                        <!--         time_granularity=DAY,                                   -->
+                        <!--       ),                                                        -->
+                        <!--     ),                                                          -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                        <!--       time_dimension_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 c33ea9936a..a6e585715e 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
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql="listing__country_latest = 'us'",                  -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='country_latest',                           -->
-            <!--             entity_links=(EntityReference(element_name='listing'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -44,6 +38,18 @@
             <!--             properties=frozenset('JOINED',),                         -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='country_latest',                         -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='listing',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -57,12 +63,6 @@
                     <!--   WhereFilterSpec(                                               -->
                     <!--     where_sql="listing__country_latest = 'us'",                  -->
                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                    <!--     linkable_specs=(                                             -->
-                    <!--       DimensionSpec(                                             -->
-                    <!--         element_name='country_latest',                           -->
-                    <!--         entity_links=(EntityReference(element_name='listing'),), -->
-                    <!--       ),                                                         -->
-                    <!--     ),                                                           -->
                     <!--     linkable_elements=(                                          -->
                     <!--       LinkableDimension(                                         -->
                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -89,6 +89,18 @@
                     <!--         properties=frozenset('JOINED',),                         -->
                     <!--       ),                                                         -->
                     <!--     ),                                                           -->
+                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                    <!--       dimension_specs=(                                          -->
+                    <!--         DimensionSpec(                                           -->
+                    <!--           element_name='country_latest',                         -->
+                    <!--           entity_links=(                                         -->
+                    <!--             EntityReference(                                     -->
+                    <!--               element_name='listing',                            -->
+                    <!--             ),                                                   -->
+                    <!--           ),                                                     -->
+                    <!--         ),                                                       -->
+                    <!--       ),                                                         -->
+                    <!--     ),                                                           -->
                     <!--   )                                                              -->
                     <FilterElementsNode>
                         <!-- description = "Pass Only Elements: ['bookings', 'listing__country_latest']" -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
index dafd8266aa..ced298e06e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                              -->
             <!--         where_sql="visit__referrer_id = '123456'",                  -->
             <!--         bind_parameters=SqlBindParameters(),                        -->
-            <!--         linkable_specs=(                                            -->
-            <!--           DimensionSpec(                                            -->
-            <!--             element_name='referrer_id',                             -->
-            <!--             entity_links=(EntityReference(element_name='visit'),),  -->
-            <!--           ),                                                        -->
-            <!--         ),                                                          -->
             <!--         linkable_elements=(                                         -->
             <!--           LinkableDimension(                                        -->
             <!--             defined_in_semantic_model=SemanticModelReference(       -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                         -->
             <!--           ),                                                        -->
             <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           dimension_specs=(                                         -->
+            <!--             DimensionSpec(                                          -->
+            <!--               element_name='referrer_id',                           -->
+            <!--               entity_links=(                                        -->
+            <!--                 EntityReference(                                    -->
+            <!--                   element_name='visit',                             -->
+            <!--                 ),                                                  -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
             <!--       ),                                                            -->
             <!--     ),                                                              -->
             <!--   )                                                                 -->
@@ -62,12 +68,6 @@
                             <!--   WhereFilterSpec(                                              -->
                             <!--     where_sql="visit__referrer_id = '123456'",                  -->
                             <!--     bind_parameters=SqlBindParameters(),                        -->
-                            <!--     linkable_specs=(                                            -->
-                            <!--       DimensionSpec(                                            -->
-                            <!--         element_name='referrer_id',                             -->
-                            <!--         entity_links=(EntityReference(element_name='visit'),),  -->
-                            <!--       ),                                                        -->
-                            <!--     ),                                                          -->
                             <!--     linkable_elements=(                                         -->
                             <!--       LinkableDimension(                                        -->
                             <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -84,6 +84,18 @@
                             <!--         properties=frozenset('LOCAL',),                         -->
                             <!--       ),                                                        -->
                             <!--     ),                                                          -->
+                            <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                            <!--       dimension_specs=(                                         -->
+                            <!--         DimensionSpec(                                          -->
+                            <!--           element_name='referrer_id',                           -->
+                            <!--           entity_links=(                                        -->
+                            <!--             EntityReference(                                    -->
+                            <!--               element_name='visit',                             -->
+                            <!--             ),                                                  -->
+                            <!--           ),                                                    -->
+                            <!--         ),                                                      -->
+                            <!--       ),                                                        -->
+                            <!--     ),                                                          -->
                             <!--   )                                                             -->
                             <FilterElementsNode>
                                 <!-- description =                                                                         -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
index cf357d7c00..b0146bac81 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                              -->
             <!--         where_sql="visit__referrer_id = '123456'",                  -->
             <!--         bind_parameters=SqlBindParameters(),                        -->
-            <!--         linkable_specs=(                                            -->
-            <!--           DimensionSpec(                                            -->
-            <!--             element_name='referrer_id',                             -->
-            <!--             entity_links=(EntityReference(element_name='visit'),),  -->
-            <!--           ),                                                        -->
-            <!--         ),                                                          -->
             <!--         linkable_elements=(                                         -->
             <!--           LinkableDimension(                                        -->
             <!--             defined_in_semantic_model=SemanticModelReference(       -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                         -->
             <!--           ),                                                        -->
             <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           dimension_specs=(                                         -->
+            <!--             DimensionSpec(                                          -->
+            <!--               element_name='referrer_id',                           -->
+            <!--               entity_links=(                                        -->
+            <!--                 EntityReference(                                    -->
+            <!--                   element_name='visit',                             -->
+            <!--                 ),                                                  -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
             <!--       ),                                                            -->
             <!--     ),                                                              -->
             <!--   )                                                                 -->
@@ -104,12 +110,6 @@
                                         <!--   WhereFilterSpec(                                              -->
                                         <!--     where_sql="visit__referrer_id = '123456'",                  -->
                                         <!--     bind_parameters=SqlBindParameters(),                        -->
-                                        <!--     linkable_specs=(                                            -->
-                                        <!--       DimensionSpec(                                            -->
-                                        <!--         element_name='referrer_id',                             -->
-                                        <!--         entity_links=(EntityReference(element_name='visit'),),  -->
-                                        <!--       ),                                                        -->
-                                        <!--     ),                                                          -->
                                         <!--     linkable_elements=(                                         -->
                                         <!--       LinkableDimension(                                        -->
                                         <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -130,6 +130,18 @@
                                         <!--         properties=frozenset('LOCAL',),                         -->
                                         <!--       ),                                                        -->
                                         <!--     ),                                                          -->
+                                        <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                        <!--       dimension_specs=(                                         -->
+                                        <!--         DimensionSpec(                                          -->
+                                        <!--           element_name='referrer_id',                           -->
+                                        <!--           entity_links=(                                        -->
+                                        <!--             EntityReference(                                    -->
+                                        <!--               element_name='visit',                             -->
+                                        <!--             ),                                                  -->
+                                        <!--           ),                                                    -->
+                                        <!--         ),                                                      -->
+                                        <!--       ),                                                        -->
+                                        <!--     ),                                                          -->
                                         <!--   )                                                             -->
                                         <MetricTimeDimensionTransformNode>
                                             <!-- description = "Metric Time Dimension 'ds'" -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
index 6776b66cae..f7660b833d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -58,12 +64,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -80,6 +80,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description =                                                                           -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
index ba6acad042..353671b14e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -105,14 +111,6 @@
                                         <!--   WhereFilterSpec(                                              -->
                                         <!--     where_sql='booking__is_instant',                            -->
                                         <!--     bind_parameters=SqlBindParameters(),                        -->
-                                        <!--     linkable_specs=(                                            -->
-                                        <!--       DimensionSpec(                                            -->
-                                        <!--         element_name='is_instant',                              -->
-                                        <!--         entity_links=(                                          -->
-                                        <!--           EntityReference(element_name='booking'),              -->
-                                        <!--         ),                                                      -->
-                                        <!--       ),                                                        -->
-                                        <!--     ),                                                          -->
                                         <!--     linkable_elements=(                                         -->
                                         <!--       LinkableDimension(                                        -->
                                         <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -133,6 +131,18 @@
                                         <!--         properties=frozenset('LOCAL',),                         -->
                                         <!--       ),                                                        -->
                                         <!--     ),                                                          -->
+                                        <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                        <!--       dimension_specs=(                                         -->
+                                        <!--         DimensionSpec(                                          -->
+                                        <!--           element_name='is_instant',                            -->
+                                        <!--           entity_links=(                                        -->
+                                        <!--             EntityReference(                                    -->
+                                        <!--               element_name='booking',                           -->
+                                        <!--             ),                                                  -->
+                                        <!--           ),                                                    -->
+                                        <!--         ),                                                      -->
+                                        <!--       ),                                                        -->
+                                        <!--     ),                                                          -->
                                         <!--   )                                                             -->
                                         <MetricTimeDimensionTransformNode>
                                             <!-- description = "Metric Time Dimension 'ds'" -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
index 851124deb7..7700fbd293 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <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='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                      -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_0') -->
@@ -109,12 +121,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -131,6 +137,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
@@ -222,12 +240,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -246,6 +258,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -283,12 +307,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -305,6 +323,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
index 15ec81da3d..13c15b531d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_3') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                       -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                      -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_3') -->
@@ -152,16 +164,6 @@
                                                 <!--   WhereFilterSpec(                                              -->
                                                 <!--     where_sql='booking__is_instant',                            -->
                                                 <!--     bind_parameters=SqlBindParameters(),                        -->
-                                                <!--     linkable_specs=(                                            -->
-                                                <!--       DimensionSpec(                                            -->
-                                                <!--         element_name='is_instant',                              -->
-                                                <!--         entity_links=(                                          -->
-                                                <!--           EntityReference(                                      -->
-                                                <!--             element_name='booking',                             -->
-                                                <!--           ),                                                    -->
-                                                <!--         ),                                                      -->
-                                                <!--       ),                                                        -->
-                                                <!--     ),                                                          -->
                                                 <!--     linkable_elements=(                                         -->
                                                 <!--       LinkableDimension(                                        -->
                                                 <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -182,6 +184,18 @@
                                                 <!--         properties=frozenset('LOCAL',),                         -->
                                                 <!--       ),                                                        -->
                                                 <!--     ),                                                          -->
+                                                <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                                <!--       dimension_specs=(                                         -->
+                                                <!--         DimensionSpec(                                          -->
+                                                <!--           element_name='is_instant',                            -->
+                                                <!--           entity_links=(                                        -->
+                                                <!--             EntityReference(                                    -->
+                                                <!--               element_name='booking',                           -->
+                                                <!--             ),                                                  -->
+                                                <!--           ),                                                    -->
+                                                <!--         ),                                                      -->
+                                                <!--       ),                                                        -->
+                                                <!--     ),                                                          -->
                                                 <!--   )                                                             -->
                                                 <MetricTimeDimensionTransformNode>
                                                     <!-- description = "Metric Time Dimension 'ds'" -->
@@ -230,12 +244,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -254,6 +262,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -291,12 +311,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -313,6 +327,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
index 079fa45fed..da8700c14b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <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='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                      -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_1') -->
@@ -84,12 +96,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -106,6 +112,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <!-- All filters always applied: = True -->
                         <JoinToTimeSpineNode>
@@ -128,12 +146,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -150,6 +162,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
@@ -241,12 +265,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -265,6 +283,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -277,12 +307,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -299,6 +323,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <!-- All filters always applied: = True -->
                         <JoinToTimeSpineNode>
@@ -321,12 +357,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -343,6 +373,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
index a63d20297c..a86e08210b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_3') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                       -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                      -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_5') -->
@@ -84,12 +96,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -106,6 +112,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <!-- All filters always applied: = True -->
                         <JoinToTimeSpineNode>
@@ -171,16 +189,6 @@
                                                 <!--   WhereFilterSpec(                                              -->
                                                 <!--     where_sql='booking__is_instant',                            -->
                                                 <!--     bind_parameters=SqlBindParameters(),                        -->
-                                                <!--     linkable_specs=(                                            -->
-                                                <!--       DimensionSpec(                                            -->
-                                                <!--         element_name='is_instant',                              -->
-                                                <!--         entity_links=(                                          -->
-                                                <!--           EntityReference(                                      -->
-                                                <!--             element_name='booking',                             -->
-                                                <!--           ),                                                    -->
-                                                <!--         ),                                                      -->
-                                                <!--       ),                                                        -->
-                                                <!--     ),                                                          -->
                                                 <!--     linkable_elements=(                                         -->
                                                 <!--       LinkableDimension(                                        -->
                                                 <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -201,6 +209,18 @@
                                                 <!--         properties=frozenset('LOCAL',),                         -->
                                                 <!--       ),                                                        -->
                                                 <!--     ),                                                          -->
+                                                <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                                <!--       dimension_specs=(                                         -->
+                                                <!--         DimensionSpec(                                          -->
+                                                <!--           element_name='is_instant',                            -->
+                                                <!--           entity_links=(                                        -->
+                                                <!--             EntityReference(                                    -->
+                                                <!--               element_name='booking',                           -->
+                                                <!--             ),                                                  -->
+                                                <!--           ),                                                    -->
+                                                <!--         ),                                                      -->
+                                                <!--       ),                                                        -->
+                                                <!--     ),                                                          -->
                                                 <!--   )                                                             -->
                                                 <MetricTimeDimensionTransformNode>
                                                     <!-- description = "Metric Time Dimension 'ds'" -->
@@ -249,12 +269,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -273,6 +287,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -285,12 +311,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -307,6 +327,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <!-- All filters always applied: = True -->
                         <JoinToTimeSpineNode>
@@ -329,12 +361,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -351,6 +377,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <FilterElementsNode>
                                         <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
index 61a732e4bc..e2717cf4a6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_0') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='bookings',                                         -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings',                                        -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_0') -->
@@ -99,12 +111,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='booking__is_instant',                             -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_instant',                               -->
-                                <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -121,6 +127,18 @@
                                 <!--         properties=frozenset('LOCAL',),                          -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_instant',                             -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='booking',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                     -->
@@ -211,12 +229,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -235,6 +247,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -262,12 +286,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='booking__is_instant',                             -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_instant',                               -->
-                                <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -284,6 +302,18 @@
                                 <!--         properties=frozenset('LOCAL',),                          -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_instant',                             -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='booking',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
index 6e0d5568ef..f98353aaa3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -43,40 +49,46 @@
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_3') -->
-                    <!-- metric_spec =                                                        -->
-                    <!--   MetricSpec(                                                        -->
-                    <!--     element_name='bookings',                                         -->
-                    <!--     filter_specs=(                                                   -->
-                    <!--       WhereFilterSpec(                                               -->
-                    <!--         where_sql='booking__is_instant',                             -->
-                    <!--         bind_parameters=SqlBindParameters(),                         -->
-                    <!--         linkable_specs=(                                             -->
-                    <!--           DimensionSpec(                                             -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),), -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--         linkable_elements=(                                          -->
-                    <!--           LinkableDimension(                                         -->
-                    <!--             defined_in_semantic_model=SemanticModelReference(        -->
-                    <!--               semantic_model_name='bookings_source',                 -->
-                    <!--             ),                                                       -->
-                    <!--             element_name='is_instant',                               -->
-                    <!--             dimension_type=CATEGORICAL,                              -->
-                    <!--             entity_links=(                                           -->
-                    <!--               EntityReference(element_name='booking'),               -->
-                    <!--             ),                                                       -->
-                    <!--             join_path=SemanticModelJoinPath(                         -->
-                    <!--               left_semantic_model_reference=SemanticModelReference(  -->
-                    <!--                 semantic_model_name='bookings_source',               -->
-                    <!--               ),                                                     -->
-                    <!--             ),                                                       -->
-                    <!--             properties=frozenset('LOCAL',),                          -->
-                    <!--           ),                                                         -->
-                    <!--         ),                                                           -->
-                    <!--       ),                                                             -->
-                    <!--     ),                                                               -->
-                    <!--   )                                                                  -->
+                    <!-- metric_spec =                                                       -->
+                    <!--   MetricSpec(                                                       -->
+                    <!--     element_name='bookings',                                        -->
+                    <!--     filter_specs=(                                                  -->
+                    <!--       WhereFilterSpec(                                              -->
+                    <!--         where_sql='booking__is_instant',                            -->
+                    <!--         bind_parameters=SqlBindParameters(),                        -->
+                    <!--         linkable_elements=(                                         -->
+                    <!--           LinkableDimension(                                        -->
+                    <!--             defined_in_semantic_model=SemanticModelReference(       -->
+                    <!--               semantic_model_name='bookings_source',                -->
+                    <!--             ),                                                      -->
+                    <!--             element_name='is_instant',                              -->
+                    <!--             dimension_type=CATEGORICAL,                             -->
+                    <!--             entity_links=(                                          -->
+                    <!--               EntityReference(element_name='booking'),              -->
+                    <!--             ),                                                      -->
+                    <!--             join_path=SemanticModelJoinPath(                        -->
+                    <!--               left_semantic_model_reference=SemanticModelReference( -->
+                    <!--                 semantic_model_name='bookings_source',              -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--             properties=frozenset('LOCAL',),                         -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                          -->
+                    <!--           dimension_specs=(                                         -->
+                    <!--             DimensionSpec(                                          -->
+                    <!--               element_name='is_instant',                            -->
+                    <!--               entity_links=(                                        -->
+                    <!--                 EntityReference(                                    -->
+                    <!--                   element_name='booking',                           -->
+                    <!--                 ),                                                  -->
+                    <!--               ),                                                    -->
+                    <!--             ),                                                      -->
+                    <!--           ),                                                        -->
+                    <!--         ),                                                          -->
+                    <!--       ),                                                            -->
+                    <!--     ),                                                              -->
+                    <!--   )                                                                 -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_2') -->
@@ -141,16 +153,6 @@
                                             <!--   WhereFilterSpec(                                              -->
                                             <!--     where_sql='booking__is_instant',                            -->
                                             <!--     bind_parameters=SqlBindParameters(),                        -->
-                                            <!--     linkable_specs=(                                            -->
-                                            <!--       DimensionSpec(                                            -->
-                                            <!--         element_name='is_instant',                              -->
-                                            <!--         entity_links=(                                          -->
-                                            <!--           EntityReference(                                      -->
-                                            <!--             element_name='booking',                             -->
-                                            <!--           ),                                                    -->
-                                            <!--         ),                                                      -->
-                                            <!--       ),                                                        -->
-                                            <!--     ),                                                          -->
                                             <!--     linkable_elements=(                                         -->
                                             <!--       LinkableDimension(                                        -->
                                             <!--         defined_in_semantic_model=SemanticModelReference(       -->
@@ -171,6 +173,18 @@
                                             <!--         properties=frozenset('LOCAL',),                         -->
                                             <!--       ),                                                        -->
                                             <!--     ),                                                          -->
+                                            <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                                            <!--       dimension_specs=(                                         -->
+                                            <!--         DimensionSpec(                                          -->
+                                            <!--           element_name='is_instant',                            -->
+                                            <!--           entity_links=(                                        -->
+                                            <!--             EntityReference(                                    -->
+                                            <!--               element_name='booking',                           -->
+                                            <!--             ),                                                  -->
+                                            <!--           ),                                                    -->
+                                            <!--         ),                                                      -->
+                                            <!--       ),                                                        -->
+                                            <!--     ),                                                          -->
                                             <!--   )                                                             -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
@@ -217,12 +231,6 @@
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
                     <!--         bind_parameters=SqlBindParameters(),                           -->
-                    <!--         linkable_specs=(                                               -->
-                    <!--           DimensionSpec(                                               -->
-                    <!--             element_name='is_instant',                                 -->
-                    <!--             entity_links=(EntityReference(element_name='booking'),),   -->
-                    <!--           ),                                                           -->
-                    <!--         ),                                                             -->
                     <!--         linkable_elements=(                                            -->
                     <!--           LinkableDimension(                                           -->
                     <!--             defined_in_semantic_model=SemanticModelReference(          -->
@@ -241,6 +249,18 @@
                     <!--             properties=frozenset('LOCAL',),                            -->
                     <!--           ),                                                           -->
                     <!--         ),                                                             -->
+                    <!--         linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--           dimension_specs=(                                            -->
+                    <!--             DimensionSpec(                                             -->
+                    <!--               element_name='is_instant',                               -->
+                    <!--               entity_links=(                                           -->
+                    <!--                 EntityReference(                                       -->
+                    <!--                   element_name='booking',                              -->
+                    <!--                 ),                                                     -->
+                    <!--               ),                                                       -->
+                    <!--             ),                                                         -->
+                    <!--           ),                                                           -->
+                    <!--         ),                                                             -->
                     <!--       ),                                                               -->
                     <!--     ),                                                                 -->
                     <!--     alias='bookings_2_weeks_ago',                                      -->
@@ -268,12 +288,6 @@
                                 <!--   WhereFilterSpec(                                               -->
                                 <!--     where_sql='booking__is_instant',                             -->
                                 <!--     bind_parameters=SqlBindParameters(),                         -->
-                                <!--     linkable_specs=(                                             -->
-                                <!--       DimensionSpec(                                             -->
-                                <!--         element_name='is_instant',                               -->
-                                <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                <!--       ),                                                         -->
-                                <!--     ),                                                           -->
                                 <!--     linkable_elements=(                                          -->
                                 <!--       LinkableDimension(                                         -->
                                 <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -290,6 +304,18 @@
                                 <!--         properties=frozenset('LOCAL',),                          -->
                                 <!--       ),                                                         -->
                                 <!--     ),                                                           -->
+                                <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                <!--       dimension_specs=(                                          -->
+                                <!--         DimensionSpec(                                           -->
+                                <!--           element_name='is_instant',                             -->
+                                <!--           entity_links=(                                         -->
+                                <!--             EntityReference(                                     -->
+                                <!--               element_name='booking',                            -->
+                                <!--             ),                                                   -->
+                                <!--           ),                                                     -->
+                                <!--         ),                                                       -->
+                                <!--       ),                                                         -->
+                                <!--     ),                                                           -->
                                 <!--   )                                                              -->
                                 <FilterElementsNode>
                                     <!-- description =                                                     -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfp_0.xml
index 00ef1cf58a..654b0fdff1 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfp_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -57,12 +63,6 @@
                         <!--   WhereFilterSpec(                                               -->
                         <!--     where_sql='booking__is_instant',                             -->
                         <!--     bind_parameters=SqlBindParameters(),                         -->
-                        <!--     linkable_specs=(                                             -->
-                        <!--       DimensionSpec(                                             -->
-                        <!--         element_name='is_instant',                               -->
-                        <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                        <!--       ),                                                         -->
-                        <!--     ),                                                           -->
                         <!--     linkable_elements=(                                          -->
                         <!--       LinkableDimension(                                         -->
                         <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -79,6 +79,18 @@
                         <!--         properties=frozenset('LOCAL',),                          -->
                         <!--       ),                                                         -->
                         <!--     ),                                                           -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                        <!--       dimension_specs=(                                          -->
+                        <!--         DimensionSpec(                                           -->
+                        <!--           element_name='is_instant',                             -->
+                        <!--           entity_links=(                                         -->
+                        <!--             EntityReference(                                     -->
+                        <!--               element_name='booking',                            -->
+                        <!--             ),                                                   -->
+                        <!--           ),                                                     -->
+                        <!--         ),                                                       -->
+                        <!--       ),                                                         -->
+                        <!--     ),                                                           -->
                         <!--   )                                                              -->
                         <FilterElementsNode>
                             <!-- description =                                                                          -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfpo_0.xml
index b7d660433e..749a3094f5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_categorical_pushdown__dfpo_0.xml
@@ -12,12 +12,6 @@
             <!--       WhereFilterSpec(                                               -->
             <!--         where_sql='booking__is_instant',                             -->
             <!--         bind_parameters=SqlBindParameters(),                         -->
-            <!--         linkable_specs=(                                             -->
-            <!--           DimensionSpec(                                             -->
-            <!--             element_name='is_instant',                               -->
-            <!--             entity_links=(EntityReference(element_name='booking'),), -->
-            <!--           ),                                                         -->
-            <!--         ),                                                           -->
             <!--         linkable_elements=(                                          -->
             <!--           LinkableDimension(                                         -->
             <!--             defined_in_semantic_model=SemanticModelReference(        -->
@@ -34,6 +28,18 @@
             <!--             properties=frozenset('LOCAL',),                          -->
             <!--           ),                                                         -->
             <!--         ),                                                           -->
+            <!--         linkable_spec_set=LinkableSpecSet(                           -->
+            <!--           dimension_specs=(                                          -->
+            <!--             DimensionSpec(                                           -->
+            <!--               element_name='is_instant',                             -->
+            <!--               entity_links=(                                         -->
+            <!--                 EntityReference(                                     -->
+            <!--                   element_name='booking',                            -->
+            <!--                 ),                                                   -->
+            <!--               ),                                                     -->
+            <!--             ),                                                       -->
+            <!--           ),                                                         -->
+            <!--         ),                                                           -->
             <!--       ),                                                             -->
             <!--     ),                                                               -->
             <!--   )                                                                  -->
@@ -93,12 +99,6 @@
                                     <!--   WhereFilterSpec(                                               -->
                                     <!--     where_sql='booking__is_instant',                             -->
                                     <!--     bind_parameters=SqlBindParameters(),                         -->
-                                    <!--     linkable_specs=(                                             -->
-                                    <!--       DimensionSpec(                                             -->
-                                    <!--         element_name='is_instant',                               -->
-                                    <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                                    <!--       ),                                                         -->
-                                    <!--     ),                                                           -->
                                     <!--     linkable_elements=(                                          -->
                                     <!--       LinkableDimension(                                         -->
                                     <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -115,6 +115,18 @@
                                     <!--         properties=frozenset('LOCAL',),                          -->
                                     <!--       ),                                                         -->
                                     <!--     ),                                                           -->
+                                    <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                                    <!--       dimension_specs=(                                          -->
+                                    <!--         DimensionSpec(                                           -->
+                                    <!--           element_name='is_instant',                             -->
+                                    <!--           entity_links=(                                         -->
+                                    <!--             EntityReference(                                     -->
+                                    <!--               element_name='booking',                            -->
+                                    <!--             ),                                                   -->
+                                    <!--           ),                                                     -->
+                                    <!--         ),                                                       -->
+                                    <!--       ),                                                         -->
+                                    <!--     ),                                                           -->
                                     <!--   )                                                              -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = "Metric Time Dimension 'ds'" -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfp_0.xml
index c5d93e64db..5f2249ddf6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfp_0.xml
@@ -5,35 +5,40 @@
         <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 = '2024-01-01'",                           -->
-            <!--         bind_parameters=SqlBindParameters(),                                   -->
-            <!--         linkable_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('METRIC_TIME',),                              -->
-            <!--             time_granularity=DAY,                                              -->
-            <!--           ),                                                                   -->
-            <!--         ),                                                                     -->
-            <!--       ),                                                                       -->
-            <!--     ),                                                                         -->
-            <!--   )                                                                            -->
+            <!-- metric_spec =                                                       -->
+            <!--   MetricSpec(                                                       -->
+            <!--     element_name='bookings',                                        -->
+            <!--     filter_specs=(                                                  -->
+            <!--       WhereFilterSpec(                                              -->
+            <!--         where_sql="metric_time__day = '2024-01-01'",                -->
+            <!--         bind_parameters=SqlBindParameters(),                        -->
+            <!--         linkable_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_specs=(                                    -->
+            <!--             TimeDimensionSpec(                                      -->
+            <!--               element_name='metric_time',                           -->
+            <!--               time_granularity=DAY,                                 -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--       ),                                                            -->
+            <!--     ),                                                              -->
+            <!--   )                                                                 -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_0') -->
@@ -50,28 +55,35 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_0') -->
-                        <!-- where_condition =                                                                          -->
-                        <!--   WhereFilterSpec(                                                                         -->
-                        <!--     where_sql="metric_time__day = '2024-01-01'",                                           -->
-                        <!--     bind_parameters=SqlBindParameters(),                                                   -->
-                        <!--     linkable_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
-                        <!--     linkable_elements=(                                                                    -->
-                        <!--       LinkableDimension(                                                                   -->
-                        <!--         defined_in_semantic_model=SemanticModelReference(                                  -->
-                        <!--           semantic_model_name='bookings_source',                                           -->
-                        <!--         ),                                                                                 -->
-                        <!--         element_name='metric_time',                                                        -->
-                        <!--         dimension_type=TIME,                                                               -->
-                        <!--         join_path=SemanticModelJoinPath(                                                   -->
-                        <!--           left_semantic_model_reference=SemanticModelReference(                            -->
-                        <!--             semantic_model_name='bookings_source',                                         -->
-                        <!--           ),                                                                               -->
-                        <!--         ),                                                                                 -->
-                        <!--         properties=frozenset('METRIC_TIME',),                                              -->
-                        <!--         time_granularity=DAY,                                                              -->
-                        <!--       ),                                                                                   -->
-                        <!--     ),                                                                                     -->
-                        <!--   )                                                                                        -->
+                        <!-- where_condition =                                               -->
+                        <!--   WhereFilterSpec(                                              -->
+                        <!--     where_sql="metric_time__day = '2024-01-01'",                -->
+                        <!--     bind_parameters=SqlBindParameters(),                        -->
+                        <!--     linkable_elements=(                                         -->
+                        <!--       LinkableDimension(                                        -->
+                        <!--         defined_in_semantic_model=SemanticModelReference(       -->
+                        <!--           semantic_model_name='bookings_source',                -->
+                        <!--         ),                                                      -->
+                        <!--         element_name='metric_time',                             -->
+                        <!--         dimension_type=TIME,                                    -->
+                        <!--         join_path=SemanticModelJoinPath(                        -->
+                        <!--           left_semantic_model_reference=SemanticModelReference( -->
+                        <!--             semantic_model_name='bookings_source',              -->
+                        <!--           ),                                                    -->
+                        <!--         ),                                                      -->
+                        <!--         properties=frozenset('METRIC_TIME',),                   -->
+                        <!--         time_granularity=DAY,                                   -->
+                        <!--       ),                                                        -->
+                        <!--     ),                                                          -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                        <!--       time_dimension_specs=(                                    -->
+                        <!--         TimeDimensionSpec(                                      -->
+                        <!--           element_name='metric_time',                           -->
+                        <!--           time_granularity=DAY,                                 -->
+                        <!--         ),                                                      -->
+                        <!--       ),                                                        -->
+                        <!--     ),                                                          -->
+                        <!--   )                                                             -->
                         <FilterElementsNode>
                             <!-- description =                                                                       -->
                             <!--   "Pass Only Elements: ['bookings', 'listing__country_latest', 'metric_time__day']" -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfpo_0.xml
index 78a2110fea..8d1a057c86 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_simple_join_metric_time_pushdown_with_two_targets__dfpo_0.xml
@@ -5,35 +5,40 @@
         <ComputeMetricsNode>
             <!-- description = 'Compute Metrics via Expressions' -->
             <!-- node_id = NodeId(id_str='cm_1') -->
-            <!-- metric_spec =                                                                  -->
-            <!--   MetricSpec(                                                                  -->
-            <!--     element_name='bookings',                                                   -->
-            <!--     filter_specs=(                                                             -->
-            <!--       WhereFilterSpec(                                                         -->
-            <!--         where_sql="metric_time__day = '2024-01-01'",                           -->
-            <!--         bind_parameters=SqlBindParameters(),                                   -->
-            <!--         linkable_specs=(                                                       -->
-            <!--           TimeDimensionSpec(element_name='metric_time', time_granularity=DAY), -->
-            <!--         ),                                                                     -->
-            <!--         linkable_elements=(                                                    -->
-            <!--           LinkableDimension(                                                   -->
-            <!--             defined_in_semantic_model=SemanticModelReference(                  -->
-            <!--               semantic_model_name='bookings_source',                           -->
-            <!--             ),                                                                 -->
-            <!--             element_name='metric_time',                                        -->
-            <!--             dimension_type=TIME,                                               -->
-            <!--             join_path=SemanticModelJoinPath(                                   -->
-            <!--               left_semantic_model_reference=SemanticModelReference(            -->
-            <!--                 semantic_model_name='bookings_source',                         -->
-            <!--               ),                                                               -->
-            <!--             ),                                                                 -->
-            <!--             properties=frozenset('METRIC_TIME',),                              -->
-            <!--             time_granularity=DAY,                                              -->
-            <!--           ),                                                                   -->
-            <!--         ),                                                                     -->
-            <!--       ),                                                                       -->
-            <!--     ),                                                                         -->
-            <!--   )                                                                            -->
+            <!-- metric_spec =                                                       -->
+            <!--   MetricSpec(                                                       -->
+            <!--     element_name='bookings',                                        -->
+            <!--     filter_specs=(                                                  -->
+            <!--       WhereFilterSpec(                                              -->
+            <!--         where_sql="metric_time__day = '2024-01-01'",                -->
+            <!--         bind_parameters=SqlBindParameters(),                        -->
+            <!--         linkable_elements=(                                         -->
+            <!--           LinkableDimension(                                        -->
+            <!--             defined_in_semantic_model=SemanticModelReference(       -->
+            <!--               semantic_model_name='bookings_source',                -->
+            <!--             ),                                                      -->
+            <!--             element_name='metric_time',                             -->
+            <!--             dimension_type=TIME,                                    -->
+            <!--             join_path=SemanticModelJoinPath(                        -->
+            <!--               left_semantic_model_reference=SemanticModelReference( -->
+            <!--                 semantic_model_name='bookings_source',              -->
+            <!--               ),                                                    -->
+            <!--             ),                                                      -->
+            <!--             properties=frozenset('METRIC_TIME',),                   -->
+            <!--             time_granularity=DAY,                                   -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--         linkable_spec_set=LinkableSpecSet(                          -->
+            <!--           time_dimension_specs=(                                    -->
+            <!--             TimeDimensionSpec(                                      -->
+            <!--               element_name='metric_time',                           -->
+            <!--               time_granularity=DAY,                                 -->
+            <!--             ),                                                      -->
+            <!--           ),                                                        -->
+            <!--         ),                                                          -->
+            <!--       ),                                                            -->
+            <!--     ),                                                              -->
+            <!--   )                                                                 -->
             <AggregateMeasuresNode>
                 <!-- description = 'Aggregate Measures' -->
                 <!-- node_id = NodeId(id_str='am_1') -->
@@ -50,28 +55,35 @@
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_1') -->
-                        <!-- where_condition =                                                                          -->
-                        <!--   WhereFilterSpec(                                                                         -->
-                        <!--     where_sql="metric_time__day = '2024-01-01'",                                           -->
-                        <!--     bind_parameters=SqlBindParameters(),                                                   -->
-                        <!--     linkable_specs=(TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),), -->
-                        <!--     linkable_elements=(                                                                    -->
-                        <!--       LinkableDimension(                                                                   -->
-                        <!--         defined_in_semantic_model=SemanticModelReference(                                  -->
-                        <!--           semantic_model_name='bookings_source',                                           -->
-                        <!--         ),                                                                                 -->
-                        <!--         element_name='metric_time',                                                        -->
-                        <!--         dimension_type=TIME,                                                               -->
-                        <!--         join_path=SemanticModelJoinPath(                                                   -->
-                        <!--           left_semantic_model_reference=SemanticModelReference(                            -->
-                        <!--             semantic_model_name='bookings_source',                                         -->
-                        <!--           ),                                                                               -->
-                        <!--         ),                                                                                 -->
-                        <!--         properties=frozenset('METRIC_TIME',),                                              -->
-                        <!--         time_granularity=DAY,                                                              -->
-                        <!--       ),                                                                                   -->
-                        <!--     ),                                                                                     -->
-                        <!--   )                                                                                        -->
+                        <!-- where_condition =                                               -->
+                        <!--   WhereFilterSpec(                                              -->
+                        <!--     where_sql="metric_time__day = '2024-01-01'",                -->
+                        <!--     bind_parameters=SqlBindParameters(),                        -->
+                        <!--     linkable_elements=(                                         -->
+                        <!--       LinkableDimension(                                        -->
+                        <!--         defined_in_semantic_model=SemanticModelReference(       -->
+                        <!--           semantic_model_name='bookings_source',                -->
+                        <!--         ),                                                      -->
+                        <!--         element_name='metric_time',                             -->
+                        <!--         dimension_type=TIME,                                    -->
+                        <!--         join_path=SemanticModelJoinPath(                        -->
+                        <!--           left_semantic_model_reference=SemanticModelReference( -->
+                        <!--             semantic_model_name='bookings_source',              -->
+                        <!--           ),                                                    -->
+                        <!--         ),                                                      -->
+                        <!--         properties=frozenset('METRIC_TIME',),                   -->
+                        <!--         time_granularity=DAY,                                   -->
+                        <!--       ),                                                        -->
+                        <!--     ),                                                          -->
+                        <!--     linkable_spec_set=LinkableSpecSet(                          -->
+                        <!--       time_dimension_specs=(                                    -->
+                        <!--         TimeDimensionSpec(                                      -->
+                        <!--           element_name='metric_time',                           -->
+                        <!--           time_granularity=DAY,                                 -->
+                        <!--         ),                                                      -->
+                        <!--       ),                                                        -->
+                        <!--     ),                                                          -->
+                        <!--   )                                                             -->
                         <FilterElementsNode>
                             <!-- description =                                                                       -->
                             <!--   "Pass Only Elements: ['bookings', 'listing__country_latest', 'metric_time__day']" -->
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 25dd48aa97..0aaf6df1f0 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
@@ -51,12 +51,6 @@
                             <!--   WhereFilterSpec(                                               -->
                             <!--     where_sql='booking__is_instant',                             -->
                             <!--     bind_parameters=SqlBindParameters(),                         -->
-                            <!--     linkable_specs=(                                             -->
-                            <!--       DimensionSpec(                                             -->
-                            <!--         element_name='is_instant',                               -->
-                            <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                            <!--       ),                                                         -->
-                            <!--     ),                                                           -->
                             <!--     linkable_elements=(                                          -->
                             <!--       LinkableDimension(                                         -->
                             <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -73,6 +67,18 @@
                             <!--         properties=frozenset('LOCAL',),                          -->
                             <!--       ),                                                         -->
                             <!--     ),                                                           -->
+                            <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                            <!--       dimension_specs=(                                          -->
+                            <!--         DimensionSpec(                                           -->
+                            <!--           element_name='is_instant',                             -->
+                            <!--           entity_links=(                                         -->
+                            <!--             EntityReference(                                     -->
+                            <!--               element_name='booking',                            -->
+                            <!--             ),                                                   -->
+                            <!--           ),                                                     -->
+                            <!--         ),                                                       -->
+                            <!--       ),                                                         -->
+                            <!--     ),                                                           -->
                             <!--   )                                                              -->
                             <FilterElementsNode>
                                 <!-- description =                                                                        -->
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 c85ce86aca..2e687c4068 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
@@ -51,12 +51,6 @@
                             <!--   WhereFilterSpec(                                               -->
                             <!--     where_sql='booking__is_instant',                             -->
                             <!--     bind_parameters=SqlBindParameters(),                         -->
-                            <!--     linkable_specs=(                                             -->
-                            <!--       DimensionSpec(                                             -->
-                            <!--         element_name='is_instant',                               -->
-                            <!--         entity_links=(EntityReference(element_name='booking'),), -->
-                            <!--       ),                                                         -->
-                            <!--     ),                                                           -->
                             <!--     linkable_elements=(                                          -->
                             <!--       LinkableDimension(                                         -->
                             <!--         defined_in_semantic_model=SemanticModelReference(        -->
@@ -73,6 +67,18 @@
                             <!--         properties=frozenset('LOCAL',),                          -->
                             <!--       ),                                                         -->
                             <!--     ),                                                           -->
+                            <!--     linkable_spec_set=LinkableSpecSet(                           -->
+                            <!--       dimension_specs=(                                          -->
+                            <!--         DimensionSpec(                                           -->
+                            <!--           element_name='is_instant',                             -->
+                            <!--           entity_links=(                                         -->
+                            <!--             EntityReference(                                     -->
+                            <!--               element_name='booking',                            -->
+                            <!--             ),                                                   -->
+                            <!--           ),                                                     -->
+                            <!--         ),                                                       -->
+                            <!--       ),                                                         -->
+                            <!--     ),                                                           -->
                             <!--   )                                                              -->
                             <FilterElementsNode>
                                 <!-- description =                                                                        -->