Added aggregate formulas