I18n service fix; Updated config;