Added highlight support