Added Aggregator as described in #4