diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt
index af3674c..f54c1b0 100644
--- a/server/wsproxy/CMakeLists.txt
+++ b/server/wsproxy/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
   /usr/include/jsoncpp
   /usr/include/python3.4m
   /usr/include/hiredis
-  ../../third_party/framework/cpp
+  ../../third_party
 )
 
 link_directories(
@@ -64,4 +64,5 @@ target_link_libraries(
   jsoncpp
   curl
   hiredis
+  tinyxml2
 )
diff --git a/server/wsproxy/GCListener.cc b/server/wsproxy/GCListener.cc
index 6dcac28..1041fef 100644
--- a/server/wsproxy/GCListener.cc
+++ b/server/wsproxy/GCListener.cc
@@ -4,7 +4,7 @@
 #include <a8/websocketsession.h>
 #include <a8/tcplistener.h>
 
-#include "netmsghandler.h"
+#include "framework/cpp/netmsghandler.h"
 
 #include "app.h"
 #include "GCListener.h"
@@ -102,7 +102,7 @@ void GCListener::ForwardTargetConnMsg(MsgHdr& hdr)
     head->msgid = hdr.msgid;
     head->seqid = hdr.seqid;
     head->magic_code = MAGIC_CODE;
-    head->reserved = 0;
+    head->rpc_error_code = 0;
     if (hdr.buflen > 0) {
         memmove(buff + sizeof(PackHead), hdr.buf, hdr.buflen);
     }
diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc
index 0fba203..6a61201 100644
--- a/server/wsproxy/app.cc
+++ b/server/wsproxy/app.cc
@@ -9,7 +9,7 @@
 #include <a8/timer.h>
 #include <a8/uuid.h>
 
-#include "netmsghandler.h"
+#include "framework/cpp/netmsghandler.h"
 
 #include "app.h"
 #include "GCListener.h"
diff --git a/server/wsproxy/handlermgr.h b/server/wsproxy/handlermgr.h
index d04571f..279bbfe 100644
--- a/server/wsproxy/handlermgr.h
+++ b/server/wsproxy/handlermgr.h
@@ -2,7 +2,7 @@
 
 #include <a8/basehttpsession.h>
 
-#include "netmsghandler.h"
+#include "framework/cpp/netmsghandler.h"
 
 namespace a8
 {
diff --git a/server/wsproxy/precompile.h b/server/wsproxy/precompile.h
index d5c9441..da4d743 100644
--- a/server/wsproxy/precompile.h
+++ b/server/wsproxy/precompile.h
@@ -15,4 +15,4 @@ namespace google
     }
 }
 
-#include "protoutils.h"
+#include "framework/cpp/protoutils.h"
diff --git a/server/wsproxy/target_conn.h b/server/wsproxy/target_conn.h
index bc9eb01..9f08a98 100644
--- a/server/wsproxy/target_conn.h
+++ b/server/wsproxy/target_conn.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protoutils.h"
+#include "framework/cpp/protoutils.h"
 
 namespace a8
 {
diff --git a/third_party/a8engine b/third_party/a8engine
index 74814af..37202ec 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 74814af7d2cdbaa4b9e82fa0d8859a8807c70e77
+Subproject commit 37202ecc44e3b5029055caebfb117d2e74583b09
diff --git a/third_party/framework b/third_party/framework
index 1625d6a..3f1b7f9 160000
--- a/third_party/framework
+++ b/third_party/framework
@@ -1 +1 @@
-Subproject commit 1625d6a86b382b36d627a604440a59a09f3c688d
+Subproject commit 3f1b7f95973d2740a1805eca55cee9071607036c