Added better support for unicode symbols.