Adding code to fetch locations