BRID-91:  Refactoring Auth Services