Add support for handshake keys to KeyManager