Add AggregateAnalyzer class