Added some classes preparing for aggregate stats