NewFeature: added highlight support