Added better user management.