Added some tags to Highlighter