Added support for 'average' and 'weightedAverage' multiple method types