Add support for unicode strings