diff --git a/samples/AspNetSample/Program.cs b/samples/AspNetSample/Program.cs
index 7e7d75aa7..b1eef1db8 100644
--- a/samples/AspNetSample/Program.cs
+++ b/samples/AspNetSample/Program.cs
@@ -2,6 +2,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using SuperSocket;
+using SuperSocket.Server;
+using SuperSocket.Server.Host;
+using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.ProtoBase;
 using System.Text;
 
diff --git a/samples/CommandServer/ADD.cs b/samples/CommandServer/ADD.cs
index 348ea8940..2609a44a8 100644
--- a/samples/CommandServer/ADD.cs
+++ b/samples/CommandServer/ADD.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket;
+using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Command;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/CommandServer/MULT.cs b/samples/CommandServer/MULT.cs
index 299b988e6..1dc791516 100644
--- a/samples/CommandServer/MULT.cs
+++ b/samples/CommandServer/MULT.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket;
+using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Command;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/CommandServer/Program.cs b/samples/CommandServer/Program.cs
index b169b066e..6b419630b 100644
--- a/samples/CommandServer/Program.cs
+++ b/samples/CommandServer/Program.cs
@@ -5,6 +5,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using SuperSocket;
+using SuperSocket.Server;
+using SuperSocket.Server.Host;
+using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Command;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/CommandServer/SUB.cs b/samples/CommandServer/SUB.cs
index c5116afdc..a97ba1c4a 100644
--- a/samples/CommandServer/SUB.cs
+++ b/samples/CommandServer/SUB.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket;
+using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Command;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/ConfigSample/Program.cs b/samples/ConfigSample/Program.cs
index 8a016afcc..ad8d1d9b3 100644
--- a/samples/ConfigSample/Program.cs
+++ b/samples/ConfigSample/Program.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using SuperSocket;
+using SuperSocket.Server.Host;
 using SuperSocket.ProtoBase;
 
 namespace ConfigSample
diff --git a/samples/CustomProtocol/Program.cs b/samples/CustomProtocol/Program.cs
index e3d9d6738..da8d9525c 100644
--- a/samples/CustomProtocol/Program.cs
+++ b/samples/CustomProtocol/Program.cs
@@ -4,6 +4,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using SuperSocket;
+using SuperSocket.Server;
+using SuperSocket.Server.Abstractions;
+using SuperSocket.Server.Host;
 using SuperSocket.ProtoBase;
 
 namespace CustomProtocol
diff --git a/samples/EchoServer/Program.cs b/samples/EchoServer/Program.cs
index e35520d8b..20f98d7c5 100644
--- a/samples/EchoServer/Program.cs
+++ b/samples/EchoServer/Program.cs
@@ -5,6 +5,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using SuperSocket;
+using SuperSocket.Server;
+using SuperSocket.Server.Abstractions;
+using SuperSocket.Server.Host;
 using SuperSocket.ProtoBase;
 
 namespace EchoServer
diff --git a/samples/WebSocketPushServer/Program.cs b/samples/WebSocketPushServer/Program.cs
index 8d04dc754..14b6b1323 100644
--- a/samples/WebSocketPushServer/Program.cs
+++ b/samples/WebSocketPushServer/Program.cs
@@ -6,6 +6,11 @@
 using Microsoft.Extensions.Logging;
 using SuperSocket;
 using SuperSocket.Server;
+using SuperSocket.Server.Abstractions;
+using SuperSocket.Server.Abstractions.Host;
+using SuperSocket.Server.Abstractions.Session;
+using SuperSocket.Server.Abstractions.Middleware;
+using SuperSocket.Server.Host;
 using SuperSocket.WebSocket.Server;
 
 namespace WebSocketPushServer
diff --git a/samples/WebSocketPushServer/PushSession.cs b/samples/WebSocketPushServer/PushSession.cs
index 85c26c698..400778da9 100644
--- a/samples/WebSocketPushServer/PushSession.cs
+++ b/samples/WebSocketPushServer/PushSession.cs
@@ -6,7 +6,7 @@
 using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.WebSocket.Server;
-using SuperSocket.SessionContainer;
+using SuperSocket.Server.Abstractions.Session;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/samples/WebSocketPushServer/ServerPushMiddleware.cs b/samples/WebSocketPushServer/ServerPushMiddleware.cs
index e4c1c1d44..591b08cba 100644
--- a/samples/WebSocketPushServer/ServerPushMiddleware.cs
+++ b/samples/WebSocketPushServer/ServerPushMiddleware.cs
@@ -5,8 +5,10 @@
 using System.Linq;
 using SuperSocket;
 using SuperSocket.Server;
+using SuperSocket.Server.Abstractions;
+using SuperSocket.Server.Abstractions.Session;
+using SuperSocket.Server.Abstractions.Middleware;
 using SuperSocket.WebSocket.Server;
-using SuperSocket.SessionContainer;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/samples/WebSocketPushServer/WebSocketPushServer.csproj b/samples/WebSocketPushServer/WebSocketPushServer.csproj
index 3de3f999e..a1cf9cbe9 100644
--- a/samples/WebSocketPushServer/WebSocketPushServer.csproj
+++ b/samples/WebSocketPushServer/WebSocketPushServer.csproj
@@ -4,8 +4,7 @@
     <TargetFrameworks>$(SamplesTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SuperSocket.WebSocket.Server\SuperSocket.WebSocket.Server.csproj" />
-    <ProjectReference Include="..\..\src\SuperSocket.SessionContainer\SuperSocket.SessionContainer.csproj" />    
+    <ProjectReference Include="..\..\src\SuperSocket.WebSocket.Server\SuperSocket.WebSocket.Server.csproj" />  
   </ItemGroup>
   <ItemGroup>
     <Content Include="appsettings.json">