Changing OrValidator to ValidationChoice