added highlighting support