Added tables for aggregated values