Add aggregation API support
Resolve conflict