Adding ZPK support