Modified the aggregator and dimensions computation