Removed aggregateId and replaced it with aggregateType