diff --git a/RqliteDotnet/IRqliteClient.cs b/RqliteDotnet/IRqliteClient.cs
index a885055..53330b7 100644
--- a/RqliteDotnet/IRqliteClient.cs
+++ b/RqliteDotnet/IRqliteClient.cs
@@ -17,7 +17,7 @@ public interface IRqliteClient
     /// <param name="level"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<QueryResults> Query(string query, ReadLevel level, CancellationToken cancellationToken);
+    Task<QueryResults?> Query(string query, ReadLevel level, CancellationToken cancellationToken);
 
     /// <summary>
     /// Execute command and return result
diff --git a/RqliteDotnet/IRqliteOrmClient.cs b/RqliteDotnet/IRqliteOrmClient.cs
new file mode 100644
index 0000000..dafe198
--- /dev/null
+++ b/RqliteDotnet/IRqliteOrmClient.cs
@@ -0,0 +1,18 @@
+using RqliteDotnet.Dto;
+
+namespace RqliteDotnet;
+
+public interface IRqliteOrmClient : IRqliteClient
+{
+    /// <summary>
+    /// Query Rqlite DB and return result as an instance of T
+    /// </summary>
+    /// <param name="query">Query to execute</param>
+    /// <typeparam name="T">Type of result object</typeparam>
+    /// <returns></returns>
+    Task<List<T>> Query<T>(string query) where T: new();
+
+    Task<List<U>> QueryParams<T, U>(string query, CancellationToken cancellationToken, params T[] qps) 
+        where T: QueryParameter 
+        where U : new();
+}
\ No newline at end of file
diff --git a/RqliteDotnet/RqliteClient.cs b/RqliteDotnet/RqliteClient.cs
index 218cac1..d69745a 100644
--- a/RqliteDotnet/RqliteClient.cs
+++ b/RqliteDotnet/RqliteClient.cs
@@ -1,12 +1,6 @@
 using RqliteDotnet.Dto;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net.Http;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 
 namespace RqliteDotnet;
 
@@ -33,7 +27,7 @@ public async Task<string> Ping(CancellationToken cancellationToken = default)
     }
     
     /// <inheritdoc />
-    public async Task<QueryResults> Query(string query, ReadLevel level = ReadLevel.Default, CancellationToken cancellationToken = default)
+    public async Task<QueryResults?> Query(string query, ReadLevel level = ReadLevel.Default, CancellationToken cancellationToken = default)
     {
         var url = UrlBuilder.Build("/db/query?timings", query, level);
 
diff --git a/RqliteDotnet/RqliteOrmClient.cs b/RqliteDotnet/RqliteOrmClient.cs
index 4cee832..e792417 100644
--- a/RqliteDotnet/RqliteOrmClient.cs
+++ b/RqliteDotnet/RqliteOrmClient.cs
@@ -3,33 +3,13 @@
 
 namespace RqliteDotnet;
 
-public interface IRqliteOrmClient : IRqliteClient
-{
-    /// <summary>
-    /// Query Rqlite DB and return result as an instance of T
-    /// </summary>
-    /// <param name="query">Query to execute</param>
-    /// <typeparam name="T">Type of result object</typeparam>
-    /// <returns></returns>
-    Task<List<T>> Query<T>(string query) where T: new();
-
-    Task<List<U>> QueryParams<T, U>(string query, CancellationToken cancellationToken, params T[] qps) 
-        where T: QueryParameter 
-        where U : new();
-}
-
 public class RqliteOrmClient : RqliteClient, IRqliteOrmClient
 {
     public RqliteOrmClient(HttpClient client) : base(client) { }
 
     public RqliteOrmClient(string uri, HttpClient? client = null) : base(uri, client) {}
 
-    /// <summary>
-    /// Query Rqlite DB and return result as an instance of T
-    /// </summary>
-    /// <param name="query">Query to execute</param>
-    /// <typeparam name="T">Type of result object</typeparam>
-    /// <returns></returns>
+    /// <inheritdoc />
     public async Task<List<T>> Query<T>(string query) where T : new()
     {
         var response = await Query(query);