changes for new geoserver