Validator and Inspector Updated