#17 - Added Generators to the jobs