Update Scope Resolution v3.0