Incremental progress towards schema refactor