Improve aggregator windowing