Validator improvements