diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/IApiEndpoint.cs b/WelsonJS.Augmented/WelsonJS.Launcher/IApiEndpoint.cs
index 6633774..07ccc62 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/IApiEndpoint.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/IApiEndpoint.cs
@@ -1,4 +1,4 @@
-// IResourceTool.cs
+// IApiEndpoint.cs
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: 2025 Catswords OSS and WelsonJS Contributors
 // https://github.com/gnh1201/welsonjs
@@ -9,22 +9,56 @@ using System.Threading.Tasks;
 namespace WelsonJS.Launcher
 {
     /// <summary>
-    /// Defines a contract for resource tools that can handle specific HTTP requests.
+    /// Defines a contract for API endpoints that can selectively handle incoming HTTP requests.
     /// </summary>
     public interface IApiEndpoint
     {
         /// <summary>
-        /// Determines whether this tool can handle the specified path.
+        /// Determines whether this endpoint can handle a request
+        /// based solely on the request path.
         /// </summary>
-        /// <param name="path">The request path to check.</param>
-        /// <returns>True if this tool can handle the request; otherwise, false.</returns>
+        /// <remarks>
+        /// This method is typically used for fast, lightweight routing decisions
+        /// before inspecting headers, HTTP methods, or request bodies.
+        /// Implementations should avoid side effects and expensive operations.
+        /// </remarks>
+        /// <param name="path">The normalized request path (e.g. "/api/status").</param>
+        /// <returns>
+        /// <c>true</c> if this endpoint is responsible for the given path;
+        /// otherwise, <c>false</c>.
+        /// </returns>
         bool CanHandle(string path);
+
         /// <summary>
-        /// Asynchronously processes the HTTP request for the specified path.
+        /// Determines whether this endpoint can handle the given HTTP request
+        /// using the full <see cref="HttpListenerContext"/>.
         /// </summary>
-        /// <param name="context">The HTTP listener context containing request and response objects.</param>
-        /// <param name="path">The request path to handle.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
+        /// <remarks>
+        /// This overload allows more advanced routing decisions based on
+        /// HTTP method, headers, query parameters, authentication state,
+        /// or other contextual information.
+        /// </remarks>
+        /// <param name="context">
+        /// The HTTP listener context containing request and connection details.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if this endpoint can process the request;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        bool CanHandle(HttpListenerContext context);
+
+        /// <summary>
+        /// Asynchronously processes the HTTP request handled by this endpoint.
+        /// </summary>
+        /// <param name="context">
+        /// The HTTP listener context containing request and response objects.
+        /// </param>
+        /// <param name="path">
+        /// The request path associated with this handler.
+        /// </param>
+        /// <returns>
+        /// A task that represents the asynchronous handling operation.
+        /// </returns>
         Task HandleAsync(HttpListenerContext context, string path);
     }
 }
\ No newline at end of file
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
index f5055c5..9113dbb 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
@@ -31,7 +31,7 @@ namespace WelsonJS.Launcher
         private bool _isRunning;
         private string _prefix;
         private string _resourceName;
-        private List<IApiEndpoint> _tools = new List<IApiEndpoint>();
+        private List<IApiEndpoint> _apis = new List<IApiEndpoint>();
         private BlobConfig _blobConfig;
         private readonly ILog _logger;
 
@@ -66,15 +66,15 @@ namespace WelsonJS.Launcher
                     _logger?.Error($"FetchBlobConfig failed: {t.Exception}");
             }, TaskScheduler.Default);
 
-            // Add resource tools
-            _tools.Add(new ResourceTools.Completion(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.Settings(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.ChromiumDevTools(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.DnsQuery(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.IpQuery(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.TwoFactorAuth(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.Whois(this, _httpClient, _logger));
-            _tools.Add(new ResourceTools.ImageColorPicker(this, _httpClient, _logger));
+            // Add API endpoints
+            _apis.Add(new ResourceTools.Completion(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.Settings(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.ChromiumDevTools(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.DnsQuery(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.IpQuery(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.TwoFactorAuth(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.Whois(this, _httpClient, _logger));
+            _apis.Add(new ResourceTools.ImageColorPicker(this, _httpClient, _logger));
 
             // Register the prefix
             _listener.Prefixes.Add(prefix);
@@ -152,11 +152,11 @@ namespace WelsonJS.Launcher
             }
 
             // Serve from a resource tool
-            foreach (var tool in _tools)
+            foreach (var api in _apis)
             {
-                if (tool.CanHandle(path))
+                if (api.CanHandle(path))
                 {
-                    await tool.HandleAsync(context, path);
+                    await api.HandleAsync(context, path);
                     return;
                 }
             }