Added unicode strings support