added support for content-type and content-disposition