Added geocoder support