Refactor job collection mechanism.