New features

Highlight support