Add multilanguage and alignment support