Adding Zookeeper support