Refactoring aged WIP report to proper tiers