starting to add unicode names support