Upgrade for language changes