Added aggregates and formula containers.