Jobs refactoring