Added partially UTF-8 support