Updated validation handling