Improved support to unicode