added aggregation for circuit and egauge types