Refactored XMLReporter