Added three layers, still need to test aggregation framework for these new layers.