Added propper unicode input handlind