Added shapefile support