Changed to use GeoJSON format