Add support for keyring