Add support for public and private keys