Add support for highlighting