Refactoring + Aggregator on intervals + Graph Aggregator Mapper