diff --git a/Abstracts/Server.php b/Abstracts/Server.php
index 093044e..b972d58 100644
--- a/Abstracts/Server.php
+++ b/Abstracts/Server.php
@@ -4,7 +4,7 @@
 namespace Server\Abstracts;
 
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
diff --git a/Contract/OnCloseInterface.php b/Contract/OnCloseInterface.php
index 02ca901..56ec3d3 100644
--- a/Contract/OnCloseInterface.php
+++ b/Contract/OnCloseInterface.php
@@ -13,10 +13,9 @@ interface OnCloseInterface
 
 
 	/**
-	 * @param Server $server
 	 * @param int $fd
 	 */
-	public function onClose(Server $server, int $fd): void;
+	public function onClose(int $fd): void;
 
 
 }
diff --git a/Contract/OnDisconnectInterface.php b/Contract/OnDisconnectInterface.php
index 0d9d0b4..918b561 100644
--- a/Contract/OnDisconnectInterface.php
+++ b/Contract/OnDisconnectInterface.php
@@ -10,10 +10,9 @@ interface OnDisconnectInterface
 
 
     /**
-     * @param Server $server
      * @param int $fd
      */
-    public function onDisconnect(Server $server, int $fd): void;
+    public function onDisconnect(int $fd): void;
 
 
 }
diff --git a/Contract/OnMessageInterface.php b/Contract/OnMessageInterface.php
index 325cb32..654276b 100644
--- a/Contract/OnMessageInterface.php
+++ b/Contract/OnMessageInterface.php
@@ -2,7 +2,7 @@
 
 namespace Server\Contract;
 
-use Swoole\Server;
+use Kiri\Websocket\WebSocketInterface;
 use Swoole\WebSocket\Frame;
 
 interface OnMessageInterface
@@ -10,10 +10,9 @@ interface OnMessageInterface
 
 
 	/**
-	 * @param Server $server
 	 * @param Frame $frame
 	 * @return void
 	 */
-	public function onMessage(Server $server, Frame $frame): void;
+	public function onMessage(Frame $frame): void;
 
 }
diff --git a/Contract/OnOpenInterface.php b/Contract/OnOpenInterface.php
index 607256a..842c2e1 100644
--- a/Contract/OnOpenInterface.php
+++ b/Contract/OnOpenInterface.php
@@ -3,16 +3,14 @@
 namespace Server\Contract;
 
 use Swoole\Http\Request;
-use Swoole\WebSocket\Server;
 
 interface OnOpenInterface
 {
 
 
-    /**
-     * @param Server $server
-     * @param Request $request
-     */
-    public function onOpen(Server $server, Request $request): void;
+	/**
+	 * @param Request $request
+	 */
+    public function onOpen(Request $request): void;
 
 }
diff --git a/Handler/OnPipeMessage.php b/Handler/OnPipeMessage.php
index 32f5b94..3aef043 100644
--- a/Handler/OnPipeMessage.php
+++ b/Handler/OnPipeMessage.php
@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Server\Abstracts\Server;
 use Exception;
 use Server\Contract\OnPipeMessageInterface;
diff --git a/Handler/OnServer.php b/Handler/OnServer.php
index b891bee..9442845 100644
--- a/Handler/OnServer.php
+++ b/Handler/OnServer.php
@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use ReflectionException;
diff --git a/Handler/OnServerManager.php b/Handler/OnServerManager.php
index 588662e..1d4b028 100644
--- a/Handler/OnServerManager.php
+++ b/Handler/OnServerManager.php
@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use ReflectionException;
 use Server\Abstracts\Server;
diff --git a/Handler/OnServerReload.php b/Handler/OnServerReload.php
index e39c920..1d1d015 100644
--- a/Handler/OnServerReload.php
+++ b/Handler/OnServerReload.php
@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Events\EventDispatch;
 use Server\Events\OnAfterReload;
 use Server\Events\OnBeforeReload;
diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php
index 0cecc9a..5d8ce45 100644
--- a/Handler/OnServerWorker.php
+++ b/Handler/OnServerWorker.php
@@ -7,7 +7,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Server\Events\OnAfterWorkerStart;
 use Server\Events\OnBeforeWorkerStart;
 use Server\Events\OnTaskerStart as OnTaskStart;
diff --git a/Server.php b/Server.php
index f81b1f5..68b0082 100644
--- a/Server.php
+++ b/Server.php
@@ -9,7 +9,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Server\Events\OnShutdown;
diff --git a/ServerCommand.php b/ServerCommand.php
index cadf722..52677bc 100644
--- a/ServerCommand.php
+++ b/ServerCommand.php
@@ -9,7 +9,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Coroutine;
diff --git a/ServerManager.php b/ServerManager.php
index 4c9e1a3..5cb9372 100644
--- a/ServerManager.php
+++ b/ServerManager.php
@@ -9,7 +9,7 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
diff --git a/Tasker/OnServerTask.php b/Tasker/OnServerTask.php
index 333a2f9..283ffd3 100644
--- a/Tasker/OnServerTask.php
+++ b/Tasker/OnServerTask.php
@@ -4,7 +4,7 @@
 namespace Server\Tasker;
 
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
 use Server\Contract\OnTaskInterface;