Added option to disable verification