Refactored Project model