Updated validation.