Updated last changes, replacing String with CurrencyNamespace.