more WIP schema refactoring