Improved zip support