Adding support of unicode in the ISM