Implemented internationalization support