added keyring support