Added multibyte support