Add support for UTF-8