Refactored CurrentProjectUtils