Add subtype annotations in Question and QuestionDescription