Simplying zookeeper API
Merging with remote changes