diff --git a/package-shared/types/index.d.ts b/package-shared/types/index.d.ts
index 320da78..9ab5ad3 100644
--- a/package-shared/types/index.d.ts
+++ b/package-shared/types/index.d.ts
@@ -1153,14 +1153,15 @@ export type ServerQueryParam = {
     [key: string]: any;
 };
 
-export type ServerQueryQueryObject = {
-    [key: string]: {
-        value: string | string[];
-        operator?: "AND" | "OR";
-        equality?: "EQUAL" | "LIKE";
-        tableName?: string;
+export type ServerQueryQueryObject<T extends object = { [key: string]: any }> =
+    {
+        [key in keyof T]: {
+            value: string | string[];
+            operator?: "AND" | "OR";
+            equality?: "EQUAL" | "LIKE";
+            tableName?: string;
+        };
     };
-};
 
 export type FetchDataParams = {
     path: string;
diff --git a/package.json b/package.json
index 96d4836..818b107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "2.5.4",
+    "version": "2.5.6",
     "description": "Cloud-based SQL data management tool",
     "main": "index.js",
     "bin": {