Reorganized aggregation classes. Added MP level aggregate