Use PKI token format

Issue TA79