Continuing work on Utf support