Temporary import for Oauth Change