Change job mapping to use actual job objects instead of ID mappings