Moved complexity from Manager to ChoiceAuth.