Added CurrencyHandler support