Add support for arbitrary options in validators