templating changes to support bilingual schema