Added first draft for aggregates