Validator refactor (continued)