Reworking the ZIP implementation.