Improve validation flow