Enh: improved language management