Add unit safety