Added Support for Aggregate Framework