Added zip support.