Refactor SurveyDefinitionAdapter