Added containment behavior