Added QuestionData, mixed functionality