Added handling for Content-Format option