Add compression and better filenaming