Updated for GzipEnabled