Added charset stuff