Add support for diacritic