diff --git a/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef b/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
index f0a3f95..37f9572 100644
--- a/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
+++ b/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
@@ -2,9 +2,9 @@
     "name": "BetterLocators.Runtime",
     "rootNamespace": "Better.Locators.Runtime",
     "references": [
+        "GUID:01df13aca8d01e24a911bcc3e8277031",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679",
         "GUID:35101f455c979e94c9a0a4793484b7fd",
-        "GUID:a59e3daedde9ca94bba45364d4ead25f",
-        "GUID:28da8d3b12e3efa47928e0c9070f853d",
         "GUID:1c5574afb40e5fe4ca9e9c156009297b"
     ],
     "includePlatforms": [],
@@ -17,7 +17,7 @@
     "versionDefines": [
         {
             "name": "com.tdw.better.services",
-            "expression": "0.0.4",
+            "expression": "0.1.0",
             "define": "BETTER_SERVICES"
         }
     ],
diff --git a/Assets/BetterLocators/Runtime/Contexts/MonoContext.cs b/Assets/BetterLocators/Runtime/Contexts/MonoContext.cs
index b1df0eb..af3ed4a 100644
--- a/Assets/BetterLocators/Runtime/Contexts/MonoContext.cs
+++ b/Assets/BetterLocators/Runtime/Contexts/MonoContext.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Better.Attributes.Runtime.Select;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using Better.Locators.Runtime.Installers;
 using UnityEngine;
 
diff --git a/Assets/BetterLocators/Runtime/Installers/Services/ServicesInstaller.cs b/Assets/BetterLocators/Runtime/Installers/Services/ServicesInstaller.cs
index ee15d3f..3dec75b 100644
--- a/Assets/BetterLocators/Runtime/Installers/Services/ServicesInstaller.cs
+++ b/Assets/BetterLocators/Runtime/Installers/Services/ServicesInstaller.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using Better.Services.Runtime.Interfaces;
 using UnityEngine;
 
diff --git a/Assets/BetterLocators/Runtime/Locators/Implementations/InternalLocator.cs b/Assets/BetterLocators/Runtime/Locators/Implementations/InternalLocator.cs
index 8811d8d..edd9706 100644
--- a/Assets/BetterLocators/Runtime/Locators/Implementations/InternalLocator.cs
+++ b/Assets/BetterLocators/Runtime/Locators/Implementations/InternalLocator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Utility;
 
 namespace Better.Locators.Runtime
 {
diff --git a/Assets/BetterLocators/package.json b/Assets/BetterLocators/package.json
index 9d71d75..5387080 100644
--- a/Assets/BetterLocators/package.json
+++ b/Assets/BetterLocators/package.json
@@ -1,22 +1,22 @@
 {
   "name": "com.tdw.better.locator",
-  "displayName": "Better Locator",
-  "version": "0.0.8",
+  "displayName": "Better Locators",
+  "version": "0.1.0",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
-    "com.uurha.betterextensions": "1.5.98",
-    "com.uurha.betterattributes": "3.0.13"
+    "com.tdw.better.commons": "0.0.2",
+    "com.uurha.betterattributes": "3.1.0"
   },
   "author": {
     "name": "Better Plugins",
     "url": "https://github.com/techno-dwarf-works"
   },
-  "changelogUrl": "https://github.com/techno-dwarf-works/better-locator",
-  "documentationUrl": "https://github.com/techno-dwarf-works/better-locator/tree/main#readme",
+  "changelogUrl": "https://github.com/techno-dwarf-works/better-locators",
+  "documentationUrl": "https://github.com/techno-dwarf-works/better-locators/tree/main#readme",
   "license": "MIT",
-  "licensesUrl": "https://github.com/techno-dwarf-works/better-locator/blob/main/LICENSE",
+  "licensesUrl": "https://github.com/techno-dwarf-works/better-locators/blob/main/LICENSE",
   "keywords": [
     "locators",
     "reference management",
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 0ac81f4..c00c6fc 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
+    "com.tdw.better.services": "0.1.0",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",
@@ -11,9 +12,7 @@
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
-    "com.uurha.betterattributes": "3.0.11",
-    "com.uurha.betterdatastructures": "0.1.7",
-    "com.uurha.betterextensions": "1.5.94",
+    "com.uurha.betterattributes": "3.1.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index f65a503..a039140 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,14 @@
 {
   "dependencies": {
+    "com.tdw.better.commons": {
+      "version": "0.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.tdw.better.internal.core": "0.0.2"
+      },
+      "url": "https://package.openupm.com"
+    },
     "com.tdw.better.internal.core": {
       "version": "0.0.2",
       "depth": 0,
@@ -7,6 +16,15 @@
       "dependencies": {},
       "url": "https://package.openupm.com"
     },
+    "com.tdw.better.services": {
+      "version": "0.1.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.tdw.better.internal.core": "0.0.2"
+      },
+      "url": "https://package.openupm.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.0.1",
       "depth": 0,
@@ -143,40 +161,11 @@
       "url": "https://packages.unity.com"
     },
     "com.uurha.betterattributes": {
-      "version": "3.0.11",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.uurha.bettereditortools": "1.5.23",
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.betterdatastructures": {
-      "version": "0.1.7",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.bettereditortools": {
-      "version": "1.5.23",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.uurha.betterdatastructures": "0.1.7",
-        "com.uurha.betterextensions": "1.5.94",
-        "com.tdw.better.internal.core": "0.0.2"
-      },
-      "url": "https://package.openupm.com"
-    },
-    "com.uurha.betterextensions": {
-      "version": "1.5.94",
+      "version": "3.1.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.tdw.better.commons": "0.0.2",
         "com.tdw.better.internal.core": "0.0.2"
       },
       "url": "https://package.openupm.com"