diff --git a/Editor/NetworkComponentInspector.cs b/Editor/NetworkComponentInspector.cs
index 3f792af..259bdf7 100644
--- a/Editor/NetworkComponentInspector.cs
+++ b/Editor/NetworkComponentInspector.cs
@@ -1,17 +1,17 @@
-using AlicizaX.Editor;
+using System;
+using AlicizaX.Editor;
 using AlicizaX.Network.Runtime;
 using UnityEditor;
 
 namespace AlicizaX.Network.Editor
 {
     [CustomEditor(typeof(NetworkComponent))]
-    internal sealed class NetworkComponentInspector : ComponentTypeComponentInspector
+    internal sealed class NetworkComponentInspector : GameFrameworkInspector
     {
         private SerializedProperty m_HeartInterval = null;
 
-        protected override void Enable()
+        private void OnEnable()
         {
-            base.Enable();
             m_HeartInterval = serializedObject.FindProperty("m_HeartInterval");
         }
 
@@ -30,10 +30,5 @@ namespace AlicizaX.Network.Editor
             EditorGUI.EndDisabledGroup();
             Repaint();
         }
-
-        protected override void RefreshTypeNames()
-        {
-            RefreshComponentTypeNames(typeof(INetworkManager));
-        }
     }
 }
diff --git a/Runtime/Network/INetworkManager.cs b/Runtime/Network/INetworkModule.cs
similarity index 93%
rename from Runtime/Network/INetworkManager.cs
rename to Runtime/Network/INetworkModule.cs
index 48dfbbc..faa3d1e 100644
--- a/Runtime/Network/INetworkManager.cs
+++ b/Runtime/Network/INetworkModule.cs
@@ -5,7 +5,7 @@ using Fantasy.Network.Interface;
 
 namespace AlicizaX.Network.Runtime
 {
-    public interface INetworkManager : IModule
+    public interface INetworkModule : IModule
     {
         public EConnectState ConnectState { get; }
         void SetHeartInterval(int heartInterval);
diff --git a/Runtime/Network/INetworkManager.cs.meta b/Runtime/Network/INetworkModule.cs.meta
similarity index 100%
rename from Runtime/Network/INetworkManager.cs.meta
rename to Runtime/Network/INetworkModule.cs.meta
diff --git a/Runtime/Network/NetworkComponent.cs b/Runtime/Network/NetworkComponent.cs
index d5f4e99..f62c979 100644
--- a/Runtime/Network/NetworkComponent.cs
+++ b/Runtime/Network/NetworkComponent.cs
@@ -10,52 +10,22 @@ namespace AlicizaX.Network.Runtime
     [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Network")]
     [Preserve]
-    public sealed class NetworkComponent : GameFrameworkComponent
+    public sealed class NetworkComponent : MonoBehaviour
     {
-        private INetworkManager _networkManager;
+        private INetworkModule _networkModule;
 
         [SerializeField] private int m_HeartInterval = 2000;
 
-        public EConnectState ConnectState => _networkManager.ConnectState;
-
-        protected override void Awake()
+        private void Awake()
         {
-            ImplementationComponentType = Utility.Assembly.GetType(componentType);
-            InterfaceComponentType = typeof(INetworkManager);
-            base.Awake();
-            _networkManager = SysModuleCenter.GetModule<INetworkManager>();
-            if (_networkManager == null)
+            _networkModule = ModuleSystem.RegisterModule<INetworkModule>(typeof(NetworkModule));
+            if (_networkModule == null)
             {
                 Log.Fatal("Network Manager is invalid.");
                 return;
             }
 
-            _networkManager.SetHeartInterval(m_HeartInterval);
-        }
-
-        public async UniTask Initialize(params System.Reflection.Assembly[] assemblies)
-        {
-            await _networkManager.Initialize(assemblies);
-        }
-
-        public void Connect(string remoteAddress, NetworkProtocolType networkProtocolType, bool isHttps)
-        {
-            _networkManager.Connect(remoteAddress, networkProtocolType, isHttps);
-        }
-
-        public async UniTask<T> Call<T>(IRequest request, long routeId = 0) where T : IResponse
-        {
-            return await _networkManager.Call<T>(request, routeId);
-        }
-
-        public void Send(IMessage message, uint rpcId = 0, long routeId = 0)
-        {
-            _networkManager.Send(message, rpcId, routeId);
-        }
-
-        public void Send(IRouteMessage routeMessage, uint rpcId = 0, long routeId = 0)
-        {
-            _networkManager.Send(routeMessage, rpcId, routeId);
+            _networkModule.SetHeartInterval(m_HeartInterval);
         }
     }
 }
diff --git a/Runtime/Network/NetworkManager.cs b/Runtime/Network/NetworkModule.cs
similarity index 96%
rename from Runtime/Network/NetworkManager.cs
rename to Runtime/Network/NetworkModule.cs
index 1094088..44b4ab5 100644
--- a/Runtime/Network/NetworkManager.cs
+++ b/Runtime/Network/NetworkModule.cs
@@ -9,7 +9,7 @@ using Log = AlicizaX.Runtime.Log;
 namespace AlicizaX.Network.Runtime
 {
     [UnityEngine.Scripting.Preserve]
-    internal sealed class NetworkManager : INetworkManager
+    internal sealed class NetworkModule : INetworkModule
     {
         private Scene _scene;
         private Session _session;
@@ -38,7 +38,7 @@ namespace AlicizaX.Network.Runtime
                 allAssemblies[i] = assemblies[i];
             }
 
-            allAssemblies[allAssemblies.Length - 1] = typeof(NetworkManager).Assembly;
+            allAssemblies[allAssemblies.Length - 1] = typeof(NetworkModule).Assembly;
 
             await Fantasy.Platform.Unity.Entry.Initialize(allAssemblies);
             _scene = await Scene.Create(SceneRuntimeType.MainThread);
diff --git a/Runtime/Network/NetworkManager.cs.meta b/Runtime/Network/NetworkModule.cs.meta
similarity index 100%
rename from Runtime/Network/NetworkManager.cs.meta
rename to Runtime/Network/NetworkModule.cs.meta