Refactored and updated CRS reports.