Added partial Unicode support