Changing IJobStorage - split into data creation