Adding support for zips