Validator rework.