Minor refactoring, Use real API Urls