Added more scopes