Added some more utf code