More work adding i18n to the table