Cargoify and update for language changes