Added doc charset support