Refactored the jobs