Added internationalization support