Upgrade dict and extrafield