diff --git a/apps/emqttd/src/emqttd_access_control.erl b/apps/emqttd/src/emqttd_access_control.erl
index b40193f80..eb4344b38 100644
--- a/apps/emqttd/src/emqttd_access_control.erl
+++ b/apps/emqttd/src/emqttd_access_control.erl
@@ -152,7 +152,7 @@ stop() ->
 %%%=============================================================================
 
 init([]) ->
-    {ok, AcOpts} = application:get_env(access_control),
+    {ok, AcOpts} = application:get_env(access),
 	ets:new(?ACCESS_CONTROL_TAB, [set, named_table, protected, {read_concurrency, true}]),
     ets:insert(?ACCESS_CONTROL_TAB, {auth_modules, init_mods(auth, proplists:get_value(auth, AcOpts))}),
     ets:insert(?ACCESS_CONTROL_TAB, {acl_modules, init_mods(acl, proplists:get_value(acl, AcOpts))}),
diff --git a/apps/emqttd/src/emqttd_bridge_sup.erl b/apps/emqttd/src/emqttd_bridge_sup.erl
index 936961ab3..5adda423a 100644
--- a/apps/emqttd/src/emqttd_bridge_sup.erl
+++ b/apps/emqttd/src/emqttd_bridge_sup.erl
@@ -64,8 +64,7 @@ start_bridge(Node, SubTopic) when is_atom(Node) and is_binary(SubTopic) ->
 
 -spec start_bridge(atom(), binary(), [emqttd_bridge:option()]) -> {ok, pid()} | {error, any()}.
 start_bridge(Node, SubTopic, Options) when is_atom(Node) and is_binary(SubTopic) ->
-    {ok, Env} = application:get_env(emqttd, bridge),
-    Options1 = emqttd_opts:merge(Env, Options),
+    Options1 = emqttd_opts:merge(emqttd_broker:env(bridge), Options),
     supervisor:start_child(?MODULE, bridge_spec(Node, SubTopic, Options1)).
 
 %%------------------------------------------------------------------------------
diff --git a/apps/emqttd/src/emqttd_broker.erl b/apps/emqttd/src/emqttd_broker.erl
index 1a282fffd..4a9b55ea6 100644
--- a/apps/emqttd/src/emqttd_broker.erl
+++ b/apps/emqttd/src/emqttd_broker.erl
@@ -90,7 +90,7 @@ notify(EventType, Event) ->
 %% @end
 %%------------------------------------------------------------------------------
 env(Name) ->
-    proplists:get_value(Name, application:get_env(emqttd, mqtt_broker, [])).
+    proplists:get_value(Name, application:get_env(emqttd, broker, [])).
 
 %%------------------------------------------------------------------------------
 %% @doc Get broker version
diff --git a/apps/emqttd/src/emqttd_msg_store.erl b/apps/emqttd/src/emqttd_msg_store.erl
index 0a8e8f175..511b7cb22 100644
--- a/apps/emqttd/src/emqttd_msg_store.erl
+++ b/apps/emqttd/src/emqttd_msg_store.erl
@@ -92,7 +92,7 @@ limit(payload) ->
 env() -> 
     case get({env, retained}) of
         undefined ->
-            {ok, Env} = application:get_env(emqttd, retained),
+            Env = emqttd_broker:env(retained),
             put({env, retained}, Env), Env;
         Env -> 
             Env
diff --git a/apps/emqttd/src/emqttd_opts.erl b/apps/emqttd/src/emqttd_opts.erl
index a5dae6916..a83466a73 100644
--- a/apps/emqttd/src/emqttd_opts.erl
+++ b/apps/emqttd/src/emqttd_opts.erl
@@ -30,10 +30,10 @@
 
 -export([merge/2]).
 
-%%%-----------------------------------------------------------------------------
+%%------------------------------------------------------------------------------
 %% @doc Merge Options
 %% @end
-%%%-----------------------------------------------------------------------------
+%%------------------------------------------------------------------------------
 merge(Defaults, Options) ->
     lists:foldl(
         fun({Opt, Val}, Acc) ->
diff --git a/apps/emqttd/src/emqttd_pubsub_sup.erl b/apps/emqttd/src/emqttd_pubsub_sup.erl
index e39c9c270..51e89d56f 100644
--- a/apps/emqttd/src/emqttd_pubsub_sup.erl
+++ b/apps/emqttd/src/emqttd_pubsub_sup.erl
@@ -42,7 +42,7 @@ start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 init([]) ->
-    {ok, Opts} = application:get_env(mqtt_pubsub),
+    Opts = emqttd_broker:env(pubsub),
     Schedulers = erlang:system_info(schedulers),
     PoolSize = proplists:get_value(pool_size, Opts, Schedulers),
     gproc_pool:new(pubsub, hash, [{size, PoolSize}]),
diff --git a/apps/emqttd/src/emqttd_session.erl b/apps/emqttd/src/emqttd_session.erl
index 6a8c0909f..efc880c5f 100644
--- a/apps/emqttd/src/emqttd_session.erl
+++ b/apps/emqttd/src/emqttd_session.erl
@@ -258,7 +258,7 @@ init([ClientId, ClientPid]) ->
     process_flag(trap_exit, true),
     %%TODO: Is this OK? or should monitor...
     true = link(ClientPid),
-    {ok, SessOpts} = application:get_env(mqtt_session),
+    SessOpts = emqttd:env(session),
     State = initial_state(ClientId, ClientPid),
     Expires = proplists:get_value(expires, SessOpts, 1) * 3600,
     MsgQueue = emqttd_queue:new(proplists:get_value(max_queue, SessOpts, 1000), 
diff --git a/apps/emqttd/src/emqttd_ws_client.erl b/apps/emqttd/src/emqttd_ws_client.erl
index 860fe31f0..5a38eae08 100644
--- a/apps/emqttd/src/emqttd_ws_client.erl
+++ b/apps/emqttd/src/emqttd_ws_client.erl
@@ -56,8 +56,8 @@
 %% @end
 %%------------------------------------------------------------------------------
 start_link(Req) ->
+    PktOpts = emqttd:env(packet),
     {ReentryWs, ReplyChannel} = upgrade(Req),
-    {ok, PktOpts} = application:get_env(emqttd, mqtt_packet),
     {ok, ClientPid} = gen_server:start_link(?MODULE, [self(), Req, ReplyChannel, PktOpts], []),
     ReentryWs(#wsocket_state{request      = Req,
                              client_pid   = ClientPid,