Add aggregate indicator calculations