Added zipping option