Upgrade to new format
