Adding highlight capability for version 1.5