Add support for utf-8 encoding