Work on refactoring the Auth component