Added alternate currency support