Made some changes for OAuth updates