Added support for containment check