Added option to disable verify