Added stuff to HighlightSystem