Refactored GeoServer output generators