Better Keychain support.