Add support for other encodings