Added charset + codepage to be consistent