Add option for specifying containment