Upgrade to new format