Added charset choice