Working on making lib compliant with current oauth2