Job class refactoring