Added GeoJSON
Simplified parsing