Adding options and saveToZip feature