Incorporate updates for language changes