Add support for special chars