Add support for zip sinks