Added aggregation tables