Added full utf-8 support