Adding better unicode support