Improve multiple choice workflow