Changes made to support multi-field aggregates