Made change to zip class implementation.