Added /city and /location API calls