Updated validation flow