Adding more features to zk implementation