Refactor job to allow synchronous calls