diff --git a/src/java/org/apache/cassandra/cql3/QueryHandler.java b/src/java/org/apache/cassandra/cql3/QueryHandler.java
index 9637f6e41b..42cb1239fc 100644
--- a/src/java/org/apache/cassandra/cql3/QueryHandler.java
+++ b/src/java/org/apache/cassandra/cql3/QueryHandler.java
@@ -28,16 +28,30 @@ import org.apache.cassandra.service.QueryState;
 import org.apache.cassandra.transport.Dispatcher;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.MD5Digest;
+import org.apache.lucene.analysis.et.EstonianAnalyzer;
 
 public interface QueryHandler
 {
     CQLStatement parse(String queryString, QueryState queryState, QueryOptions options);
 
-    ResultMessage process(CQLStatement statement,
+    @Deprecated
+    default ResultMessage process(CQLStatement statement,
+                                  QueryState state,
+                                  QueryOptions options,
+                                  Map<String, ByteBuffer> customPayload,
+                                  long ignore) throws RequestExecutionException, RequestValidationException
+    {
+        throw new IllegalStateException("Should be overriden");
+    }
+
+    default ResultMessage process(CQLStatement statement,
                           QueryState state,
                           QueryOptions options,
                           Map<String, ByteBuffer> customPayload,
-                          Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException;
+                          Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException
+    {
+        return process(statement, state, options, customPayload, requestTime.startedAtNanos());
+    }
 
     ResultMessage.Prepared prepare(String query,
                                    ClientState clientState,
@@ -45,17 +59,43 @@ public interface QueryHandler
 
     QueryHandler.Prepared getPrepared(MD5Digest id);
 
-    ResultMessage processPrepared(CQLStatement statement,
-                                  QueryState state,
-                                  QueryOptions options,
-                                  Map<String, ByteBuffer> customPayload,
-                                  Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException;
+    @Deprecated
+    default ResultMessage processPrepared(CQLStatement statement,
+                                          QueryState state,
+                                          QueryOptions options,
+                                          Map<String, ByteBuffer> customPayload,
+                                          long ignore) throws RequestExecutionException, RequestValidationException
+    {
+        throw new IllegalStateException("Should be overriden");
+    }
+
+    default ResultMessage processPrepared(CQLStatement statement,
+                                          QueryState state,
+                                          QueryOptions options,
+                                          Map<String, ByteBuffer> customPayload,
+                                          Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException
+    {
+        return processPrepared(statement, state, options, customPayload, requestTime.startedAtNanos());
+    }
 
-    ResultMessage processBatch(BatchStatement statement,
-                               QueryState state,
-                               BatchQueryOptions options,
-                               Map<String, ByteBuffer> customPayload,
-                               Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException;
+    @Deprecated
+    default ResultMessage processBatch(BatchStatement statement,
+                                       QueryState state,
+                                       BatchQueryOptions options,
+                                       Map<String, ByteBuffer> customPayload,
+                                       long ignoreag) throws RequestExecutionException, RequestValidationException
+    {
+        throw new IllegalStateException("Should be overriden");
+    }
+
+    default ResultMessage processBatch(BatchStatement statement,
+                                       QueryState state,
+                                       BatchQueryOptions options,
+                                       Map<String, ByteBuffer> customPayload,
+                                       Dispatcher.RequestTime requestTime) throws RequestExecutionException, RequestValidationException
+    {
+        return processBatch(statement, state, options, customPayload, requestTime.startedAtNanos());
+    }
 
     public static class Prepared
     {