Small changes in ShiftBundle for the new unit entity