New diagnostics report and report refactoring