Added options to run without validation