add Unicode support