Added support for string highlighting