Improve answer_options