diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.ts b/packages/frontend-core/src/fetch/GroupUserFetch.ts
index bc7688330a..a14623bfb0 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.ts
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.ts
@@ -1,7 +1,6 @@
 import { get } from "svelte/store"
-import DataFetch from "./DataFetch"
+import DataFetch, { DataFetchParams } from "./DataFetch"
 import { TableNames } from "../constants"
-import { APIClient } from "../api/types"
 
 interface GroupUserQuery {
   groupId: string
@@ -17,7 +16,7 @@ export default class GroupUserFetch extends DataFetch<
   {},
   GroupUserQuery
 > {
-  constructor(opts: { API: APIClient; query: GroupUserQuery }) {
+  constructor(opts: DataFetchParams<GroupUserDatasource, GroupUserQuery>) {
     super({
       ...opts,
       datasource: {
diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
index b865c32d63..8f1ef36cac 100644
--- a/packages/frontend-core/src/fetch/UserFetch.ts
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -1,30 +1,28 @@
 import { get } from "svelte/store"
-import DataFetch from "./DataFetch"
+import DataFetch, { DataFetchParams } from "./DataFetch"
 import { TableNames } from "../constants"
 import { utils } from "@budibase/shared-core"
 import {
   BasicOperator,
   SearchFilters,
   SearchUsersRequest,
-  Table,
 } from "@budibase/types"
-import { APIClient } from "../api/types.js"
 
 interface UserFetchQuery {
   appId: string
   paginated: boolean
 }
 
+interface UserDatasource {
+  tableId: string
+}
+
 export default class UserFetch extends DataFetch<
-  { tableId: string },
+  UserDatasource,
   {},
   UserFetchQuery
 > {
-  constructor(opts: {
-    API: APIClient
-    datasource: Table
-    query: UserFetchQuery
-  }) {
+  constructor(opts: DataFetchParams<UserDatasource, UserFetchQuery>) {
     super({
       ...opts,
       datasource: {
diff --git a/packages/frontend-core/src/fetch/ViewV2Fetch.ts b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
index 3bb04d5bc4..1be1ba295c 100644
--- a/packages/frontend-core/src/fetch/ViewV2Fetch.ts
+++ b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
@@ -12,10 +12,7 @@ export default class ViewV2Fetch extends DataFetch<UIView, ViewV2> {
     }
   }
 
-  async getDefinition(datasource: UIView | null): Promise<ViewV2 | null> {
-    if (!datasource?.id) {
-      return null
-    }
+  async getDefinition(datasource: UIView) {
     try {
       const res = await this.API.viewV2.fetchDefinition(datasource.id)
       return res?.data
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
index 52233bd3fb..1577f76034 100644
--- a/packages/frontend-core/src/fetch/index.ts
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -10,7 +10,7 @@ import UserFetch from "./UserFetch.js"
 import GroupUserFetch from "./GroupUserFetch"
 import CustomFetch from "./CustomFetch"
 import QueryArrayFetch from "./QueryArrayFetch.js"
-import { TableSchema, UIDatasource } from "@budibase/types"
+import { UIDatasource } from "@budibase/types"
 import { APIClient } from "../api/types.js"
 
 const DataFetchMap = {
@@ -59,7 +59,7 @@ export const getDatasourceDefinition = async ({
   datasource,
 }: {
   API: APIClient
-  datasource: UIDatasource
+  datasource: any
 }) => {
   const instance = createEmptyFetchInstance({ API, datasource })
   return await instance?.getDefinition(datasource)
@@ -73,7 +73,7 @@ export const getDatasourceSchema = ({
 }: {
   API: APIClient
   datasource: UIDatasource
-  definition?: { schema?: TableSchema }
+  definition?: any
 }) => {
   const instance = createEmptyFetchInstance({ API, datasource })
   return instance?.getSchema(definition)