Fix naming
Add to main aggregate