Api urls refactoring