Adding support to internationalization