Create WrapperAuthenticator and simplify Authenticator behaviour