Added missing aggregate functions