added support for unicode names