Added charset manipulation