* More ProjectManager improvements