Almost done refactoring base schema