diff --git a/core/src/main/java/org/opensearch/sql/executor/analytics/AnalyticsExecutionEngine.java b/core/src/main/java/org/opensearch/sql/executor/analytics/AnalyticsExecutionEngine.java
index 733c603a76..ad39a025f4 100644
--- a/core/src/main/java/org/opensearch/sql/executor/analytics/AnalyticsExecutionEngine.java
+++ b/core/src/main/java/org/opensearch/sql/executor/analytics/AnalyticsExecutionEngine.java
@@ -82,15 +82,14 @@ public void execute(
   }
 
   /**
-   * Overload that threads a {@link org.opensearch.analytics.QueryRequestContext} snapshot down to
-   * the analytics-engine's plan executor via {@link
-   * org.opensearch.analytics.exec.QueryPlanExecutor}'s opaque context slot. The snapshot is
-   * captured once at query entry so planner and executor see the same cluster state.
+   * Overload that threads a QueryRequestContext snapshot down to the analytics-engine's plan
+   * executor via {@link org.opensearch.analytics.exec.QueryPlanExecutor}'s opaque context slot. The
+   * snapshot is captured once at query entry so planner and executor see the same cluster state.
    */
   public void execute(
       RelNode plan,
       CalcitePlanContext context,
-      org.opensearch.analytics.QueryRequestContext queryCtx,
+      Object queryCtx,
       ResponseListener<QueryResponse> listener) {
     // QueryPlanExecutor became asynchronous in analytics-framework 3.7 — execution is dispatched
     // to a worker pool and results arrive on the listener. Record the execute metric in the
@@ -153,7 +152,7 @@ public void explain(
   public void executeWithProfile(
       RelNode plan,
       CalcitePlanContext context,
-      org.opensearch.analytics.QueryRequestContext queryCtx,
+      Object queryCtx,
       ResponseListener<QueryResponse> listener) {
 
     planExecutor.executeWithProfile(