added better zip support