adding unicode support