Added some comments
Update to match new i18n api