+ Refactor project related API