Improve language handling