Adapted to the latest validation changes.