diff --git a/src/core/client.h b/src/core/client.h
index 157698d..131df46 100644
--- a/src/core/client.h
+++ b/src/core/client.h
@@ -10,10 +10,10 @@
 #include <atomic>
 #include <functional>
 #include <list>
-#include <map>
 #include <shared_mutex>
 #include <string>
 #include <thread>
+#include <unordered_map>
 
 namespace Candy {
 
@@ -148,7 +148,7 @@ class Client {
     StunCache stun;
     PeerInfo selfInfo;
     std::shared_mutex ipPeerMutex;
-    std::map<uint32_t, PeerInfo> ipPeerMap;
+    std::unordered_map<uint32_t, PeerInfo> ipPeerMap;
     std::thread udpThread;
     std::thread tickThread;
     uint64_t tickTick = randomUint32();
@@ -170,7 +170,7 @@ class Client {
     std::shared_mutex sysRtTableMutex;
     std::list<SysRouteEntry> sysRtTable;
     std::shared_mutex candyRtTableMutex;
-    std::map<uint32_t, CandyRouteEntry> candyRtTable;
+    std::unordered_map<uint32_t, CandyRouteEntry> candyRtTable;
     int32_t routeCost;
 };
 
diff --git a/src/core/server.h b/src/core/server.h
index 6028f4f..2696c50 100644
--- a/src/core/server.h
+++ b/src/core/server.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 #include <thread>
+#include <unordered_map>
 
 namespace Candy {
 
@@ -52,7 +53,7 @@ class Server {
     Address dynamic;
     bool dynamicAddrEnabled = false;
 
-    std::map<uint32_t, WebSocketConn> ipWsMap;
+    std::unordered_map<uint32_t, WebSocketConn> ipWsMap;
     std::map<WebSocketConn, uint32_t> wsIpMap;
     std::map<WebSocketConn, std::string> wsMacMap;
     std::list<SysRoute> routes;