Switch to tree-based schema