Make the collector and query configs aware of the aggregates support...