Better support for unicode