Apply Virgo improvements on intext Context Broker