diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/script-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/script-tree.server.data-source.ts
index f5b97ac89d..2deac73a04 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/script-tree.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/script-tree.server.data-source.ts
@@ -1,7 +1,7 @@
-import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
+import { UmbPartialViewTreeItemModel } from './types.js';
+import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree';
 import { FileSystemTreeItemPresentationModel, PartialViewResource } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 
 /**
  * A data source for the PartialView tree that fetches data from the server
@@ -9,50 +9,40 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbPartialViewTreeServerDataSource
  * @implements {UmbTreeDataSource}
  */
-export class UmbPartialViewTreeServerDataSource implements UmbTreeDataSource<FileSystemTreeItemPresentationModel> {
-	#host: UmbControllerHost;
-
+export class UmbPartialViewTreeServerDataSource extends UmbTreeServerDataSourceBase<
+	FileSystemTreeItemPresentationModel,
+	UmbPartialViewTreeItemModel
+> {
 	/**
 	 * Creates an instance of UmbPartialViewTreeServerDataSource.
 	 * @param {UmbControllerHost} host
 	 * @memberof UmbPartialViewTreeServerDataSource
 	 */
 	constructor(host: UmbControllerHost) {
-		this.#host = host;
-	}
-
-	/**
-	 * Fetches the root items for the tree from the server
-	 * @return {*}
-	 * @memberof UmbPartialViewTreeServerDataSource
-	 */
-	async getRootItems() {
-		return tryExecuteAndNotify(this.#host, PartialViewResource.getTreePartialViewRoot({}));
-	}
-
-	/**
-	 * Fetches the children of a given parent path from the server
-	 * @param {(string)} parentPath
-	 * @return {*}
-	 * @memberof UmbPartialViewTreeServerDataSource
-	 */
-	async getChildrenOf(parentPath: string | null) {
-		/* TODO: should we make getRootItems() internal
-		so it only is a server concern that there are two endpoints? */
-		if (parentPath === null) {
-			return this.getRootItems();
-		} else {
-			return tryExecuteAndNotify(
-				this.#host,
-				PartialViewResource.getTreePartialViewChildren({
-					path: parentPath,
-				}),
-			);
-		}
-	}
-
-	// TODO: remove when interface is cleaned up
-	async getItems(unique: Array<string>): Promise<any> {
-		throw new Error('Dot not use this method. Use the item source instead');
+		super(host, {
+			getChildrenOf,
+			mapper,
+		});
 	}
 }
+
+const getChildrenOf = (parentUnique: string | null) => {
+	if (parentUnique === null) {
+		return PartialViewResource.getTreePartialViewRoot({});
+	} else {
+		return PartialViewResource.getTreePartialViewChildren({
+			path: parentUnique,
+		});
+	}
+};
+
+const mapper = (item: FileSystemTreeItemPresentationModel): UmbPartialViewTreeItemModel => {
+	return {
+		path: item.path!,
+		name: item.name!,
+		type: 'partial-view',
+		isFolder: item.isFolder!,
+		hasChildren: item.hasChildren!,
+		isContainer: false,
+	};
+};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts
index 7bfcdbc398..4afebc951b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts
@@ -1,7 +1,7 @@
-import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
+import { UmbScriptTreeItemModel } from './types.js';
+import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree';
 import { FileSystemTreeItemPresentationModel, ScriptResource } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 
 /**
  * A data source for the Script tree that fetches data from the server
@@ -9,50 +9,40 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbScriptTreeServerDataSource
  * @implements {UmbTreeDataSource}
  */
-export class UmbScriptTreeServerDataSource implements UmbTreeDataSource<FileSystemTreeItemPresentationModel> {
-	#host: UmbControllerHost;
-
+export class UmbScriptTreeServerDataSource extends UmbTreeServerDataSourceBase<
+	FileSystemTreeItemPresentationModel,
+	UmbScriptTreeItemModel
+> {
 	/**
 	 * Creates an instance of UmbScriptTreeServerDataSource.
 	 * @param {UmbControllerHost} host
 	 * @memberof UmbScriptTreeServerDataSource
 	 */
 	constructor(host: UmbControllerHost) {
-		this.#host = host;
-	}
-
-	/**
-	 * Fetches the root items for the tree from the server
-	 * @return {*}
-	 * @memberof UmbScriptTreeServerDataSource
-	 */
-	async getRootItems() {
-		return tryExecuteAndNotify(this.#host, ScriptResource.getTreeScriptRoot({}));
-	}
-
-	/**
-	 * Fetches the children of a given parent path from the server
-	 * @param {(string)} parentPath
-	 * @return {*}
-	 * @memberof UmbScriptTreeServerDataSource
-	 */
-	async getChildrenOf(parentPath: string | null) {
-		/* TODO: should we make getRootItems() internal
-		so it only is a server concern that there are two endpoints? */
-		if (parentPath === null) {
-			return this.getRootItems();
-		} else {
-			return tryExecuteAndNotify(
-				this.#host,
-				ScriptResource.getTreeScriptChildren({
-					path: parentPath,
-				}),
-			);
-		}
-	}
-
-	// TODO: remove when interface is cleaned up
-	async getItems(unique: Array<string>): Promise<any> {
-		throw new Error('Dot not use this method. Use the item source instead');
+		super(host, {
+			getChildrenOf,
+			mapper,
+		});
 	}
 }
+
+const getChildrenOf = (parentUnique: string | null) => {
+	if (parentUnique === null) {
+		return ScriptResource.getTreeScriptRoot({});
+	} else {
+		return ScriptResource.getTreeScriptChildren({
+			path: parentUnique,
+		});
+	}
+};
+
+const mapper = (item: FileSystemTreeItemPresentationModel): UmbScriptTreeItemModel => {
+	return {
+		path: item.path!,
+		name: item.name!,
+		type: 'script',
+		isFolder: item.isFolder!,
+		hasChildren: item.hasChildren!,
+		isContainer: false,
+	};
+};