Support validation after redefinition.
Refactored validation.