Adding internationalization where needed