Add support for zip