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 1e8196b582..d8e2a1299a 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
@@ -29,7 +29,7 @@
                     <!-- where_condition =                                                 -->
                     <!--   WhereFilterSpec(                                                -->
                     <!--     where_sql="listing__country_latest = 'us'",                   -->
-                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                     <!--     linkable_element_unions=(                                     -->
                     <!--       LinkableElementUnion(                                       -->
                     <!--         linkable_dimension=LinkableDimension(                     -->
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 8ca7a32b85..30f666de96 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
@@ -34,7 +34,7 @@
                     <!-- where_condition =                                                 -->
                     <!--   WhereFilterSpec(                                                -->
                     <!--     where_sql="listing__country_latest = 'us'",                   -->
-                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                     <!--     linkable_element_unions=(                                     -->
                     <!--       LinkableElementUnion(                                       -->
                     <!--         linkable_dimension=LinkableDimension(                     -->
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 50316718a8..b93afc97f5 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day = '2020-01-01'",                  -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -58,7 +58,7 @@
                     <!-- where_condition =                                                 -->
                     <!--   WhereFilterSpec(                                                -->
                     <!--     where_sql="metric_time__day = '2020-01-01'",                  -->
-                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                     <!--     linkable_element_unions=(                                     -->
                     <!--       LinkableElementUnion(                                       -->
                     <!--         linkable_dimension=LinkableDimension(                     -->
@@ -121,7 +121,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                  -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 ef4a3fc46d..b25f0bc722 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
@@ -18,7 +18,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='listing__is_lux_latest',                           -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -85,7 +85,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='listing__is_lux_latest',                           -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
@@ -218,7 +218,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='listing__is_lux_latest',                           -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -285,7 +285,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='listing__is_lux_latest',                           -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 fce10fcf79..e159e634bf 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
@@ -18,7 +18,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -76,7 +76,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='booking__is_instant',                              -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 8586871725..9045c108fa 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,28 +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_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',    -->
-                        <!--             ),                           -->
-                        <!--           ),                             -->
-                        <!--         ),                               -->
-                        <!--       ),                                 -->
-                        <!--     ),                                   -->
-                        <!--   )                                      -->
+                        <!-- where_condition =                          -->
+                        <!--   WhereFilterSpec(                         -->
+                        <!--     where_sql='listing__bookings > 2',     -->
+                        <!--     bind_parameters=SqlBindParameterSet(), -->
+                        <!--     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 2a6db6ce4a..9bae6cf886 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,33 +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_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',    -->
-            <!--                 ),                           -->
-            <!--               ),                             -->
-            <!--             ),                               -->
-            <!--           ),                                 -->
-            <!--         ),                                   -->
-            <!--       ),                                     -->
-            <!--     ),                                       -->
-            <!--   )                                          -->
+            <!-- metric_spec =                                  -->
+            <!--   MetricSpec(                                  -->
+            <!--     element_name='listings',                   -->
+            <!--     filter_specs=(                             -->
+            <!--       WhereFilterSpec(                         -->
+            <!--         where_sql='listing__bookings > 2',     -->
+            <!--         bind_parameters=SqlBindParameterSet(), -->
+            <!--         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') -->
@@ -43,28 +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_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',    -->
-                        <!--             ),                           -->
-                        <!--           ),                             -->
-                        <!--         ),                               -->
-                        <!--       ),                                 -->
-                        <!--     ),                                   -->
-                        <!--   )                                      -->
+                        <!-- where_condition =                          -->
+                        <!--   WhereFilterSpec(                         -->
+                        <!--     where_sql='listing__bookings > 2',     -->
+                        <!--     bind_parameters=SqlBindParameterSet(), -->
+                        <!--     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 95f2c0484c..24a27d88ab 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day = '2020-01-01'",                  -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -56,7 +56,7 @@
                 <!--     filter_specs=(                                                    -->
                 <!--       WhereFilterSpec(                                                -->
                 <!--         where_sql="metric_time__day = '2020-01-01'",                  -->
-                <!--         bind_parameters=SqlBindParameters(),                          -->
+                <!--         bind_parameters=SqlBindParameterSet(),                        -->
                 <!--         linkable_element_unions=(                                     -->
                 <!--           LinkableElementUnion(                                       -->
                 <!--             linkable_dimension=LinkableDimension(                     -->
@@ -113,7 +113,7 @@
                             <!-- where_condition =                                                 -->
                             <!--   WhereFilterSpec(                                                -->
                             <!--     where_sql="metric_time__day = '2020-01-01'",                  -->
-                            <!--     bind_parameters=SqlBindParameters(),                          -->
+                            <!--     bind_parameters=SqlBindParameterSet(),                        -->
                             <!--     linkable_element_unions=(                                     -->
                             <!--       LinkableElementUnion(                                       -->
                             <!--         linkable_dimension=LinkableDimension(                     -->
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 452e48a547..ab2c3eac77 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day = '2020-01-01'",                  -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -59,7 +59,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql="metric_time__day = '2020-01-01'",                   -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -115,7 +115,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                  -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
@@ -212,7 +212,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql="metric_time__day = '2020-01-01'",                  -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -267,7 +267,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql="metric_time__day = '2020-01-01'",                  -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 84b8ef2d20..0067230db4 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="listing__country_latest = 'us'",                   -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -78,7 +78,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql="listing__country_latest = 'us'",                   -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 bea1ca13e9..42dfdcfe5c 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day >= '2020-01-01'",                 -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -66,7 +66,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql="metric_time__day >= '2020-01-01'",                 -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 a38f86e1df..608a5fcb02 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="listing__country_latest = 'us'",                   -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -68,7 +68,7 @@
                     <!-- where_condition =                                                 -->
                     <!--   WhereFilterSpec(                                                -->
                     <!--     where_sql="listing__country_latest = 'us'",                   -->
-                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                     <!--     linkable_element_unions=(                                     -->
                     <!--       LinkableElementUnion(                                       -->
                     <!--         linkable_dimension=LinkableDimension(                     -->
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 7ad32f714a..77697b1866 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="visit__referrer_id = '123456'",                    -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -77,7 +77,7 @@
                             <!-- where_condition =                                                 -->
                             <!--   WhereFilterSpec(                                                -->
                             <!--     where_sql="visit__referrer_id = '123456'",                    -->
-                            <!--     bind_parameters=SqlBindParameters(),                          -->
+                            <!--     bind_parameters=SqlBindParameterSet(),                        -->
                             <!--     linkable_element_unions=(                                     -->
                             <!--       LinkableElementUnion(                                       -->
                             <!--         linkable_dimension=LinkableDimension(                     -->
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 d35f059305..c75fda972f 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="visit__referrer_id = '123456'",                    -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -126,7 +126,7 @@
                                         <!-- where_condition =                                                 -->
                                         <!--   WhereFilterSpec(                                                -->
                                         <!--     where_sql="visit__referrer_id = '123456'",                    -->
-                                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                         <!--     linkable_element_unions=(                                     -->
                                         <!--       LinkableElementUnion(                                       -->
                                         <!--         linkable_dimension=LinkableDimension(                     -->
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 c31c343de1..76e16aa54d 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -73,7 +73,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 42a4942691..25ea774cad 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -133,7 +133,7 @@
                                         <!-- where_condition =                                                 -->
                                         <!--   WhereFilterSpec(                                                -->
                                         <!--     where_sql='booking__is_instant',                              -->
-                                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                         <!--     linkable_element_unions=(                                     -->
                                         <!--       LinkableElementUnion(                                       -->
                                         <!--         linkable_dimension=LinkableDimension(                     -->
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 6ddc35d3b2..8e5602f794 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -139,7 +139,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
@@ -276,7 +276,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -356,7 +356,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
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 29aa9318d9..fbe251cceb 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -191,7 +191,7 @@
                                                 <!-- where_condition =                                                 -->
                                                 <!--   WhereFilterSpec(                                                -->
                                                 <!--     where_sql='booking__is_instant',                              -->
-                                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                                 <!--     linkable_element_unions=(                                     -->
                                                 <!--       LinkableElementUnion(                                       -->
                                                 <!--         linkable_dimension=LinkableDimension(                     -->
@@ -275,7 +275,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -355,7 +355,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
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 3da28f6b88..8c8c3ff969 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -105,7 +105,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
@@ -166,7 +166,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
@@ -303,7 +303,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -349,7 +349,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
@@ -410,7 +410,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
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 95f2d06915..76820b6fe0 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -105,7 +105,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
@@ -218,7 +218,7 @@
                                                 <!-- where_condition =                                                 -->
                                                 <!--   WhereFilterSpec(                                                -->
                                                 <!--     where_sql='booking__is_instant',                              -->
-                                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                                 <!--     linkable_element_unions=(                                     -->
                                                 <!--       LinkableElementUnion(                                       -->
                                                 <!--         linkable_dimension=LinkableDimension(                     -->
@@ -302,7 +302,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -348,7 +348,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
@@ -409,7 +409,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
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 c0e8831b43..355f712e74 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -124,7 +124,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='booking__is_instant',                              -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
@@ -257,7 +257,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -322,7 +322,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='booking__is_instant',                              -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 2fe9b2919b..f8f247e6c6 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -61,7 +61,7 @@
                     <!--     filter_specs=(                                                    -->
                     <!--       WhereFilterSpec(                                                -->
                     <!--         where_sql='booking__is_instant',                              -->
-                    <!--         bind_parameters=SqlBindParameters(),                          -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                        -->
                     <!--         linkable_element_unions=(                                     -->
                     <!--           LinkableElementUnion(                                       -->
                     <!--             linkable_dimension=LinkableDimension(                     -->
@@ -176,7 +176,7 @@
                                             <!-- where_condition =                                                 -->
                                             <!--   WhereFilterSpec(                                                -->
                                             <!--     where_sql='booking__is_instant',                              -->
-                                            <!--     bind_parameters=SqlBindParameters(),                          -->
+                                            <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                             <!--     linkable_element_unions=(                                     -->
                                             <!--       LinkableElementUnion(                                       -->
                                             <!--         linkable_dimension=LinkableDimension(                     -->
@@ -256,7 +256,7 @@
                     <!--     filter_specs=(                                                     -->
                     <!--       WhereFilterSpec(                                                 -->
                     <!--         where_sql='booking__is_instant',                               -->
-                    <!--         bind_parameters=SqlBindParameters(),                           -->
+                    <!--         bind_parameters=SqlBindParameterSet(),                         -->
                     <!--         linkable_element_unions=(                                      -->
                     <!--           LinkableElementUnion(                                        -->
                     <!--             linkable_dimension=LinkableDimension(                      -->
@@ -321,7 +321,7 @@
                                 <!-- where_condition =                                                 -->
                                 <!--   WhereFilterSpec(                                                -->
                                 <!--     where_sql='booking__is_instant',                              -->
-                                <!--     bind_parameters=SqlBindParameters(),                          -->
+                                <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                 <!--     linkable_element_unions=(                                     -->
                                 <!--       LinkableElementUnion(                                       -->
                                 <!--         linkable_dimension=LinkableDimension(                     -->
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 2070c49cf8..639c552d11 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -68,7 +68,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql='booking__is_instant',                              -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 33876637a4..ae2023886d 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql='booking__is_instant',                              -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -104,7 +104,7 @@
                                     <!-- where_condition =                                                 -->
                                     <!--   WhereFilterSpec(                                                -->
                                     <!--     where_sql='booking__is_instant',                              -->
-                                    <!--     bind_parameters=SqlBindParameters(),                          -->
+                                    <!--     bind_parameters=SqlBindParameterSet(),                        -->
                                     <!--     linkable_element_unions=(                                     -->
                                     <!--       LinkableElementUnion(                                       -->
                                     <!--         linkable_dimension=LinkableDimension(                     -->
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 a96be3d209..545da298e6 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day = '2024-01-01'",                  -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -66,7 +66,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql="metric_time__day = '2024-01-01'",                  -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 e1a03ea3a2..75de24c97e 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
@@ -11,7 +11,7 @@
             <!--     filter_specs=(                                                    -->
             <!--       WhereFilterSpec(                                                -->
             <!--         where_sql="metric_time__day = '2024-01-01'",                  -->
-            <!--         bind_parameters=SqlBindParameters(),                          -->
+            <!--         bind_parameters=SqlBindParameterSet(),                        -->
             <!--         linkable_element_unions=(                                     -->
             <!--           LinkableElementUnion(                                       -->
             <!--             linkable_dimension=LinkableDimension(                     -->
@@ -66,7 +66,7 @@
                         <!-- where_condition =                                                 -->
                         <!--   WhereFilterSpec(                                                -->
                         <!--     where_sql="metric_time__day = '2024-01-01'",                  -->
-                        <!--     bind_parameters=SqlBindParameters(),                          -->
+                        <!--     bind_parameters=SqlBindParameterSet(),                        -->
                         <!--     linkable_element_unions=(                                     -->
                         <!--       LinkableElementUnion(                                       -->
                         <!--         linkable_dimension=LinkableDimension(                     -->
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 23dcf84f95..ccf4875b6c 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
@@ -58,7 +58,7 @@
                             <!-- where_condition =                                                 -->
                             <!--   WhereFilterSpec(                                                -->
                             <!--     where_sql='booking__is_instant',                              -->
-                            <!--     bind_parameters=SqlBindParameters(),                          -->
+                            <!--     bind_parameters=SqlBindParameterSet(),                        -->
                             <!--     linkable_element_unions=(                                     -->
                             <!--       LinkableElementUnion(                                       -->
                             <!--         linkable_dimension=LinkableDimension(                     -->
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 950ea86ea8..a42e2d5c25 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
@@ -58,7 +58,7 @@
                             <!-- where_condition =                                                 -->
                             <!--   WhereFilterSpec(                                                -->
                             <!--     where_sql='booking__is_instant',                              -->
-                            <!--     bind_parameters=SqlBindParameters(),                          -->
+                            <!--     bind_parameters=SqlBindParameterSet(),                        -->
                             <!--     linkable_element_unions=(                                     -->
                             <!--       LinkableElementUnion(                                       -->
                             <!--         linkable_dimension=LinkableDimension(                     -->