I think we should keep the upgrade logic here, including populating the default data if needed