diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37efedb..ac10751 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Change Log
 
+#### v1.8.6 - Jan 30, 2024
+
+- added Sample: Asset Workflow with GUI. Allows selecting between CodeSmile and Unity API. Unity API code is 33% more lines/characters, with folder creation hardcoded.
+
 #### v1.8.5 - Jan 29, 2024
 
 - added Asset.File.FindPaths overload accepting Path[]
 - added Asset.Label.GetAll overload accepting Path
 - added Asset.Label.Remove and Asset().RemoveLabel
+- fixed invalid cast exception (Asset.Path[] to string[])
 - removed add sub-asset check for ".asset" extension. Turns out you can also add subassets to a .mesh extension asset and there may be others.
 
 #### v1.8.4 - Jan 24, 2024
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.cs b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs
similarity index 56%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.cs
rename to Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs
index 548e427..61a62db 100644
--- a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.cs
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs
@@ -1,69 +1,20 @@
-// Copyright (C) 2021-2024 Steffen Itterheim
+// Copyright (C) 2021-2024 Steffen Itterheim
 // Refer to included LICENSE file for terms and conditions.
 
 using CodeSmile_AssetDatabase_Demo;
 using CodeSmileEditor;
-using System;
 using System.Collections.Generic;
-using UnityEditor;
 using UnityEngine;
-using UnityEngine.UIElements;
 
-public class CodeSmileAssetDatabaseDemoWindow : EditorWindow
+public partial class AssetDemoWindow
 {
-	private static readonly Asset.Path DemoAssetsPath = "Assets/CodeSmile AssetDatabase Demo Assets/Sample Assets";
-
-	[SerializeField] private VisualTreeAsset m_VisualTreeAsset;
-
-	[MenuItem("Window/CodeSmile/AssetDatabase Examples/Workflow Demo", priority = 2999)]
-	public static void ShowAssetDatabaseDemoWindow()
-	{
-		var wnd = GetWindow<CodeSmileAssetDatabaseDemoWindow>();
-		wnd.titleContent = new GUIContent("CodeSmile AssetDatabase Demo");
-	}
-
-	public void CreateGUI()
-	{
-		var uiBuilderDocument = m_VisualTreeAsset.Instantiate();
-		rootVisualElement.Add(uiBuilderDocument);
-
-		RegisterCallbacks(true);
-	}
-
-	private void OnDestroy() => RegisterCallbacks(false);
-
-	private void RegisterCallbacks(Boolean register)
-	{
-		var createButton = rootVisualElement.Q<Button>("CreateButton");
-		var duplicateButton = rootVisualElement.Q<Button>("DuplicateButton");
-		var duplicateBatchedButton = rootVisualElement.Q<Button>("DuplicateBatchedButton");
-		var deleteAllButton = rootVisualElement.Q<Button>("DeleteAllButton");
-		var deletePathButton = rootVisualElement.Q<Button>("DeletePathButton");
-
-		if (register)
-		{
-			createButton.clicked += OnCreateButtonClicked;
-			duplicateButton.clicked += OnDuplicateButtonClicked;
-			duplicateBatchedButton.clicked += OnDuplicateBatchedButtonClicked;
-			deleteAllButton.clicked += OnDeleteAllButtonClicked;
-			deletePathButton.clicked += OnDeletePathButtonClicked;
-		}
-		else
-		{
-			createButton.clicked -= OnCreateButtonClicked;
-			duplicateButton.clicked -= OnDuplicateButtonClicked;
-			duplicateBatchedButton.clicked -= OnDuplicateBatchedButtonClicked;
-			deleteAllButton.clicked -= OnDeleteAllButtonClicked;
-			deletePathButton.clicked -= OnDeletePathButtonClicked;
-		}
-	}
-
-	private void OnCreateButtonClicked()
+	private void OnCreateButtonClicked_CodeSmile()
 	{
 		var numberOfAssets = 32;
 		for (var i = 0; i < numberOfAssets; i++)
 		{
-			// Let's assume we've generated a wonderful mesh together with an impressive material using a beautiful texture and some scripting
+			// Let's assume we've generated a wonderful mesh together with
+			// an impressive material using a beautiful texture and some scripting
 			var mesh = new Mesh();
 			mesh.name = "A Mesh, that couldn't be any meshier even if it were a net";
 			var texture = new Texture2D(128, 128);
@@ -76,28 +27,31 @@ private void OnCreateButtonClicked()
 			var scriptableObject = CreateInstance<TestAssetSO>();
 			scriptableObject.name = "A script, which is quaranteed 99.9999997% bug-free!";
 
-			// Now we create an asset and stuff it all in there (just for illustration purposes - this asset is totally useless)
+			// Now we create an asset and stuff it all in there for illustration purposes
 			// Note: meshes require the .mesh extension
-			var assetPath = $"{DemoAssetsPath}/Mesh #{i}-{Time.realtimeSinceStartupAsDouble:F3}.mesh";
+			var createTime = $"{Time.realtimeSinceStartupAsDouble:F3}";
+			var assetPath = $"{DemoAssetsPath}/Mesh #{i}-{createTime}.mesh";
+
 			var createdAsset = new Asset(mesh, assetPath);
 			createdAsset.AddSubAsset(texture);
 			createdAsset.AddSubAsset(material);
 			createdAsset.AddSubAsset(animation);
 			createdAsset.AddSubAsset(scriptableObject);
 			createdAsset.AddLabels(new[] { "CodeSmile AssetDatabase", "New-Shiny-DemoAsset" });
-			createdAsset.Save(); // save is needed to write sub assets and labels to disk - creating the asset by itself does NOT need saving
+			// save is needed only to write the post-creation changes (added sub-assets & labels)
+			createdAsset.Save();
 		}
 	}
 
-	private void OnDuplicateButtonClicked()
+	private void OnDuplicateButtonClicked_CodeSmile()
 	{
 		// delete the existing duplicates
-		var dupePaths = Asset.File.FindPaths("l:No-SubAssets-DemoAsset", new[] { DemoAssetsPath });
+		var dupePaths = Asset.File.FindPaths("l:No-SubAssets-DemoAsset", SearchPath);
 		foreach (var dupePath in dupePaths)
 			Asset.File.Delete(dupePath);
 
 		// duplicate assets with sub assets
-		var assetPaths = Asset.File.FindPaths("l:New-Shiny-DemoAsset", new[] { DemoAssetsPath });
+		var assetPaths = Asset.File.FindPaths("l:New-Shiny-DemoAsset", SearchPath);
 		foreach (var assetPath in assetPaths)
 		{
 			var sourceAsset = new Asset(assetPath);
@@ -106,7 +60,8 @@ private void OnDuplicateButtonClicked()
 			if (sourceAsset.VisibleSubAssets.Length > 0)
 			{
 				// create a duplicate
-				var dupePath = $"{DemoAssetsPath}/{assetPath.FileNameWithoutExtension} no sub-assets.mesh";
+				var filenameNoExt = assetPath.FileNameWithoutExtension;
+				var dupePath = $"{DemoAssetsPath}/{filenameNoExt} no sub-assets.mesh";
 				var dupeAsset = sourceAsset.SaveAsNew(dupePath);
 
 				// remove sub-assets from dupe
@@ -114,7 +69,7 @@ private void OnDuplicateButtonClicked()
 					dupeAsset.RemoveSubAsset(subAsset);
 
 				// tag and save the dupe
-				dupeAsset.AddLabels(sourceAsset.Labels);
+				dupeAsset.Labels = sourceAsset.Labels; // restore source labels
 				dupeAsset.RemoveLabel("New-Shiny-DemoAsset");
 				dupeAsset.AddLabel("No-SubAssets-DemoAsset");
 				dupeAsset.Save();
@@ -122,7 +77,7 @@ private void OnDuplicateButtonClicked()
 		}
 	}
 
-	private void OnDuplicateBatchedButtonClicked()
+	private void OnDuplicateBatchedButtonClicked_CodeSmile()
 	{
 		// NOTE: it is common to split batched asset operations in multiple discrete steps due to the fact that
 		// during batch operations the AssetDatabase does not update its internal state. Any asset that gets
@@ -133,7 +88,8 @@ private void OnDuplicateBatchedButtonClicked()
 		// delete any existing duplicates
 		Asset.File.BatchEditing(() =>
 		{
-			var existingDupePaths = Asset.File.FindPaths("l:No-SubAssets-DemoAsset", new[] { DemoAssetsPath });
+			var existingDupePaths =
+				Asset.File.FindPaths("l:No-SubAssets-DemoAsset", SearchPath);
 			foreach (var dupePath in existingDupePaths)
 				Asset.File.Delete(dupePath);
 		});
@@ -143,7 +99,7 @@ private void OnDuplicateBatchedButtonClicked()
 		var dupePaths = new List<Asset.Path>();
 		Asset.File.BatchEditing(() =>
 		{
-			var assetPaths = Asset.File.FindPaths("l:New-Shiny-DemoAsset", new[] { DemoAssetsPath });
+			var assetPaths = Asset.File.FindPaths("l:New-Shiny-DemoAsset", SearchPath);
 			for (var i = 0; i < assetPaths.Length; i++)
 			{
 				var sourcePath = assetPaths[i];
@@ -152,11 +108,11 @@ private void OnDuplicateBatchedButtonClicked()
 				if (Asset.SubAsset.LoadVisible(sourcePath).Length > 0)
 				{
 					var suffix = "no sub-assets";
-					var dupePath = new Asset.Path($"{DemoAssetsPath}/{sourcePath.FileNameWithoutExtension} {suffix}.mesh");
-
+					var filenameNoExt = sourcePath.FileNameWithoutExtension;
+					Asset.Path dupePath = $"{DemoAssetsPath}/{filenameNoExt} {suffix}.mesh";
 					Asset.File.CopyAsNew(sourcePath, dupePath);
 
-					// cannot load newly created assets during batch editing => must defer following operations
+					// must defer loading created assets to post-batchediting
 					sourcePaths.Add(sourcePath);
 					dupePaths.Add(dupePath);
 				}
@@ -174,7 +130,7 @@ private void OnDuplicateBatchedButtonClicked()
 				foreach (var subAsset in dupeAsset.VisibleSubAssets)
 					dupeAsset.RemoveSubAsset(subAsset);
 
-				dupeAsset.AddLabels(Asset.Label.GetAll(sourcePaths[i]));
+				dupeAsset.Labels = Asset.Label.GetAll(sourcePaths[i]); // restore source labels
 				dupeAsset.RemoveLabel("New-Shiny-DemoAsset");
 				dupeAsset.AddLabel("No-SubAssets-DemoAsset");
 				dupeAsset.Save();
@@ -182,19 +138,17 @@ private void OnDuplicateBatchedButtonClicked()
 		});
 	}
 
-	private void OnDeleteAllButtonClicked()
+	private void OnDeleteAllButtonClicked_CodeSmile()
 	{
 		// Uses only the static API as we don't need to work with an Asset instance here
-
-		var folders = new[] { DemoAssetsPath };
-		var paths = Asset.File.FindPaths("l:New-Shiny-DemoAsset l:No-SubAssets-DemoAsset", folders);
-
+		var allDemoAssetsFilter = "l:New-Shiny-DemoAsset l:No-SubAssets-DemoAsset";
+		var paths = Asset.File.FindPaths(allDemoAssetsFilter, SearchPath);
 		Asset.File.Delete(paths);
 	}
 
-	private void OnDeletePathButtonClicked()
+	private void OnDeletePathButtonClicked_CodeSmile()
 	{
-		OnDeleteAllButtonClicked();
+		OnDeleteAllButtonClicked_CodeSmile();
 
 		// also delete the subfolder and its parent folder
 		Asset.File.Delete(DemoAssetsPath);
diff --git a/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs.meta b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs.meta
new file mode 100644
index 0000000..c18a8db
--- /dev/null
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.CodeSmileAPI.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0e390d95a8f142478770dfc8733a0b1b
+timeCreated: 1706616856
\ No newline at end of file
diff --git a/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs
new file mode 100644
index 0000000..ef1e512
--- /dev/null
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs
@@ -0,0 +1,212 @@
+// Copyright (C) 2021-2024 Steffen Itterheim
+// Refer to included LICENSE file for terms and conditions.
+
+using CodeSmile_AssetDatabase_Demo;
+using CodeSmileEditor;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+public partial class AssetDemoWindow
+{
+	private void OnCreateButtonClicked_Unity()
+	{
+		var numberOfAssets = 32;
+		for (var i = 0; i < numberOfAssets; i++)
+		{
+			// Let's assume we've generated a wonderful mesh together with
+			// an impressive material using a beautiful texture and some scripting
+			var mesh = new Mesh();
+			mesh.name = "A Mesh, that couldn't be any meshier even if it were a net";
+			var texture = new Texture2D(128, 128);
+			texture.name = "A texture, so unimaginably beautiful it will melt your eyes";
+			var material = new Material(Shader.Find("Standard"));
+			material.name = "A material, an impressive sight to behold but untouchable";
+			material.mainTexture = texture;
+			var animation = new AnimationClip();
+			animation.name = "An animation clip, totally neither motion-captured nor AI generated";
+			var scriptableObject = CreateInstance<TestAssetSO>();
+			scriptableObject.name = "A script, which is quaranteed 99.9999997% bug-free!";
+
+			// Now we create an asset and stuff it all in there for illustration purposes
+			// Note: meshes require the .mesh extension
+			var parentFolder = Path.GetDirectoryName(DemoAssetsPath);
+			if (AssetDatabase.IsValidFolder(parentFolder) == false)
+			{
+				var folderName = "CodeSmile AssetDatabase Demo Assets";
+				AssetDatabase.CreateFolder("Assets", folderName); // hardcoded!
+			}
+			if (AssetDatabase.IsValidFolder(DemoAssetsPath) == false)
+				AssetDatabase.CreateFolder(parentFolder, "Sample Assets"); // hardcoded!
+
+			var createTime = $"{Time.realtimeSinceStartupAsDouble:F3}";
+			var assetPath = $"{DemoAssetsPath}/Mesh #{i}-{createTime}.mesh";
+
+			AssetDatabase.CreateAsset(mesh, assetPath);
+			AssetDatabase.AddObjectToAsset(texture, mesh);
+			AssetDatabase.AddObjectToAsset(material, mesh);
+			AssetDatabase.AddObjectToAsset(animation, mesh);
+			AssetDatabase.AddObjectToAsset(scriptableObject, mesh);
+			AssetDatabase.SetLabels(mesh,
+				new[] { "CodeSmile AssetDatabase", "New-Shiny-DemoAsset" });
+			// save is needed only to write the post-creation changes (added sub-assets & labels)
+			AssetDatabase.SaveAssetIfDirty(mesh);
+		}
+	}
+
+	private void OnDuplicateButtonClicked_Unity()
+	{
+		// delete the existing duplicates
+		var dupeGuids = AssetDatabase.FindAssets("l:No-SubAssets-DemoAsset", SearchPathStr);
+		foreach (var dupeGuid in dupeGuids)
+		{
+			var dupePath = AssetDatabase.GUIDToAssetPath(dupeGuid);
+			AssetDatabase.DeleteAsset(dupePath);
+		}
+
+		// duplicate assets with sub assets
+		var assetGuids = AssetDatabase.FindAssets("l:New-Shiny-DemoAsset", SearchPathStr);
+		foreach (var assetGuid in assetGuids)
+		{
+			var assetPath = AssetDatabase.GUIDToAssetPath(assetGuid);
+
+			// only duplicate those with (visible in project view) sub-assets
+			var visibleSubAssets = AssetDatabase.LoadAllAssetRepresentationsAtPath(assetPath);
+			if (visibleSubAssets.Length > 0)
+			{
+				// create a duplicate
+				var filenameNoExt = Path.GetFileNameWithoutExtension(assetPath);
+				var dupePath = $"{DemoAssetsPath}/{filenameNoExt} no sub-assets.mesh";
+				dupePath = AssetDatabase.GenerateUniqueAssetPath(dupePath);
+				AssetDatabase.CopyAsset(assetPath, dupePath);
+
+				// remove sub-assets from dupe
+				var dupeAsset = AssetDatabase.LoadMainAssetAtPath(dupePath);
+				var dupeSubAssets = AssetDatabase.LoadAllAssetRepresentationsAtPath(dupePath);
+				foreach (var subAsset in dupeSubAssets)
+					AssetDatabase.RemoveObjectFromAsset(subAsset);
+
+				// tag and save the dupe
+				var sourceLabels =
+					AssetDatabase.GetLabels(new GUID(assetGuid)); // get labels from path? Nope
+				var labels = sourceLabels.ToList();
+				labels.Remove("New-Shiny-DemoAsset");
+				labels.Add("No-SubAssets-DemoAsset");
+				AssetDatabase.SetLabels(dupeAsset, labels.ToArray());
+				AssetDatabase.SaveAssetIfDirty(dupeAsset);
+			}
+		}
+	}
+
+	private void OnDuplicateBatchedButtonClicked_Unity()
+	{
+		// NOTE: it is common to split batched asset operations in multiple discrete steps due to the fact that
+		// during batch operations the AssetDatabase does not update its internal state. Any asset that gets
+		// created or delete cannot be imported, therefore any operations on such an asset will have to be split.
+		// This is even the case for deleting an asset and then trying to create a new one in its place!
+		// Sure, the code is longer and more complex, but the execution speed goes up quite noticably. Value the user's time!
+
+		// delete any existing duplicates
+		try
+		{
+			AssetDatabase.StartAssetEditing();
+
+			var existingDupeGuids =
+				AssetDatabase.FindAssets("l:No-SubAssets-DemoAsset", SearchPathStr);
+			foreach (var dupeGuid in existingDupeGuids)
+			{
+				var path = AssetDatabase.GUIDToAssetPath(dupeGuid);
+				AssetDatabase.DeleteAsset(path);
+			}
+		}
+		finally
+		{
+			AssetDatabase.StopAssetEditing();
+		}
+
+		// duplicate the assets
+		var sourcePaths = new List<Asset.Path>();
+		var dupePaths = new List<Asset.Path>();
+		try
+		{
+			AssetDatabase.StartAssetEditing();
+
+			var assetGuids = AssetDatabase.FindAssets("l:New-Shiny-DemoAsset", SearchPathStr);
+			for (var i = 0; i < assetGuids.Length; i++)
+			{
+				var sourceGuid = assetGuids[i];
+				var sourcePath = AssetDatabase.GUIDToAssetPath(sourceGuid);
+
+				// only duplicate those with (visible in project view) sub-assets
+				var visibleSubAssets = AssetDatabase.LoadAllAssetRepresentationsAtPath(sourcePath);
+				if (visibleSubAssets.Length > 0)
+				{
+					var suffix = "no sub-assets";
+					var filenameNoExt = Path.GetFileNameWithoutExtension(sourcePath);
+					var dupePath = $"{DemoAssetsPath}/{filenameNoExt} {suffix}.mesh";
+					dupePath = AssetDatabase.GenerateUniqueAssetPath(dupePath);
+					AssetDatabase.CopyAsset(sourcePath, dupePath);
+
+					// must defer loading created assets to post-batchediting
+					sourcePaths.Add(sourcePath);
+					dupePaths.Add(dupePath);
+				}
+			}
+		}
+		finally
+		{
+			AssetDatabase.StopAssetEditing();
+		}
+
+		// remove the subassets and modify the labels
+		try
+		{
+			AssetDatabase.StartAssetEditing();
+
+			for (var i = 0; i < dupePaths.Count; i++)
+			{
+				var dupeAsset = AssetDatabase.LoadMainAssetAtPath(dupePaths[i]);
+
+				// remove sub-assets from dupe
+				var subAssets = AssetDatabase.LoadAllAssetRepresentationsAtPath(dupePaths[i]);
+				foreach (var subAsset in subAssets)
+					AssetDatabase.RemoveObjectFromAsset(subAsset);
+
+				var sourceGuid = AssetDatabase.AssetPathToGUID(sourcePaths[i]);
+				var sourceLabels = AssetDatabase.GetLabels(new GUID(sourceGuid));
+				var labels = sourceLabels.ToList();
+				labels.Remove("New-Shiny-DemoAsset");
+				labels.Add("No-SubAssets-DemoAsset");
+				AssetDatabase.SetLabels(dupeAsset, labels.ToArray());
+				AssetDatabase.SaveAssetIfDirty(dupeAsset);
+			}
+		}
+		finally
+		{
+			AssetDatabase.StopAssetEditing();
+		}
+	}
+
+	private void OnDeleteAllButtonClicked_Unity()
+	{
+		var allDemoAssetsFilter = "l:New-Shiny-DemoAsset l:No-SubAssets-DemoAsset";
+		var guids = AssetDatabase.FindAssets(allDemoAssetsFilter, SearchPathStr);
+		foreach (var guid in guids)
+		{
+			var path = AssetDatabase.GUIDToAssetPath(guid);
+			AssetDatabase.DeleteAsset(path);
+		}
+	}
+
+	private void OnDeletePathButtonClicked_Unity()
+	{
+		OnDeleteAllButtonClicked_Unity();
+
+		// also delete the subfolder and its parent folder
+		AssetDatabase.DeleteAsset(DemoAssetsPath);
+		var parentFolder = Path.GetDirectoryName(DemoAssetsPath);
+		AssetDatabase.DeleteAsset(parentFolder);
+	}
+}
diff --git a/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs.meta b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs.meta
new file mode 100644
index 0000000..a1f9f11
--- /dev/null
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.UnityAPI.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 731c528505eb42349509d4bc3830092f
+timeCreated: 1706617124
\ No newline at end of file
diff --git a/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.cs b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.cs
new file mode 100644
index 0000000..4b26c14
--- /dev/null
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.cs
@@ -0,0 +1,108 @@
+// Copyright (C) 2021-2024 Steffen Itterheim
+// Refer to included LICENSE file for terms and conditions.
+
+using CodeSmileEditor;
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Button = UnityEngine.UIElements.Button;
+
+public partial class AssetDemoWindow : EditorWindow
+{
+	private static readonly Asset.Path DemoAssetsPath =
+		"Assets/CodeSmile AssetDatabase Demo Assets/Sample Assets";
+	private static readonly Asset.Path[] SearchPath =
+		{ "Assets/CodeSmile AssetDatabase Demo Assets/Sample Assets" };
+	private static readonly String[] SearchPathStr =
+		{ "Assets/CodeSmile AssetDatabase Demo Assets/Sample Assets" };
+
+	[SerializeField] private VisualTreeAsset m_VisualTreeAsset;
+
+	private API m_SelectedAPI = API.CodeSmile;
+
+	[MenuItem("Window/CodeSmile/AssetDatabase Examples/Workflow Demo", priority = 2999)]
+	public static void ShowAssetDatabaseDemoWindow()
+	{
+		var wnd = GetWindow<AssetDemoWindow>();
+		wnd.titleContent = new GUIContent("CodeSmile AssetDatabase Demo");
+	}
+
+	public void CreateGUI()
+	{
+		var uiBuilderDocument = m_VisualTreeAsset.Instantiate();
+		rootVisualElement.Add(uiBuilderDocument);
+
+		HandleApiSelection();
+		RegisterCallbacks(true);
+	}
+
+	private void OnDestroy() => RegisterCallbacks(false);
+
+	private void HandleApiSelection()
+	{
+		var apiSelection = rootVisualElement.Q<DropdownField>("SelectAPI");
+		apiSelection.RegisterValueChangedCallback(evt =>
+		{
+			RegisterCallbacks(false); // unregister current
+			m_SelectedAPI = apiSelection.index == 0 ? API.CodeSmile : API.Unity;
+			RegisterCallbacks(true); // re-register new
+		});
+	}
+
+	private void RegisterCallbacks(Boolean register)
+	{
+		var createButton = rootVisualElement.Q<Button>("CreateButton");
+		var duplicateButton = rootVisualElement.Q<Button>("DuplicateButton");
+		var duplicateBatchedButton = rootVisualElement.Q<Button>("DuplicateBatchedButton");
+		var deleteAllButton = rootVisualElement.Q<Button>("DeleteAllButton");
+		var deletePathButton = rootVisualElement.Q<Button>("DeletePathButton");
+
+		// these handlers use CodeSmile AssetDatabase methods
+		if (m_SelectedAPI == API.CodeSmile)
+		{
+			if (register)
+			{
+				createButton.clicked += OnCreateButtonClicked_CodeSmile;
+				duplicateButton.clicked += OnDuplicateButtonClicked_CodeSmile;
+				duplicateBatchedButton.clicked += OnDuplicateBatchedButtonClicked_CodeSmile;
+				deleteAllButton.clicked += OnDeleteAllButtonClicked_CodeSmile;
+				deletePathButton.clicked += OnDeletePathButtonClicked_CodeSmile;
+			}
+			else
+			{
+				createButton.clicked -= OnCreateButtonClicked_CodeSmile;
+				duplicateButton.clicked -= OnDuplicateButtonClicked_CodeSmile;
+				duplicateBatchedButton.clicked -= OnDuplicateBatchedButtonClicked_CodeSmile;
+				deleteAllButton.clicked -= OnDeleteAllButtonClicked_CodeSmile;
+				deletePathButton.clicked -= OnDeletePathButtonClicked_CodeSmile;
+			}
+		}
+		else
+		{
+			// these handlers use Unity's AssetDabase methods
+			if (register)
+			{
+				createButton.clicked += OnCreateButtonClicked_Unity;
+				duplicateButton.clicked += OnDuplicateButtonClicked_Unity;
+				duplicateBatchedButton.clicked += OnDuplicateBatchedButtonClicked_Unity;
+				deleteAllButton.clicked += OnDeleteAllButtonClicked_Unity;
+				deletePathButton.clicked += OnDeletePathButtonClicked_Unity;
+			}
+			else
+			{
+				createButton.clicked -= OnCreateButtonClicked_Unity;
+				duplicateButton.clicked -= OnDuplicateButtonClicked_Unity;
+				duplicateBatchedButton.clicked -= OnDuplicateBatchedButtonClicked_Unity;
+				deleteAllButton.clicked -= OnDeleteAllButtonClicked_Unity;
+				deletePathButton.clicked -= OnDeletePathButtonClicked_Unity;
+			}
+		}
+	}
+
+	private enum API
+	{
+		CodeSmile,
+		Unity,
+	}
+}
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.cs.meta b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.cs.meta
similarity index 100%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.cs.meta
rename to Samples~/AssetWorkflowWithGUI/AssetDemoWindow.cs.meta
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.uxml b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.uxml
similarity index 85%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.uxml
rename to Samples~/AssetWorkflowWithGUI/AssetDemoWindow.uxml
index 64ce833..d3237a9 100644
--- a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.uxml
+++ b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.uxml
@@ -1,4 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:DropdownField label="Select API:" choices="CodeSmile AssetDatabase,Unity AssetDatabase" name="SelectAPI" index="0" style="height: 32px; font-size: 24px;" />
     <ui:Button text="Create Demo Assets" name="CreateButton" style="background-color: rgb(17, 94, 0); font-size: 24px;" />
     <ui:Button text="Duplicate all" name="DuplicateButton" style="background-color: rgb(17, 94, 0); font-size: 24px;" />
     <ui:Button text="Duplicate all (batched)" name="DuplicateBatchedButton" style="background-color: rgb(17, 94, 0); font-size: 24px;" />
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.uxml.meta b/Samples~/AssetWorkflowWithGUI/AssetDemoWindow.uxml.meta
similarity index 100%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileAssetDatabaseDemoWindow.uxml.meta
rename to Samples~/AssetWorkflowWithGUI/AssetDemoWindow.uxml.meta
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Sample.asmdef b/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Demo.asmdef
similarity index 88%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Sample.asmdef
rename to Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Demo.asmdef
index d4d8a8e..a93a3b3 100644
--- a/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Sample.asmdef
+++ b/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Demo.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "CodeSmileEditor.AssetDatabase.Sample",
+    "name": "CodeSmileEditor.AssetDatabase.Demo",
     "rootNamespace": "",
     "references": [
         "GUID:38cc5939e6694a64d8d6ea3aaca03495"
@@ -15,4 +15,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
\ No newline at end of file
+}
diff --git a/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Sample.asmdef.meta b/Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Demo.asmdef.meta
similarity index 100%
rename from Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Sample.asmdef.meta
rename to Samples~/AssetWorkflowWithGUI/CodeSmileEditor.AssetDatabase.Demo.asmdef.meta
diff --git a/package.json b/package.json
index bb2cca9..c7addae 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "de.codesmile.assetdatabase",
   "displayName": "CodeSmile AssetDatabase",
   "description": "The AssetDatabase in enjoyable, consistent, concise, convenient, comprehensible, safe, documented form.\n\nAvailable under multiple licenses:\n- GPL 3.0 for personal & educational use\n- Asset Store Terms and EULA for commercial use",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "unity": "2021.3",
   "unityRelease": "3f1",
   "author": {