Changes for highlighting

Further changes related to previous commit for highlighting.