Add partial support of something else then UTF-8