Upgrading from the Legacy Store