Improve aggregators API