oauth2 modified to handle more services