Refactored JsonReporter