added currency support