Added support for Content-Type and a name attribute.