Refactored job data structure