Added containment for layers.