Added multi-currency ability