Added SUM and AVG aggregate functions to model fields and expressions.