Changed newContain to contain, so now the syntax is fully the new one.
Old stuff should only be oldOneOf, etc., methods.