Add support for charset simplification