Validator and config changes