Added support for keychain storage of passwords.