Updated classes and schema for Questionnaire and AnswerDomain components