Refactored authentication delegates