Improving geoserver import