more changes for migrating to jobItems