Refine containment logic
Add containment variables