Refactoring and adding users.