Add support for custom validators
whitespace cleanup