Changes to support TextQuestion, RatingQuestion.