CurrencyPair upgrade to objects