Rest of authentication services refactoring