Added an option to turn off validation.