Add sum / avg support