Refactored the way jobs are invoked