Refactor to use latest ZK