Refactor job scopes