Update docstring
Refactor aggregates classes