Implement all types of question data and refactor naming