EZP-22220: Refactored to extract AuthenticatorInterface