Started adding user management