Improve Project model