better support for ZIP packages