Add support for UTF-16