Add keychain support