Move to Apache Curator