Added changes for oauth