With aggregate calculation functionality