Add support to unicode