Added charset to auto types