Add compat with Validator 2.x