Now supporting keychain-based authentication