Content negotiation added