Adapted to new GeocodingTask lib