Add support for pre-validation.