Add AVG() and COUNT().