keyring support redone