Added currency negotiation