Add support for different characters