Add highlight support and multiple choices.