Switch to new mongo schema