Added charset support.