Made some changes for OAuth updates 3