More refinement for jobs and scoped tokens