Add support for alternative charsets