Refactored Job class