Continued to add support for oAuth