diff --git a/main.c b/main.c
index 4011eee99..721d9c8e5 100644
--- a/main.c
+++ b/main.c
@@ -7,6 +7,9 @@
 #include "core_debug.h"
 #include "core_signal.h"
 
+/* REMOVE */
+#include "core_pkbuf.h"
+
 /* Server */
 #include "cellwire.h"
 
@@ -46,6 +49,17 @@ static int check_signal(int signum)
 
             return 1;
         }
+        case SIGUSR1:
+        {
+            pkbuf_t *pkbuf = NULL;
+            CORE_DECLARE(status_t) s11_build_create_session_req(pkbuf_t **pkbuf, void *ue);
+            CORE_DECLARE(status_t) mme_s11_send_to_sgw(pkbuf_t *pkbuf);
+
+            s11_build_create_session_req(&pkbuf, NULL);
+            d_print_hex(pkbuf->payload, pkbuf->len);
+            mme_s11_send_to_sgw(pkbuf);
+            break;
+        }
         default:
         {
             d_error("Unknown signal number = %d\n", signum);
diff --git a/src/mme/Makefile.am b/src/mme/Makefile.am
index 40b0e8880..6ec9093ab 100644
--- a/src/mme/Makefile.am
+++ b/src/mme/Makefile.am
@@ -7,7 +7,7 @@ libmme_la_SOURCES = \
     event.h context.h \
 	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap_path.h \
 	nas_conv.h nas_security.h emm_handler.h \
-	s11_path.h \
+	s11_path.h s11_build.h \
 	sm.h s6a_sm.h
 
 nodist_libmme_la_SOURCES = \
@@ -15,7 +15,7 @@ nodist_libmme_la_SOURCES = \
     init.c event.c context.c \
 	s1ap_build.c s1ap_handler.c s1ap_conv.c s1ap_path.c \
 	nas_conv.c nas_security.c emm_handler.c \
-	s11_path.c \
+	s11_path.c s11_build.c \
 	mme_sm.c enb_s1ap_sm.c ue_emm_sm.c s6a_sm.c 
 
 libmme_la_DEPENDENCIES = \
diff --git a/src/mme/context.h b/src/mme/context.h
index 7b60893da..4c650e3c0 100644
--- a/src/mme/context.h
+++ b/src/mme/context.h
@@ -6,8 +6,9 @@
 #include "core_net.h"
 #include "core_sha2.h"
 
-#include "nas_ies.h"
-
+#include "3gpp_defs.h"
+#include "3gpp_types.h"
+#include "nas_types.h"
 #include "sm.h"
 
 #ifdef __cplusplus