Upgrade now properly converts metadata