diff --git a/src/commands.py b/src/commands.py
index dcb3f6d..56f79fa 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -31,42 +31,42 @@ def start(update, context):
 
 def ls(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
-    requests = database.userRequests[chat.id]
+    user = database.checkUser(chat.id)
+    requests = database.userRequests[user]
 
-    return "Your requests: " + toJson(requests)
+    return "Your requests: %s" % toJson(requests)
 
 
 def touch(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def rm(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def mv(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def nano(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def interval(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def enable(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
 
 
 def disable(update, context):
     chat = update.effective_chat
-    database.checkUser(chat.id)
+    user = database.checkUser(chat.id)
diff --git a/src/database.py b/src/database.py
index e10507e..4328ef8 100644
--- a/src/database.py
+++ b/src/database.py
@@ -17,5 +17,6 @@ class Database:
     def checkUser(self, user):
         if user not in self.users:
             self.users.append(user)
-            self.userRequests[user] = []
-            self.userStatus[user] = []
+            self.userRequests[user] = {}
+            self.userStatus[user] = {}
+        return user