Refactor urls to APICall