diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index dd582cd3..504a2f71 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit dd582cd36633a9f11eaf322fdfb621fe4ee09c08
+Subproject commit 504a2f71aa617718a17e439b5f7f4ea1cca4422b
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
index 60106275..27e0d685 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
@@ -11,7 +11,6 @@
 import lombok.experimental.Accessors;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingFilterField;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
-import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalFilter;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
@@ -26,15 +25,17 @@
 
 public class ConfigServiceSpanFilterConverter {
 
-  private static final ImmutableBiMap<LogicalOperator, SpanProcessingLogicalOperator>
+  private static final ImmutableBiMap<
+          LogicalOperator, org.hypertrace.core.graphql.common.schema.operator.LogicalOperator>
       LOGICAL_OPERATOR_OPERATOR_BI_MAP =
           ImmutableBiMap.of(
               LogicalOperator.LOGICAL_OPERATOR_AND,
-              SpanProcessingLogicalOperator.AND,
+                  org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.AND,
               LogicalOperator.LOGICAL_OPERATOR_OR,
-              SpanProcessingLogicalOperator.OR);
+                  org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.OR);
 
-  private static final ImmutableBiMap<SpanProcessingLogicalOperator, LogicalOperator>
+  private static final ImmutableBiMap<
+          org.hypertrace.core.graphql.common.schema.operator.LogicalOperator, LogicalOperator>
       OPERATOR_LOGICAL_OPERATOR_IMMUTABLE_BI_MAP = LOGICAL_OPERATOR_OPERATOR_BI_MAP.inverse();
 
   private static final ImmutableBiMap<RelationalOperator, SpanProcessingRelationalOperator>
@@ -223,7 +224,7 @@ private static class ConvertedSpanProcessingRelationalFilter
   @Value
   @Accessors(fluent = true)
   private static class ConvertedSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
-    SpanProcessingLogicalOperator logicalOperator;
+    org.hypertrace.core.graphql.common.schema.operator.LogicalOperator logicalOperator;
     List<SpanProcessingRuleFilter> spanFilters;
   }
 
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java
index dfe016ae..67ac993a 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java
@@ -5,8 +5,8 @@
 import lombok.Value;
 import lombok.experimental.Accessors;
 import lombok.extern.jackson.Jacksonized;
+import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
-import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
 
 @Value
@@ -14,6 +14,6 @@
 @Jacksonized
 @Builder
 public class DefaultSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
-  SpanProcessingLogicalOperator logicalOperator;
+  LogicalOperator logicalOperator;
   List<SpanProcessingRuleFilter> spanFilters;
 }
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java
index 260a9368..991b5506 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java
@@ -4,6 +4,7 @@
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
 import java.util.List;
+import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;
 
 @GraphQLName(SpanProcessingLogicalFilter.TYPE_NAME)
 public interface SpanProcessingLogicalFilter {
@@ -15,7 +16,7 @@ public interface SpanProcessingLogicalFilter {
   @GraphQLField
   @GraphQLName(SPAN_PROCESSING_LOGICAL_OPERATOR_KEY)
   @GraphQLNonNull
-  SpanProcessingLogicalOperator logicalOperator();
+  LogicalOperator logicalOperator();
 
   @GraphQLField
   @GraphQLName(SPAN_PROCESSING_FILTERS_KEY)
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java
deleted file mode 100644
index 45d646f2..00000000
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.hypertrace.graphql.spanprocessing.schema.rule.filter;
-
-import graphql.annotations.annotationTypes.GraphQLName;
-
-@GraphQLName(SpanProcessingLogicalOperator.TYPE_NAME)
-public enum SpanProcessingLogicalOperator {
-  AND,
-  OR;
-  static final String TYPE_NAME = "SpanProcessingLogicalOperator";
-}