Refactored for AuthenticatedService change.