Add public key handling