Added servlet API; added i18n support