Add Average aggregators. Add one_point decorators for aggregators