Improve language manager