Fix project functionalities
Fix project functionalities