Add UTF-8 support