Changes for oAuth