diff --git a/src/mcp_server_cli/tools/__init__.py b/src/mcp_server_cli/tools/__init__.py
index 8937294..e2b5994 100644
--- a/src/mcp_server_cli/tools/__init__.py
+++ b/src/mcp_server_cli/tools/__init__.py
@@ -1,17 +1,17 @@
 """Tools module for MCP Server CLI."""
 
-from mcp_server_cli.tools.base import ToolBase, ToolResult
+from mcp_server_cli.tools.base import ToolBase, ToolRegistry, ToolResult
+from mcp_server_cli.tools.custom_tools import CustomToolLoader
 from mcp_server_cli.tools.file_tools import FileTools
-from mcp_server_cli.tools.git_tools import GitTools, GitDiffTool, GitLogTool, GitStatusTool
+from mcp_server_cli.tools.git_tools import GitTools
 from mcp_server_cli.tools.shell_tools import ShellTools
 
 __all__ = [
     "ToolBase",
     "ToolResult",
+    "ToolRegistry",
     "FileTools",
     "GitTools",
-    "GitDiffTool",
-    "GitLogTool",
-    "GitStatusTool",
     "ShellTools",
+    "CustomToolLoader",
 ]