Added utf8 supporton some modules