Adding internationalization functionality