Added partial internationalization support