diff --git a/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java b/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java
index 58f23c6a..7de8b15f 100644
--- a/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java
+++ b/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java
@@ -62,8 +62,7 @@ public void close() {
         proxy.close();
     }
 
-    private YdbQuery.TransactionControl mapTxControl(tech.ydb.table.transaction.TxControl<?> tx) {
-        YdbTable.TransactionControl tc = tx.toPb();
+    private YdbQuery.TransactionControl mapTxControl(YdbTable.TransactionControl tc) {
         if (tc.hasTxId()) {
             return TxControl.txIdCtrl(tc.getTxId(), tc.getCommitTx());
         }
@@ -149,13 +148,9 @@ private class TableSession extends BaseSession {
         }
 
         @Override
-        public CompletableFuture<Result<DataQueryResult>> executeDataQuery(
-                String query,
-                tech.ydb.table.transaction.TxControl<?> txControl,
-                Params prms,
-                ExecuteDataQuerySettings settings
-        ) {
-            YdbQuery.TransactionControl tc = mapTxControl(txControl);
+        public CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
+                String query, YdbTable.TransactionControl tx, Params prms, ExecuteDataQuerySettings settings) {
+            YdbQuery.TransactionControl tc = mapTxControl(tx);
             ExecuteQuerySettings qs = ExecuteQuerySettings.newBuilder()
                     .withTraceId(settings.getTraceId())
                     .withRequestTimeout(settings.getTimeoutDuration())
diff --git a/table/src/main/java/tech/ydb/table/impl/BaseSession.java b/table/src/main/java/tech/ydb/table/impl/BaseSession.java
index 87ca9c00..98bbd893 100644
--- a/table/src/main/java/tech/ydb/table/impl/BaseSession.java
+++ b/table/src/main/java/tech/ydb/table/impl/BaseSession.java
@@ -770,7 +770,7 @@ private static YdbTable.TransactionSettings txSettings(Transaction.Mode transact
         return settings.build();
     }
 
-    private CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
+    protected CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
             String query, YdbTable.TransactionControl txControl, Params params, ExecuteDataQuerySettings settings) {
         YdbTable.ExecuteDataQueryRequest.Builder request = YdbTable.ExecuteDataQueryRequest.newBuilder()
                 .setSessionId(id)