Added currency support