Renamed SimpleHighlighter to Highlighter