Added support for highlighted ri.