Updates to support multiple geocoders