Added support for zip