Added zip file support