ISchema/Schema refactoring.