Added handling for QuestionnaireAnswers