Added char support and unicode support for those chars.