Added the advanced aggregation module