Finished adding fields and i18n