Completed Keyring support