Add average-calculation class