Working on oAuth 2.0 support