Add MultiChoiceQuestion & ShortQuestion