Internationalization improvement