Added custom highlighter