Updated for content-type and content-length