Added changes to core Aggregator class to support deferred collections