Highlight module improvement