Revisited scope management