Removed aggregate and added aggregators.