Add partial scope management.