Added geocoder and location