Improving quazip integration