Add support for rollout-zk