Add support for Highlight 3.15 or later version