An updated scope management