Refactoring to support filtering by project