added basic higlight support