Moved Authenticator logic to method