Moving JobSetup to core