Started to handle internationalization