adding more support for verifing primary and partition keys