Changed Validator construction