Added highlighting capabilities for all entities