Added support for more characters.