consolidated OrdsAggregator and Aggregator under a single Aggregator