Added charset functionality
Improved