#5 Enhanced aggregation API. Code refactoring.