Update to allow conditionals in checks