Adding Keyring support