Add support for "special" characters