Improve validation options