Adding back the users feature