Report system refactored