add support for highlighting