Added initial PKI support