Adding crude keyring support