Unicode support added