New Contains improvements (and fix)