Updated validation