Added unicode support