diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl
index f4c71d5d2..76a5a24b6 100644
--- a/src/emqx_channel.erl
+++ b/src/emqx_channel.erl
@@ -32,6 +32,8 @@
 -export([ info/1
         , info/2
         , set_conn_state/2
+        , get_session/1
+        , set_session/2
         , stats/1
         , caps/1
         ]).
@@ -167,6 +169,12 @@ info(timers, #channel{timers = Timers}) -> Timers.
 set_conn_state(ConnState, Channel) ->
     Channel#channel{conn_state = ConnState}.
 
+get_session(#channel{session = Session}) ->
+    Session.
+
+set_session(Session, Channel) ->
+    Channel#channel{session = Session}.
+
 %% TODO: Add more stats.
 -spec(stats(channel()) -> emqx_types:stats()).
 stats(#channel{session = Session})->
diff --git a/src/emqx_session.erl b/src/emqx_session.erl
index e89943f2a..f816933ea 100644
--- a/src/emqx_session.erl
+++ b/src/emqx_session.erl
@@ -75,6 +75,7 @@
 
 -export([ deliver/2
         , enqueue/2
+        , dequeue/1
         , retry/1
         , terminate/3
         ]).