Added .zip support