Add support to force the charset