Refactored reportmanager