Refactored ReportService.