Added option to disable validation