Add AVG aggregate function