Improve character sets mapping