added multi currency support