KRACOEUS-7011: More Add Unit goodness