Add unit guarding