Adding highlighter support