Added support for the zip option