Added support for unicode