Add support for Char and NChar