Add Unicode support