Huge improvements to content negotiation class