Added some advanced validation options.