Reworked the enrichment generation so that it goes through the aggregator interface of the ECKCore