Added choice validator, completer