Improved the shape file export