Added 'containment' option