Feature/project

Refactoring api call