Better Shapefile support [1743]