Better handling for content-type