diff --git a/packages/frontend-core/src/constants.ts b/packages/frontend-core/src/constants.ts
index 8a39e8c106..907d91825f 100644
--- a/packages/frontend-core/src/constants.ts
+++ b/packages/frontend-core/src/constants.ts
@@ -32,8 +32,8 @@ export const Cookies = {
 }
 
 // Table names
-export const TableNames = {
-  USERS: "ta_users",
+export const enum TableNames {
+  USERS = "ta_users",
 }
 
 export const BudibaseRoles = {
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.ts b/packages/frontend-core/src/fetch/GroupUserFetch.ts
index 2f5cacd1a2..bc7688330a 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.ts
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.ts
@@ -8,16 +8,16 @@ interface GroupUserQuery {
   emailSearch: string
 }
 
+interface GroupUserDatasource {
+  tableId: TableNames.USERS
+}
+
 export default class GroupUserFetch extends DataFetch<
-  any,
-  any,
+  GroupUserDatasource,
+  {},
   GroupUserQuery
 > {
-  constructor(opts: {
-    API: APIClient
-    datasource: any
-    query: GroupUserQuery
-  }) {
+  constructor(opts: { API: APIClient; query: GroupUserQuery }) {
     super({
       ...opts,
       datasource: {
diff --git a/packages/frontend-core/src/fetch/JSONArrayFetch.ts b/packages/frontend-core/src/fetch/JSONArrayFetch.ts
index a254bc3ae4..f0cbaa87c5 100644
--- a/packages/frontend-core/src/fetch/JSONArrayFetch.ts
+++ b/packages/frontend-core/src/fetch/JSONArrayFetch.ts
@@ -7,10 +7,7 @@ export default class JSONArrayFetch extends FieldFetch {
     // We can then extract their schema as a subset of the table schema.
     try {
       const table = await this.API.fetchTableDefinition(datasource.tableId)
-      const schema: Record<string, any> | null = getJSONArrayDatasourceSchema(
-        table?.schema,
-        datasource
-      )
+      const schema = getJSONArrayDatasourceSchema(table?.schema, datasource)
       return { schema }
     } catch (error) {
       return null