Adding negotiation capability