Updated aggregation functions and modifiers