Code

Updated charset support