Adding internationalization support