Changed internationalization implementation