Rewrote Zip archive extraction handling