Added scopes, updated users