Added more support for validator.