Added NumberFormatter
Added CurrencyFormatter