Update to use UTF-8 encoding