Reorganized UTF-8 support