Modifications to language management