Refactoring Auth Services