Improved unzip implementation