Added keychain support