Adding UTF8 support