Overhaul of Job Class