added multiple-choice and multipleChoice