Added char support