Adding language management