Add Support for Aggregate Framework