diff --git a/src/emqttd_config.erl b/src/emqttd_config.erl
index 8ae8ab72d..06256bbfd 100644
--- a/src/emqttd_config.erl
+++ b/src/emqttd_config.erl
@@ -15,6 +15,13 @@
 %%--------------------------------------------------------------------
 
 %% @doc Hot Configuration
+%%
+%% TODO: How to persist the configuration?
+%% 
+%% 1. Store in mnesia database?
+%% 2. Store in dets?
+%% 3. Store in data/app.config?
+%%
 
 -module(emqttd_config).
 
@@ -25,7 +32,7 @@
 %% @doc Read the configuration of an application.
 -spec(read(atom()) -> {ok, list(env())} | {error, term()}).
 read(_App) ->
-    %% TODO
+    %% TODO: 
     %% 1. Read the app.conf from etc folder
     %% 2. Cuttlefish to read the conf
     %% 3. Return the terms and schema