Does this give us flexibility to do schema upgrades in the future?