Add avergae support