Add Question parsing