Add option to disable checks