Added support for currency pairs