Refactoring.
Adding user management