Finalizing refactoring of reporting