Added zip support