Added support for defining charset on content type