Updated to use CurrencyHandler RC3