add support for keychain