Adding support for cyrillic