Added multi-byte charset support