Enhance currency and exchange rate module