Core changes in Aggregate