Add support for original ZK as well