changes for moi related aggregation