Update deprecated validation code