Reworked support of unicode