Moving IModelValidatorProvider to Options

Fixes #879