Replaced Znode references with Cocoon