Refactored reports