PR fixup - update to latest version of fork, add support for contains