Add HighlightUnit and RemoveHighlightUnit