SchemaProvider refactoring.