Added charset setting