Add support for charset and doctype