Added better Unicode handling