Working on Unicode char support