Adds unicode support