Add support for single choice.