Added highlighting [MJ-419]