added support of multiple-choice questions