Add zip-like support