more schema refactoring...