Small fix and aggregation added (was not pushed)