Started refactoring aggregateId to aggregateType
Removed aggregateId and replaced it with aggregateType
Improved code readability
Improved code readability