Switched to new keyring methods