Refactoring of validation system.