Add highlight support