Added missing support for ISO encodings