Add support for comment highlighting