Beginning of old Validator refactoring.