Refactor to get rid of QuestionAnswer