Removed mutability from AggregateEntry